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

Side by Side Diff: media/tools/player_x11/player_x11.cc

Issue 517003002: Remove RenderThreadImpl dependencies from WebMediaPlayerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix player_x11 with 1 hand while shaking fist at it with the other. Created 6 years, 3 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
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 <signal.h> 5 #include <signal.h>
6 6
7 #include <iostream> // NOLINT 7 #include <iostream> // NOLINT
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 44100, 131 44100,
132 16, 132 16,
133 512); 133 512);
134 media::AudioHardwareConfig hardware_config(out_params, out_params); 134 media::AudioHardwareConfig hardware_config(out_params, out_params);
135 135
136 scoped_ptr<media::AudioRenderer> audio_renderer( 136 scoped_ptr<media::AudioRenderer> audio_renderer(
137 new media::AudioRendererImpl(task_runner, 137 new media::AudioRendererImpl(task_runner,
138 new media::NullAudioSink(task_runner), 138 new media::NullAudioSink(task_runner),
139 audio_decoders.Pass(), 139 audio_decoders.Pass(),
140 media::SetDecryptorReadyCB(), 140 media::SetDecryptorReadyCB(),
141 &hardware_config)); 141 hardware_config));
142 142
143 scoped_ptr<media::Renderer> renderer(new media::RendererImpl( 143 scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
144 task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass())); 144 task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass()));
145 145
146 collection->SetRenderer(renderer.Pass()); 146 collection->SetRenderer(renderer.Pass());
147 147
148 base::WaitableEvent event(true, false); 148 base::WaitableEvent event(true, false);
149 media::PipelineStatus status; 149 media::PipelineStatus status;
150 150
151 pipeline->Start(collection.Pass(), 151 pipeline->Start(collection.Pass(),
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // Release callback which releases video renderer. Do this before cleaning up 306 // Release callback which releases video renderer. Do this before cleaning up
307 // X below since the video renderer has some X cleanup duties as well. 307 // X below since the video renderer has some X cleanup duties as well.
308 paint_cb.Reset(); 308 paint_cb.Reset();
309 309
310 XDestroyWindow(g_display, g_window); 310 XDestroyWindow(g_display, g_window);
311 XCloseDisplay(g_display); 311 XCloseDisplay(g_display);
312 g_audio_manager = NULL; 312 g_audio_manager = NULL;
313 313
314 return 0; 314 return 0;
315 } 315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698