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

Side by Side Diff: media/tools/player_x11/player_x11.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/tools/player_wtl/movie.cc ('k') | webkit/media/webmediaplayer_impl.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 <X11/XKBlib.h> 5 #include <X11/XKBlib.h>
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <iostream> // NOLINT 9 #include <iostream> // NOLINT
10 10
11 #include "base/at_exit.h" 11 #include "base/at_exit.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/threading/platform_thread.h" 16 #include "base/threading/platform_thread.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "media/audio/audio_manager.h" 18 #include "media/audio/audio_manager.h"
19 #include "media/audio/null_audio_sink.h" 19 #include "media/audio/null_audio_sink.h"
20 #include "media/base/filter_collection.h" 20 #include "media/base/filter_collection.h"
21 #include "media/base/media.h" 21 #include "media/base/media.h"
22 #include "media/base/media_log.h" 22 #include "media/base/media_log.h"
23 #include "media/base/media_switches.h" 23 #include "media/base/media_switches.h"
24 #include "media/base/message_loop_factory.h" 24 #include "media/base/message_loop_factory.h"
25 #include "media/base/pipeline.h" 25 #include "media/base/pipeline.h"
26 #include "media/base/video_frame.h" 26 #include "media/base/video_frame.h"
27 #include "media/filters/audio_renderer_base.h" 27 #include "media/filters/audio_renderer_impl.h"
28 #include "media/filters/ffmpeg_audio_decoder.h" 28 #include "media/filters/ffmpeg_audio_decoder.h"
29 #include "media/filters/ffmpeg_demuxer.h" 29 #include "media/filters/ffmpeg_demuxer.h"
30 #include "media/filters/ffmpeg_video_decoder.h" 30 #include "media/filters/ffmpeg_video_decoder.h"
31 #include "media/filters/file_data_source.h" 31 #include "media/filters/file_data_source.h"
32 #include "media/filters/video_renderer_base.h" 32 #include "media/filters/video_renderer_base.h"
33 #include "media/tools/player_x11/data_source_logger.h" 33 #include "media/tools/player_x11/data_source_logger.h"
34 #include "media/tools/player_x11/gl_video_renderer.h" 34 #include "media/tools/player_x11/gl_video_renderer.h"
35 #include "media/tools/player_x11/x11_video_renderer.h" 35 #include "media/tools/player_x11/x11_video_renderer.h"
36 36
37 static Display* g_display = NULL; 37 static Display* g_display = NULL;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 "VideoDecoderThread"))); 122 "VideoDecoderThread")));
123 123
124 // Create our video renderer and save a reference to it for painting. 124 // Create our video renderer and save a reference to it for painting.
125 g_video_renderer = new media::VideoRendererBase( 125 g_video_renderer = new media::VideoRendererBase(
126 base::Bind(&Paint, paint_message_loop, paint_cb), 126 base::Bind(&Paint, paint_message_loop, paint_cb),
127 base::Bind(&SetOpaque), 127 base::Bind(&SetOpaque),
128 true); 128 true);
129 collection->AddVideoRenderer(g_video_renderer); 129 collection->AddVideoRenderer(g_video_renderer);
130 130
131 collection->AddAudioRenderer( 131 collection->AddAudioRenderer(
132 new media::AudioRendererBase(new media::NullAudioSink())); 132 new media::AudioRendererImpl(new media::NullAudioSink()));
133 133
134 // Create the pipeline and start it. 134 // Create the pipeline and start it.
135 *pipeline = new media::Pipeline(message_loop, new media::MediaLog()); 135 *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
136 media::PipelineStatusNotification note; 136 media::PipelineStatusNotification note;
137 (*pipeline)->Start( 137 (*pipeline)->Start(
138 collection.Pass(), media::PipelineStatusCB(), 138 collection.Pass(), media::PipelineStatusCB(),
139 media::PipelineStatusCB(), media::NetworkEventCB(), 139 media::PipelineStatusCB(), media::NetworkEventCB(),
140 note.Callback()); 140 note.Callback());
141 141
142 // Wait until the pipeline is fully initialized. 142 // Wait until the pipeline is fully initialized.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 // Release callback which releases video renderer. Do this before cleaning up 301 // Release callback which releases video renderer. Do this before cleaning up
302 // X below since the video renderer has some X cleanup duties as well. 302 // X below since the video renderer has some X cleanup duties as well.
303 paint_cb.Reset(); 303 paint_cb.Reset();
304 304
305 XDestroyWindow(g_display, g_window); 305 XDestroyWindow(g_display, g_window);
306 XCloseDisplay(g_display); 306 XCloseDisplay(g_display);
307 g_audio_manager = NULL; 307 g_audio_manager = NULL;
308 308
309 return 0; 309 return 0;
310 } 310 }
OLDNEW
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698