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

Side by Side Diff: media/mojo/services/mojo_renderer_service.cc

Issue 1188753002: media: Fix mojo pipeline integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: MEDIA_EXPORT Created 5 years, 6 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
« no previous file with comments | « media/media.gyp ('k') | media/mojo/services/renderer_config.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/mojo/services/mojo_renderer_service.h" 5 #include "media/mojo/services/mojo_renderer_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 22 matching lines...) Expand all
33 last_media_time_usec_(0), 33 last_media_time_usec_(0),
34 weak_factory_(this) { 34 weak_factory_(this) {
35 weak_this_ = weak_factory_.GetWeakPtr(); 35 weak_this_ = weak_factory_.GetWeakPtr();
36 DVLOG(1) << __FUNCTION__; 36 DVLOG(1) << __FUNCTION__;
37 37
38 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 38 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
39 base::MessageLoop::current()->task_runner()); 39 base::MessageLoop::current()->task_runner());
40 scoped_refptr<MediaLog> media_log(new MediaLog()); 40 scoped_refptr<MediaLog> media_log(new MediaLog());
41 RendererConfig* renderer_config = RendererConfig::Get(); 41 RendererConfig* renderer_config = RendererConfig::Get();
42 audio_renderer_sink_ = renderer_config->GetAudioRendererSink(); 42 audio_renderer_sink_ = renderer_config->GetAudioRendererSink();
43 video_renderer_sink_ = renderer_config->GetVideoRendererSink(); 43 video_renderer_sink_ = renderer_config->GetVideoRendererSink(task_runner);
44 44
45 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( 45 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
46 task_runner, audio_renderer_sink_.get(), 46 task_runner, audio_renderer_sink_.get(),
47 renderer_config->GetAudioDecoders(task_runner, 47 renderer_config->GetAudioDecoders(task_runner,
48 base::Bind(&MediaLog::AddLogEvent, 48 base::Bind(&MediaLog::AddLogEvent,
49 media_log)).Pass(), 49 media_log)).Pass(),
50 renderer_config->GetAudioHardwareConfig(), media_log)); 50 renderer_config->GetAudioHardwareConfig(), media_log));
51 51
52 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 52 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
53 task_runner, video_renderer_sink_.get(), 53 task_runner, video_renderer_sink_.get(),
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 } 181 }
182 182
183 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) { 183 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {
184 DVLOG(1) << __FUNCTION__; 184 DVLOG(1) << __FUNCTION__;
185 DCHECK_EQ(state_, STATE_FLUSHING); 185 DCHECK_EQ(state_, STATE_FLUSHING);
186 state_ = STATE_PLAYING; 186 state_ = STATE_PLAYING;
187 callback.Run(); 187 callback.Run();
188 } 188 }
189 189
190 } // namespace media 190 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/mojo/services/renderer_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698