Reland r210741 "Separate DemuxerStream and VideoDecoder."

media/filters/fake_demuxer_stream.cc

 // Copyright (c) 2013 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/fake_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/pickle.h"
 #include "media/base/bind_to_loop.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/test_helpers.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 
 static const int kStartTimestampMs = 0;
 static const int kDurationMs = 30;
 static const int kStartWidth = 320;
 static const int kStartHeight = 240;
 static const int kWidthDelta = 4;
 static const int kHeightDelta = 3;
-static const char kFakeBufferHeader[] = "Fake Buffer";
 
 FakeDemuxerStream::FakeDemuxerStream(int num_configs,
                                      int num_buffers_in_one_config,
                                      bool is_encrypted)
     : message_loop_(base::MessageLoopProxy::current()),
       num_configs_left_(num_configs),
       num_buffers_in_one_config_(num_buffers_in_one_config),
       is_encrypted_(is_encrypted),
       num_buffers_left_in_current_config_(num_buffers_in_one_config),
       num_buffers_returned_(0),
@@ skipping 94 matching lines @@
       return;
     }
 
     // Config change.
     num_buffers_left_in_current_config_ = num_buffers_in_one_config_;
     UpdateVideoDecoderConfig();
     base::ResetAndReturn(&read_cb_).Run(kConfigChanged, NULL);
     return;
   }
 
-  // Prepare the next buffer.
-  Pickle pickle;
-  pickle.WriteString(kFakeBufferHeader);
-  pickle.WriteInt(video_decoder_config_.coded_size().width());
-  pickle.WriteInt(video_decoder_config_.coded_size().height());
-  pickle.WriteInt64(current_timestamp_.InMilliseconds());
-
-  scoped_refptr<DecoderBuffer> buffer = DecoderBuffer::CopyFrom(
-      static_cast<const uint8*>(pickle.data()), pickle.size());
+  scoped_refptr<DecoderBuffer> buffer = CreateFakeVideoBufferForTest(
+      video_decoder_config_, current_timestamp_, duration_);
 
   // TODO(xhwang): Output out-of-order buffers if needed.
-  buffer->SetTimestamp(current_timestamp_);
-  buffer->SetDuration(duration_);
   current_timestamp_ += duration_;
 
   num_buffers_left_in_current_config_--;
   if (num_buffers_left_in_current_config_ == 0)
     num_configs_left_--;
 
   num_buffers_returned_++;
   base::ResetAndReturn(&read_cb_).Run(kOk, buffer);
 }
 
 }  // namespace media