Separate DemuxerStream and VideoDecoder.

media/base/decoder_buffer.h

 // 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.
 
 #ifndef MEDIA_BASE_DECODER_BUFFER_H_
 #define MEDIA_BASE_DECODER_BUFFER_H_
 
 #include <string>
 
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class DecryptConfig;
+class VideoDecoderConfig;
 
 // A specialized buffer for interfacing with audio / video decoders.
 //
 // Specifically ensures that data is aligned and padded as necessary by the
 // underlying decoding framework.  On desktop platforms this means memory is
 // allocated using FFmpeg with particular alignment and padding requirements.
 //
 // Also includes decoder specific functionality for decryption.
 //
 // NOTE: It is illegal to call any method when IsEndOfStream() is true.
@@ skipping 17 matching lines @@
   // padded and aligned as necessary.  |data| must not be NULL and |size| >= 0.
   static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size);
 
   // Create a DecoderBuffer whose |data_| is copied from |data| and |side_data_|
   // is copied from |side_data|. Buffers will be padded and aligned as necessary
   // Data pointers must not be NULL and sizes must be >= 0.
   static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size,
                                                const uint8* side_data,
                                                int side_data_size);
 
+  // Verify if a fake video DecoderBuffer is valid.
+  static bool VerifyFakeVideoBufferForTest(

[scherkus (not reviewing), 2013/06/12 01:06:10]

do we have to put these methods on DecoderBuffer?

[xhwang, 2013/07/03 08:01:34]

Done.

+      const scoped_refptr<DecoderBuffer>& buffer,
+      const VideoDecoderConfig& config);
+
   // Create a DecoderBuffer indicating we've reached end of stream.
   //
   // Calling any method other than IsEndOfStream() on the resulting buffer
   // is disallowed.
   static scoped_refptr<DecoderBuffer> CreateEOSBuffer();
 
+  static const char kFakeVideoBufferHeader[];
+
+  // Create a fake video DecoderBuffer for testing purpose. The buffer contains
+  // part of video decoder config info embedded so that the testing code can do
+  // some sanity check.
+  static scoped_refptr<DecoderBuffer> CreateFakeVideoBufferForTest(
+      const VideoDecoderConfig& config,
+      base::TimeDelta timestamp,
+      base::TimeDelta duration);
+
   base::TimeDelta GetTimestamp() const;
   void SetTimestamp(const base::TimeDelta& timestamp);
 
   base::TimeDelta GetDuration() const;
   void SetDuration(const base::TimeDelta& duration);
 
   const uint8* GetData() const;
   uint8* GetWritableData() const;
 
   int GetDataSize() const;
@@ skipping 32 matching lines @@
 
   // Constructor helper method for memory allocations.
   void Initialize();
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_BUFFER_H_