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

Unified Diff: media/base/data_buffer.cc

Issue 46015: Buffer interface is not uint8*. Slight change to way data buffers are create... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/data_buffer.h ('k') | media/base/data_buffer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/data_buffer.cc
===================================================================
--- media/base/data_buffer.cc (revision 11456)
+++ media/base/data_buffer.cc (working copy)
@@ -7,24 +7,17 @@
namespace media {
-DataBuffer::DataBuffer(char* data, size_t buffer_size, size_t data_size,
- const base::TimeDelta& timestamp,
- const base::TimeDelta& duration)
- : data_(data),
- buffer_size_(buffer_size),
- data_size_(data_size) {
- DCHECK(data);
- DCHECK(buffer_size >= 0);
- DCHECK(data_size <= buffer_size);
- SetTimestamp(timestamp);
- SetDuration(duration);
+DataBuffer::DataBuffer()
+ : data_(NULL),
+ buffer_size_(0),
+ data_size_(0) {
}
DataBuffer::~DataBuffer() {
delete [] data_;
}
-const char* DataBuffer::GetData() const {
+const uint8* DataBuffer::GetData() const {
return data_;
}
@@ -32,15 +25,23 @@
return data_size_;
}
-char* DataBuffer::GetWritableData() {
+uint8* DataBuffer::GetWritableData(size_t buffer_size) {
+ if (buffer_size > buffer_size_) {
+ delete [] data_;
+ data_ = new uint8[buffer_size];
+ if (!data_) {
+ NOTREACHED();
+ buffer_size = 0;
+ }
+ buffer_size_ = buffer_size;
+ }
+ data_size_ = buffer_size;
return data_;
}
-size_t DataBuffer::GetBufferSize() const {
- return buffer_size_;
-}
void DataBuffer::SetDataSize(size_t data_size) {
+ DCHECK(data_size <= buffer_size_);
data_size_ = data_size;
}
« 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