diff options
| author | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 22:47:24 +0000 |
|---|---|---|
| committer | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 22:47:24 +0000 |
| commit | c93eb0a645fa854bd7d4337bc1bc17d2d28c5bc7 (patch) | |
| tree | 7da349009a59bb4bc306c30f9a68ccb9d9d328b0 /media/tools | |
| parent | 19c28bfec867442cc416fa5a3108418e01c714fb (diff) | |
| download | chromium_src-c93eb0a645fa854bd7d4337bc1bc17d2d28c5bc7.zip chromium_src-c93eb0a645fa854bd7d4337bc1bc17d2d28c5bc7.tar.gz chromium_src-c93eb0a645fa854bd7d4337bc1bc17d2d28c5bc7.tar.bz2 | |
Log PipelineImpl events to MediaLog.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7584013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96090 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 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 62da5e5..f92eb80 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -8,6 +8,7 @@ #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "media/base/filter_collection.h" +#include "media/base/media_log.h" #include "media/base/message_loop_factory_impl.h" #include "media/base/pipeline_impl.h" #include "media/filters/adaptive_demuxer.h" @@ -67,7 +68,7 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { MessageLoop* pipeline_loop = message_loop_factory_->GetMessageLoop("PipelineThread"); - pipeline_ = new PipelineImpl(pipeline_loop); + pipeline_ = new PipelineImpl(pipeline_loop, new media::MediaLog()); // Create filter collection. scoped_ptr<FilterCollection> collection(new FilterCollection()); diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 4b34a60..d23f634 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -16,6 +16,7 @@ #include "media/base/callback.h" #include "media/base/filter_collection.h" #include "media/base/media.h" +#include "media/base/media_log.h" #include "media/base/media_switches.h" #include "media/base/message_loop_factory_impl.h" #include "media/base/pipeline_impl.h" @@ -108,7 +109,7 @@ bool InitPipeline(MessageLoop* message_loop, collection->AddAudioRenderer(new media::NullAudioRenderer()); // Create the pipeline and start it. - *pipeline = new media::PipelineImpl(message_loop); + *pipeline = new media::PipelineImpl(message_loop, new media::MediaLog()); media::PipelineStatusNotification note; (*pipeline)->Start(collection.release(), filename, note.Callback()); |