| Index: chromecast/renderer/media/demuxer_stream_for_test.cc
|
| diff --git a/chromecast/media/cma/test/demuxer_stream_for_test.cc b/chromecast/renderer/media/demuxer_stream_for_test.cc
|
| similarity index 77%
|
| rename from chromecast/media/cma/test/demuxer_stream_for_test.cc
|
| rename to chromecast/renderer/media/demuxer_stream_for_test.cc
|
| index 74e28ce66fe4b141c0092f2d71ab0842f4081732..228f1de769b7e46d8fdff7333df032640abcd499 100644
|
| --- a/chromecast/media/cma/test/demuxer_stream_for_test.cc
|
| +++ b/chromecast/renderer/media/demuxer_stream_for_test.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/threading/thread.h"
|
| -#include "chromecast/media/cma/test/demuxer_stream_for_test.h"
|
| +#include "chromecast/renderer/media/demuxer_stream_for_test.h"
|
|
|
| namespace chromecast {
|
| namespace media {
|
| @@ -35,8 +35,9 @@ void DemuxerStreamForTest::Read(const ReadCB& read_cb) {
|
|
|
| if ((frame_count_ % cycle_count_) < delayed_frame_count_) {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::Bind(&DemuxerStreamForTest::DoRead,
|
| - base::Unretained(this), read_cb),
|
| + FROM_HERE,
|
| + base::Bind(
|
| + &DemuxerStreamForTest::DoRead, base::Unretained(this), read_cb),
|
| base::TimeDelta::FromMilliseconds(20));
|
| return;
|
| }
|
| @@ -52,10 +53,16 @@ void DemuxerStreamForTest::Read(const ReadCB& read_cb) {
|
| gfx::Size coded_size(640, 480);
|
| gfx::Rect visible_rect(640, 480);
|
| gfx::Size natural_size(640, 480);
|
| - return ::media::VideoDecoderConfig(
|
| - ::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN,
|
| - ::media::PIXEL_FORMAT_YV12, ::media::COLOR_SPACE_UNSPECIFIED, coded_size,
|
| - visible_rect, natural_size, NULL, 0, false);
|
| + return ::media::VideoDecoderConfig(::media::kCodecH264,
|
| + ::media::VIDEO_CODEC_PROFILE_UNKNOWN,
|
| + ::media::PIXEL_FORMAT_YV12,
|
| + ::media::COLOR_SPACE_UNSPECIFIED,
|
| + coded_size,
|
| + visible_rect,
|
| + natural_size,
|
| + NULL,
|
| + 0,
|
| + false);
|
| }
|
|
|
| ::media::DemuxerStream::Type DemuxerStreamForTest::type() const {
|
|
|