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

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

Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed android build Created 5 years, 10 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/renderers/audio_renderer_impl.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"
11 #include "media/base/audio_decoder.h" 11 #include "media/base/audio_decoder.h"
12 #include "media/base/audio_renderer.h" 12 #include "media/base/audio_renderer.h"
13 #include "media/base/audio_renderer_sink.h" 13 #include "media/base/audio_renderer_sink.h"
14 #include "media/base/decryptor.h" 14 #include "media/base/decryptor.h"
15 #include "media/base/media_log.h" 15 #include "media/base/media_log.h"
16 #include "media/base/video_renderer.h" 16 #include "media/base/video_renderer.h"
17 #include "media/filters/audio_renderer_impl.h"
18 #include "media/filters/renderer_impl.h"
19 #include "media/filters/video_renderer_impl.h"
20 #include "media/mojo/services/demuxer_stream_provider_shim.h" 17 #include "media/mojo/services/demuxer_stream_provider_shim.h"
21 #include "media/mojo/services/renderer_config.h" 18 #include "media/mojo/services/renderer_config.h"
19 #include "media/renderers/audio_renderer_impl.h"
20 #include "media/renderers/renderer_impl.h"
21 #include "media/renderers/video_renderer_impl.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 // Time interval to update media time. 25 // Time interval to update media time.
26 const int kTimeUpdateIntervalMs = 50; 26 const int kTimeUpdateIntervalMs = 50;
27 27
28 static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log, 28 static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
29 const std::string& error) { 29 const std::string& error) {
30 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); 30 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
31 } 31 }
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 185 }
186 186
187 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) { 187 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {
188 DVLOG(1) << __FUNCTION__; 188 DVLOG(1) << __FUNCTION__;
189 DCHECK_EQ(state_, STATE_FLUSHING); 189 DCHECK_EQ(state_, STATE_FLUSHING);
190 state_ = STATE_PLAYING; 190 state_ = STATE_PLAYING;
191 callback.Run(); 191 callback.Run();
192 } 192 }
193 193
194 } // namespace media 194 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698