Revert 194465 "media: Add support for playback for VP8 Alpha vid..."

trunk/src/media/base/decoder_buffer.cc

Index: trunk/src/media/base/decoder_buffer.cc
===================================================================
--- trunk/src/media/base/decoder_buffer.cc	(revision 194468)
+++ trunk/src/media/base/decoder_buffer.cc	(working copy)
@@ -10,14 +10,12 @@
 namespace media {
 
 DecoderBuffer::DecoderBuffer(int size)
-    : size_(size),
-      side_data_size_(0) {
+    : size_(size) {
   Initialize();
 }
 
 DecoderBuffer::DecoderBuffer(const uint8* data, int size)
-    : size_(size),
-      side_data_size_(0) {
+    : size_(size) {
   if (!data) {
     CHECK_EQ(size_, 0);
     return;
@@ -27,20 +25,6 @@
   memcpy(data_.get(), data, size_);
 }
 
-DecoderBuffer::DecoderBuffer(const uint8* data, int size,
-                             const uint8* side_data, int side_data_size)
-    : size_(size),
-      side_data_size_(side_data_size) {
-  if (!data) {
-    CHECK_EQ(size_, 0);
-    return;
-  }
-
-  Initialize();
-  memcpy(data_.get(), data, size_);
-  memcpy(side_data_.get(), side_data, side_data_size_);
-}
-
 DecoderBuffer::~DecoderBuffer() {}
 
 void DecoderBuffer::Initialize() {
@@ -48,11 +32,6 @@
   data_.reset(reinterpret_cast<uint8*>(
       base::AlignedAlloc(size_ + kPaddingSize, kAlignmentSize)));
   memset(data_.get() + size_, 0, kPaddingSize);
-  if (side_data_size_ > 0) {
-    side_data_.reset(reinterpret_cast<uint8*>(
-        base::AlignedAlloc(side_data_size_ + kPaddingSize, kAlignmentSize)));
-    memset(side_data_.get() + side_data_size_, 0, kPaddingSize);
-  }
 }
 
 // static
@@ -64,18 +43,6 @@
 }
 
 // static
-scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
-                                                     int data_size,
-                                                     const uint8* side_data,
-                                                     int side_data_size) {
-  // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
-  CHECK(data);
-  CHECK(side_data);
-  return make_scoped_refptr(new DecoderBuffer(data, data_size,
-                                              side_data, side_data_size));
-}
-
-// static
 scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() {
   return make_scoped_refptr(new DecoderBuffer(NULL, 0));
 }
@@ -115,16 +82,6 @@
   return size_;
 }
 
-const uint8* DecoderBuffer::GetSideData() const {
-  DCHECK(!IsEndOfStream());
-  return side_data_.get();
-}
-
-int DecoderBuffer::GetSideDataSize() const {
-  DCHECK(!IsEndOfStream());
-  return side_data_size_;
-}
-
 const DecryptConfig* DecoderBuffer::GetDecryptConfig() const {
   DCHECK(!IsEndOfStream());
   return decrypt_config_.get();
@@ -148,7 +105,6 @@
   s << "timestamp: " << timestamp_.InMicroseconds()
     << " duration: " << duration_.InMicroseconds()
     << " size: " << size_
-    << " side_data_size: " << side_data_size_
     << " encrypted: " << (decrypt_config_ != NULL);
   return s.str();
 }