Introducing DecoderBuffer and general Buffer cleanup.

media/filters/pipeline_integration_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
+#include "media/base/decoder_buffer.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer_client.h"
 
 namespace media {
 
 // Key ID of the video track in test file "bear-320x240-encrypted.webm".
 static const unsigned char kKeyId[] =
     "\x11\xa5\x18\x37\xc4\x73\x84\x03\xe5\xe6\x57\xed\x8e\x06\xd9\x7c";
 
 static const char* kSourceId = "SourceId";
 
 // Helper class that emulates calls made on the ChunkDemuxer by the
 // Media Source API.
 class MockMediaSource : public ChunkDemuxerClient {
  public:
   MockMediaSource(const std::string& filename, int initial_append_size)
       : url_(GetTestDataURL(filename)),
         current_position_(0),
         initial_append_size_(initial_append_size) {
-    ReadTestDataFile(filename, &file_data_, &file_data_size_);
+    file_data_ = ReadTestDataFile(filename);
 
     DCHECK_GT(initial_append_size_, 0);
-    DCHECK_LE(initial_append_size_, file_data_size_);
+    DCHECK_LE(initial_append_size_, file_data_->GetDataSize());
   }
 
   virtual ~MockMediaSource() {}
 
   void set_decryptor(AesDecryptor* decryptor) {
     decryptor_ = decryptor;
   }
   AesDecryptor* decryptor() const {
     return decryptor_;
   }
 
   const std::string& url() const { return url_; }
 
   void Seek(int new_position, int seek_append_size) {
     chunk_demuxer_->StartWaitingForSeek();
 
     DCHECK_GE(new_position, 0);
-    DCHECK_LT(new_position, file_data_size_);
+    DCHECK_LT(new_position, file_data_->GetDataSize());
     current_position_ = new_position;
 
     AppendData(seek_append_size);
   }
 
   void AppendData(int size) {
     DCHECK(chunk_demuxer_.get());
-    DCHECK_LT(current_position_, file_data_size_);
-    DCHECK_LE(current_position_ + size, file_data_size_);
-    CHECK(chunk_demuxer_->AppendData(kSourceId,
-                                     file_data_.get() + current_position_,
-                                     size));
+    DCHECK_LT(current_position_, file_data_->GetDataSize());
+    DCHECK_LE(current_position_ + size, file_data_->GetDataSize());
+    CHECK(chunk_demuxer_->AppendData(
+        kSourceId, file_data_->GetData() + current_position_, size));
     current_position_ += size;
   }
 
   void EndOfStream() {
     chunk_demuxer_->EndOfStream(PIPELINE_OK);
   }
 
   void Abort() {
     if (!chunk_demuxer_.get())
       return;
@@ skipping 20 matching lines @@
     DCHECK_EQ(init_data_size, 16);
     DCHECK(decryptor());
     // In test file bear-320x240-encrypted.webm, the decryption key is equal to
     // |init_data|.
     decryptor()->AddKey(init_data.get(), init_data_size,
                         init_data.get(), init_data_size);
   }
 
  private:
   std::string url_;
-  scoped_array<uint8> file_data_;
-  int file_data_size_;
+  scoped_refptr<DecoderBuffer> file_data_;
   int current_position_;
   int initial_append_size_;
   scoped_refptr<ChunkDemuxer> chunk_demuxer_;
   AesDecryptor* decryptor_;
 };
 
 class PipelineIntegrationTest
     : public testing::Test,
       public PipelineIntegrationTestBase {
  public:
@@ skipping 120 matching lines @@
 
 // Verify video decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
   ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
                                  base::TimeDelta::FromMilliseconds(200),
                                  base::TimeDelta::FromMilliseconds(1668),
                                  0x1C896, 65536));
 }
 
 }  // namespace media