Separate DemuxerStream and VideoDecoder.

media/base/decoder_buffer.h

Index: media/base/decoder_buffer.h
diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h
index d1c20ddda362673e2c5c191d0844c4714814cee7..3496be1f4656933fc3921cec73ca6838720efff2 100644
--- a/media/base/decoder_buffer.h
+++ b/media/base/decoder_buffer.h
@@ -17,6 +17,7 @@
 namespace media {
 
 class DecryptConfig;
+class VideoDecoderConfig;
 
 // A specialized buffer for interfacing with audio / video decoders.
 //
@@ -54,12 +55,27 @@ class MEDIA_EXPORT DecoderBuffer
                                                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);