diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 16:50:29 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 16:50:29 +0000 |
| commit | 580a237901a89024e6a0f0d2400b448817d7b639 (patch) | |
| tree | 5fc53983e6288fff09e93f01612ef2f4a01af0c8 /media/tools | |
| parent | c084925c810975c3050e512c2f4f237d14242f01 (diff) | |
| download | chromium_src-580a237901a89024e6a0f0d2400b448817d7b639.zip chromium_src-580a237901a89024e6a0f0d2400b448817d7b639.tar.gz chromium_src-580a237901a89024e6a0f0d2400b448817d7b639.tar.bz2 | |
Reland r136679, reverted in r136753: Delete MockDataSource, remove IsLocalSource & IsSeekable from Demuxer/Pipeline.
MockDataSource was completely unused, and Is{LocalSource,Seekable} being in the
Demuxer is leftover craxy from the DataSourceFactory / DemuxerFactory /
DownloadRateMonitor days, may they forever RIP.
BUG=120426
TBR=scherkus
Review URL: https://chromiumcodereview.appspot.com/10392069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136770 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, 3 insertions, 5 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 310a5b1..3473aff 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -72,8 +72,7 @@ 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, true)); + collection->SetDemuxer(new FFmpegDemuxer(pipeline_loop, data_source)); 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 6b028e5..68fe80c 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -110,8 +110,7 @@ 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, true)); + collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); 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 65046ef..b14628c 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, true)); + new media::FFmpegDemuxer(&loop, file_data_source)); demuxer->Initialize(&host, quitter); loop.Run(); |