Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: media/tools/player_wtl/movie.cc

Issue 9826028: Rename AudioRendererBase and AudioRendererAlgorithmBase (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unit tests were somehow unadded Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/media.gyp ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/threading/platform_thread.h" 9 #include "base/threading/platform_thread.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
12 #include "media/audio/null_audio_sink.h" 12 #include "media/audio/null_audio_sink.h"
13 #include "media/base/filter_collection.h" 13 #include "media/base/filter_collection.h"
14 #include "media/base/media_log.h" 14 #include "media/base/media_log.h"
15 #include "media/base/message_loop_factory.h" 15 #include "media/base/message_loop_factory.h"
16 #include "media/base/pipeline.h" 16 #include "media/base/pipeline.h"
17 #include "media/filters/audio_renderer_base.h" 17 #include "media/filters/audio_renderer_impl.h"
18 #include "media/filters/ffmpeg_audio_decoder.h" 18 #include "media/filters/ffmpeg_audio_decoder.h"
19 #include "media/filters/ffmpeg_demuxer.h" 19 #include "media/filters/ffmpeg_demuxer.h"
20 #include "media/filters/ffmpeg_video_decoder.h" 20 #include "media/filters/ffmpeg_video_decoder.h"
21 #include "media/filters/file_data_source.h" 21 #include "media/filters/file_data_source.h"
22 #include "media/filters/video_renderer_base.h" 22 #include "media/filters/video_renderer_base.h"
23 23
24 namespace media { 24 namespace media {
25 25
26 Movie::Movie() 26 Movie::Movie()
27 : audio_manager_(AudioManager::Create()), 27 : audio_manager_(AudioManager::Create()),
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 base::Bind(&MessageLoopFactory::GetMessageLoop, 78 base::Bind(&MessageLoopFactory::GetMessageLoop,
79 base::Unretained(message_loop_factory_.get()), 79 base::Unretained(message_loop_factory_.get()),
80 "AudioDecoderThread"))); 80 "AudioDecoderThread")));
81 collection->AddVideoDecoder(new FFmpegVideoDecoder( 81 collection->AddVideoDecoder(new FFmpegVideoDecoder(
82 base::Bind(&MessageLoopFactory::GetMessageLoop, 82 base::Bind(&MessageLoopFactory::GetMessageLoop,
83 base::Unretained(message_loop_factory_.get()), 83 base::Unretained(message_loop_factory_.get()),
84 "VideoDecoderThread"))); 84 "VideoDecoderThread")));
85 85
86 // TODO(vrk): Re-enabled audio. (crbug.com/112159) 86 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
87 collection->AddAudioRenderer( 87 collection->AddAudioRenderer(
88 new media::AudioRendererBase(new media::NullAudioSink())); 88 new media::AudioRendererImpl(new media::NullAudioSink()));
89 collection->AddVideoRenderer(video_renderer); 89 collection->AddVideoRenderer(video_renderer);
90 90
91 // Create and start our pipeline. 91 // Create and start our pipeline.
92 media::PipelineStatusNotification note; 92 media::PipelineStatusNotification note;
93 pipeline_->Start( 93 pipeline_->Start(
94 collection.Pass(), 94 collection.Pass(),
95 media::PipelineStatusCB(), 95 media::PipelineStatusCB(),
96 media::PipelineStatusCB(), 96 media::PipelineStatusCB(),
97 media::NetworkEventCB(), 97 media::NetworkEventCB(),
98 note.Callback()); 98 note.Callback());
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 void Movie::Close() { 181 void Movie::Close() {
182 if (pipeline_) { 182 if (pipeline_) {
183 pipeline_->Stop(base::Closure()); 183 pipeline_->Stop(base::Closure());
184 pipeline_ = NULL; 184 pipeline_ = NULL;
185 } 185 }
186 186
187 message_loop_factory_.reset(); 187 message_loop_factory_.reset();
188 } 188 }
189 189
190 } // namespace media 190 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698