| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/tools/player_wtl/movie.h" | 5 #include "media/tools/player_wtl/movie.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "media/base/filter_collection.h" | 10 #include "media/base/filter_collection.h" |
| 11 #include "media/base/media_log.h" |
| 11 #include "media/base/message_loop_factory_impl.h" | 12 #include "media/base/message_loop_factory_impl.h" |
| 12 #include "media/base/pipeline_impl.h" | 13 #include "media/base/pipeline_impl.h" |
| 13 #include "media/filters/adaptive_demuxer.h" | 14 #include "media/filters/adaptive_demuxer.h" |
| 14 #include "media/filters/audio_renderer_impl.h" | 15 #include "media/filters/audio_renderer_impl.h" |
| 15 #include "media/filters/ffmpeg_audio_decoder.h" | 16 #include "media/filters/ffmpeg_audio_decoder.h" |
| 16 #include "media/filters/ffmpeg_demuxer_factory.h" | 17 #include "media/filters/ffmpeg_demuxer_factory.h" |
| 17 #include "media/filters/ffmpeg_video_decoder.h" | 18 #include "media/filters/ffmpeg_video_decoder.h" |
| 18 #include "media/filters/file_data_source_factory.h" | 19 #include "media/filters/file_data_source_factory.h" |
| 19 #include "media/filters/null_audio_renderer.h" | 20 #include "media/filters/null_audio_renderer.h" |
| 20 #include "media/tools/player_wtl/wtl_renderer.h" | 21 #include "media/tools/player_wtl/wtl_renderer.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { | 61 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { |
| 61 // Close previous movie. | 62 // Close previous movie. |
| 62 if (pipeline_) { | 63 if (pipeline_) { |
| 63 Close(); | 64 Close(); |
| 64 } | 65 } |
| 65 | 66 |
| 66 message_loop_factory_.reset(new media::MessageLoopFactoryImpl()); | 67 message_loop_factory_.reset(new media::MessageLoopFactoryImpl()); |
| 67 | 68 |
| 68 MessageLoop* pipeline_loop = | 69 MessageLoop* pipeline_loop = |
| 69 message_loop_factory_->GetMessageLoop("PipelineThread"); | 70 message_loop_factory_->GetMessageLoop("PipelineThread"); |
| 70 pipeline_ = new PipelineImpl(pipeline_loop); | 71 pipeline_ = new PipelineImpl(pipeline_loop, new media::MediaLog()); |
| 71 | 72 |
| 72 // Create filter collection. | 73 // Create filter collection. |
| 73 scoped_ptr<FilterCollection> collection(new FilterCollection()); | 74 scoped_ptr<FilterCollection> collection(new FilterCollection()); |
| 74 collection->SetDemuxerFactory(new AdaptiveDemuxerFactory( | 75 collection->SetDemuxerFactory(new AdaptiveDemuxerFactory( |
| 75 new FFmpegDemuxerFactory(new FileDataSourceFactory(), pipeline_loop))); | 76 new FFmpegDemuxerFactory(new FileDataSourceFactory(), pipeline_loop))); |
| 76 collection->AddAudioDecoder(new FFmpegAudioDecoder( | 77 collection->AddAudioDecoder(new FFmpegAudioDecoder( |
| 77 message_loop_factory_->GetMessageLoop("AudioDecoderThread"))); | 78 message_loop_factory_->GetMessageLoop("AudioDecoderThread"))); |
| 78 collection->AddVideoDecoder(new FFmpegVideoDecoder( | 79 collection->AddVideoDecoder(new FFmpegVideoDecoder( |
| 79 message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL)); | 80 message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL)); |
| 80 | 81 |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 void Movie::Close() { | 175 void Movie::Close() { |
| 175 if (pipeline_) { | 176 if (pipeline_) { |
| 176 pipeline_->Stop(NULL); | 177 pipeline_->Stop(NULL); |
| 177 pipeline_ = NULL; | 178 pipeline_ = NULL; |
| 178 } | 179 } |
| 179 | 180 |
| 180 message_loop_factory_.reset(); | 181 message_loop_factory_.reset(); |
| 181 } | 182 } |
| 182 | 183 |
| 183 } // namespace media | 184 } // namespace media |
| OLD | NEW |