diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 15:56:29 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 15:56:29 +0000 |
| commit | b6c2955681cc0959a9754c02cab67b317fc59e8a (patch) | |
| tree | 65bd81c3fe1ec4d0bde03510bcad2d4b222e1c21 /media/tools | |
| parent | 42d2ebcb5bd1b2efc9cd32baf8656c859dff8313 (diff) | |
| download | chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.zip chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.tar.gz chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.tar.bz2 | |
Refactoring code to use factories to create DataSource objects.
BUG=72485
TEST=None for now. Existing unit tests cover this code.
Review URL: http://codereview.chromium.org/6480050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 8 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index fe73490..371d178 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,7 +14,7 @@ #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" -#include "media/filters/file_data_source.h" +#include "media/filters/file_data_source_factory.h" #include "media/filters/null_audio_renderer.h" #include "media/tools/player_wtl/wtl_renderer.h" @@ -22,7 +22,7 @@ using media::AudioRendererImpl; using media::FFmpegAudioDecoder; using media::FFmpegDemuxer; using media::FFmpegVideoDecoder; -using media::FileDataSource; +using media::FileDataSourceFactory; using media::FilterCollection; using media::PipelineImpl; @@ -65,7 +65,7 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { // Create filter collection. scoped_ptr<FilterCollection> collection(new FilterCollection()); - collection->AddDataSource(new FileDataSource()); + collection->SetDataSourceFactory(new FileDataSourceFactory()); collection->AddAudioDecoder(new FFmpegAudioDecoder( message_loop_factory_->GetMessageLoop("AudioDecoderThread"))); collection->AddDemuxer(new FFmpegDemuxer( diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 39504ff..68c56ae 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -23,7 +23,7 @@ #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" -#include "media/filters/file_data_source.h" +#include "media/filters/file_data_source_factory.h" #include "media/filters/null_audio_renderer.h" #include "media/filters/omx_video_decoder.h" @@ -103,7 +103,7 @@ bool InitPipeline(MessageLoop* message_loop, // Create our filter factories. scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - collection->AddDataSource(new media::FileDataSource()); + collection->SetDataSourceFactory(new media::FileDataSourceFactory()); collection->AddDemuxer(new media::FFmpegDemuxer( message_loop_factory->GetMessageLoop("DemuxThread"))); collection->AddAudioDecoder(new media::FFmpegAudioDecoder( |