summaryrefslogtreecommitdiff
path: root/chromium/media/base/decoder_buffer.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/decoder_buffer.h')
-rw-r--r--chromium/media/base/decoder_buffer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/media/base/decoder_buffer.h b/chromium/media/base/decoder_buffer.h
index 665313ddcc1..85036969abe 100644
--- a/chromium/media/base/decoder_buffer.h
+++ b/chromium/media/base/decoder_buffer.h
@@ -14,9 +14,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "build/build_config.h"
-#include "media/base/buffers.h"
#include "media/base/decrypt_config.h"
#include "media/base/media_export.h"
+#include "media/base/timestamp_constants.h"
namespace media {
@@ -96,6 +96,7 @@ class MEDIA_EXPORT DecoderBuffer
return data_.get();
}
+ // TODO(servolk): data_size should return size_t instead of int
int data_size() const {
DCHECK(!end_of_stream());
return size_;
@@ -106,6 +107,7 @@ class MEDIA_EXPORT DecoderBuffer
return side_data_.get();
}
+ // TODO(servolk): side_data_size should return size_t instead of int
int side_data_size() const {
DCHECK(!end_of_stream());
return side_data_size_;
@@ -187,6 +189,7 @@ class MEDIA_EXPORT DecoderBuffer
base::TimeDelta timestamp_;
base::TimeDelta duration_;
+ // TODO(servolk): Consider changing size_/side_data_size_ types to size_t.
int size_;
scoped_ptr<uint8, base::AlignedFreeDeleter> data_;
int side_data_size_;