Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Side by Side Diff: media/base/data_buffer.cc

Issue 9854031: Replace size_t with int in a few media classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/data_buffer.h ('k') | media/base/data_buffer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/logging.h" 5 #include "base/logging.h"
6 #include "media/base/data_buffer.h" 6 #include "media/base/data_buffer.h"
7 #include "media/base/decrypt_config.h" 7 #include "media/base/decrypt_config.h"
8 #if !defined(OS_ANDROID) 8 #if !defined(OS_ANDROID)
9 #include "media/ffmpeg/ffmpeg_common.h" 9 #include "media/ffmpeg/ffmpeg_common.h"
10 #endif 10 #endif
11 11
12 namespace media { 12 namespace media {
13 13
14 DataBuffer::DataBuffer(scoped_array<uint8> buffer, size_t buffer_size) 14 DataBuffer::DataBuffer(scoped_array<uint8> buffer, int buffer_size)
15 : Buffer(base::TimeDelta(), base::TimeDelta()), 15 : Buffer(base::TimeDelta(), base::TimeDelta()),
16 data_(buffer.Pass()), 16 data_(buffer.Pass()),
17 buffer_size_(buffer_size), 17 buffer_size_(buffer_size),
18 data_size_(buffer_size) { 18 data_size_(buffer_size) {
19 } 19 }
20 20
21 DataBuffer::DataBuffer(size_t buffer_size) 21 DataBuffer::DataBuffer(int buffer_size)
22 : Buffer(base::TimeDelta(), base::TimeDelta()), 22 : Buffer(base::TimeDelta(), base::TimeDelta()),
23 data_(new uint8[buffer_size]), 23 data_(new uint8[buffer_size]),
24 buffer_size_(buffer_size), 24 buffer_size_(buffer_size),
25 data_size_(0) { 25 data_size_(0) {
26 CHECK(data_.get()) << "DataBuffer ctor failed to allocate memory"; 26 CHECK(data_.get()) << "DataBuffer ctor failed to allocate memory";
27 27
28 // Prevent arbitrary pointers. 28 // Prevent arbitrary pointers.
29 if (buffer_size == 0) 29 if (buffer_size == 0)
30 data_.reset(NULL); 30 data_.reset(NULL);
31 } 31 }
32 32
33 DataBuffer::~DataBuffer() {} 33 DataBuffer::~DataBuffer() {}
34 34
35 scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data, 35 scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data,
36 size_t data_size) { 36 int data_size) {
37 size_t padding_size = 0; 37 int padding_size = 0;
38 #if !defined(OS_ANDROID) 38 #if !defined(OS_ANDROID)
39 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are 39 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
40 // padded with this value. 40 // padded with this value.
41 padding_size = FF_INPUT_BUFFER_PADDING_SIZE; 41 padding_size = FF_INPUT_BUFFER_PADDING_SIZE;
42 #endif 42 #endif
43 43
44 scoped_refptr<DataBuffer> data_buffer( 44 scoped_refptr<DataBuffer> data_buffer(
45 new DataBuffer(data_size + padding_size)); 45 new DataBuffer(data_size + padding_size));
46 memcpy(data_buffer->data_.get(), data, data_size); 46 memcpy(data_buffer->data_.get(), data, data_size);
47 memset(data_buffer->data_.get() + data_size, 0, padding_size); 47 memset(data_buffer->data_.get() + data_size, 0, padding_size);
48 data_buffer->SetDataSize(data_size); 48 data_buffer->SetDataSize(data_size);
49 return data_buffer; 49 return data_buffer;
50 } 50 }
51 51
52 const uint8* DataBuffer::GetData() const { 52 const uint8* DataBuffer::GetData() const {
53 return data_.get(); 53 return data_.get();
54 } 54 }
55 55
56 size_t DataBuffer::GetDataSize() const { 56 int DataBuffer::GetDataSize() const {
57 return data_size_; 57 return data_size_;
58 } 58 }
59 59
60 const DecryptConfig* DataBuffer::GetDecryptConfig() const { 60 const DecryptConfig* DataBuffer::GetDecryptConfig() const {
61 return decrypt_config_.get(); 61 return decrypt_config_.get();
62 } 62 }
63 63
64 uint8* DataBuffer::GetWritableData() { 64 uint8* DataBuffer::GetWritableData() {
65 return data_.get(); 65 return data_.get();
66 } 66 }
67 67
68 68
69 void DataBuffer::SetDataSize(size_t data_size) { 69 void DataBuffer::SetDataSize(int data_size) {
70 DCHECK_LE(data_size, buffer_size_); 70 DCHECK_LE(data_size, buffer_size_);
71 data_size_ = data_size; 71 data_size_ = data_size;
72 } 72 }
73 73
74 size_t DataBuffer::GetBufferSize() const { 74 int DataBuffer::GetBufferSize() const {
75 return buffer_size_; 75 return buffer_size_;
76 } 76 }
77 77
78 void DataBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { 78 void DataBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) {
79 decrypt_config_ = decrypt_config.Pass(); 79 decrypt_config_ = decrypt_config.Pass();
80 } 80 }
81 81
82 } // namespace media 82 } // namespace media
OLDNEW
« no previous file with comments | « media/base/data_buffer.h ('k') | media/base/data_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698