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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 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
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/base/filter_collection.h" 12 #include "media/base/filter_collection.h"
13 #include "media/base/media_log.h" 13 #include "media/base/media_log.h"
14 #include "media/base/message_loop_factory.h" 14 #include "media/base/message_loop_factory.h"
15 #include "media/base/pipeline.h" 15 #include "media/base/pipeline.h"
16 #include "media/filters/ffmpeg_audio_decoder.h" 16 #include "media/filters/ffmpeg_audio_decoder.h"
17 #include "media/filters/ffmpeg_demuxer_factory.h" 17 #include "media/filters/ffmpeg_demuxer_factory.h"
18 #include "media/filters/ffmpeg_video_decoder.h" 18 #include "media/filters/ffmpeg_video_decoder.h"
19 #include "media/filters/file_data_source.h" 19 #include "media/filters/file_data_source.h"
20 #include "media/filters/null_audio_renderer.h" 20 #include "media/filters/null_audio_renderer.h"
21 #include "media/filters/video_renderer_base.h" 21 #include "media/filters/video_renderer_base.h"
22 22
23 using media::FFmpegAudioDecoder;
24 using media::FFmpegDemuxerFactory;
25 using media::FFmpegVideoDecoder;
26 using media::FileDataSource;
27 using media::FilterCollection;
28 using media::Pipeline;
29
30 namespace media { 23 namespace media {
31 24
32 Movie::Movie() 25 Movie::Movie()
33 : audio_manager_(AudioManager::Create()), 26 : audio_manager_(AudioManager::Create()),
34 enable_audio_(false), 27 enable_audio_(false),
35 enable_draw_(true), 28 enable_draw_(true),
36 enable_dump_yuv_file_(false), 29 enable_dump_yuv_file_(false),
37 enable_pause_(false), 30 enable_pause_(false),
38 max_threads_(0), 31 max_threads_(0),
39 play_rate_(1.0f), 32 play_rate_(1.0f),
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 void Movie::Close() { 180 void Movie::Close() {
188 if (pipeline_) { 181 if (pipeline_) {
189 pipeline_->Stop(media::PipelineStatusCB()); 182 pipeline_->Stop(media::PipelineStatusCB());
190 pipeline_ = NULL; 183 pipeline_ = NULL;
191 } 184 }
192 185
193 message_loop_factory_.reset(); 186 message_loop_factory_.reset();
194 } 187 }
195 188
196 } // namespace media 189 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698