diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 09:01:00 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 09:01:00 +0000 |
| commit | 15af2b58ceeddb4bdb08fc9c58f9f9de3b372687 (patch) | |
| tree | a28e94c785f28ba8fdd969fb80e4066e3ee0b572 /media/tools | |
| parent | 193bacdf287c87aab760f6ea25fff8bda6326c60 (diff) | |
| download | chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.zip chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.tar.gz chromium_src-15af2b58ceeddb4bdb08fc9c58f9f9de3b372687.tar.bz2 | |
Revert 136679 - Delete MockDataSource, remove IsLocalSource & IsSeekable from Demuxer/Pipeline.
It broke LayoutTests/http/tests/media/media-source/webm/video-media-source-seek.html
and video-media-source-state-changes.html.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&showLargeExpectations=true&tests=http%2Ftests%2Fmedia%2Fmedia-source%2Fwebm%2Fvideo-media-source-seek.html%2Chttp%2Ftests%2Fmedia%2Fmedia-source%2Fwebm%2Fvideo-media-source-state-changes.html
Review URL: https://chromiumcodereview.appspot.com/10378100
TBR=fischman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10378119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 3 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 3 | ||||
| -rw-r--r-- | media/tools/seek_tester/seek_tester.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 3473aff..310a5b1 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -72,7 +72,8 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { // Create filter collection. scoped_ptr<FilterCollection> collection(new FilterCollection()); - collection->SetDemuxer(new FFmpegDemuxer(pipeline_loop, data_source)); + collection->SetDemuxer(new FFmpegDemuxer( + pipeline_loop, data_source, true)); collection->AddAudioDecoder(new FFmpegAudioDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 68fe80c..6b028e5 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -110,7 +110,8 @@ bool InitPipeline(MessageLoop* message_loop, // Create our filter factories. scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); + collection->SetDemuxer(new media::FFmpegDemuxer( + message_loop, data_source, true)); collection->AddAudioDecoder(new media::FFmpegAudioDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc index b14628c..65046ef 100644 --- a/media/tools/seek_tester/seek_tester.cc +++ b/media/tools/seek_tester/seek_tester.cc @@ -65,7 +65,7 @@ int main(int argc, char** argv) { MessageLoop loop; media::PipelineStatusCB quitter = base::Bind(&QuitMessageLoop, &loop); scoped_refptr<media::FFmpegDemuxer> demuxer( - new media::FFmpegDemuxer(&loop, file_data_source)); + new media::FFmpegDemuxer(&loop, file_data_source, true)); demuxer->Initialize(&host, quitter); loop.Run(); |