Eliminate media::Buffer as a base class for media::DecoderBuffer and media::DataBuffer.

It was never a good idea in the first place.

Our usage is exclusively with DecoderBuffers or DataBuffers. There's never a case where we benefit from using Buffer as a base class aside from hiding GetWriteableData(), however it's not a compelling enough reason to keep Buffer around.

BUG=169614
TBR=dmichael

Review URL: https://codereview.chromium.org/11880008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176956 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 26 insertions, 8 deletions

diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc
index e4af00e..9cc54ae 100644
--- a/media/base/decoder_buffer.cc
+++ b/media/base/decoder_buffer.cc
@@ -10,14 +10,12 @@
 namespace media {
 
 DecoderBuffer::DecoderBuffer(int buffer_size)
-    : Buffer(base::TimeDelta(), base::TimeDelta()),
-      buffer_size_(buffer_size) {
+    : buffer_size_(buffer_size) {
   Initialize();
 }
 
 DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size)
-    : Buffer(base::TimeDelta(), base::TimeDelta()),
-      buffer_size_(buffer_size) {
+    : buffer_size_(buffer_size) {
   // Prevent invalid allocations.  Also used to create end of stream buffers.
   if (!data || buffer_size <= 0) {
     buffer_size_ = 0;
@@ -47,16 +45,32 @@ scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() {
   return make_scoped_refptr(new DecoderBuffer(NULL, 0));
 }
 
+base::TimeDelta DecoderBuffer::GetTimestamp() const {
+  return timestamp_;
+}
+
+void DecoderBuffer::SetTimestamp(const base::TimeDelta& timestamp) {
+  timestamp_ = timestamp;
+}
+
+base::TimeDelta DecoderBuffer::GetDuration() const {
+  return duration_;
+}
+
+void DecoderBuffer::SetDuration(const base::TimeDelta& duration) {
+  duration_ = duration;
+}
+
 const uint8* DecoderBuffer::GetData() const {
   return data_.get();
 }
 
-int DecoderBuffer::GetDataSize() const {
-  return buffer_size_;
+uint8* DecoderBuffer::GetWritableData() const {
+  return data_.get();
 }
 
-uint8* DecoderBuffer::GetWritableData() {
-  return data_.get();
+int DecoderBuffer::GetDataSize() const {
+  return buffer_size_;
 }
 
 const DecryptConfig* DecoderBuffer::GetDecryptConfig() const {
@@ -67,4 +81,8 @@ void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) {
   decrypt_config_ = decrypt_config.Pass();
 }
 
+bool DecoderBuffer::IsEndOfStream() const {
+  return data_ == NULL;
+}
+
 }  // namespace media