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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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
« no previous file with comments | « media/mojo/services/renderer_config.h ('k') | media/mojo/services/renderer_config_default.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 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/renderer_config.h" 5 #include "media/mojo/services/renderer_config.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 namespace internal { 9 namespace internal {
10 extern scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig(); 10 extern scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig();
(...skipping 16 matching lines...) Expand all
27 ScopedVector<VideoDecoder> RendererConfig::GetVideoDecoders( 27 ScopedVector<VideoDecoder> RendererConfig::GetVideoDecoders(
28 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 28 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
29 const LogCB& media_log_cb) { 29 const LogCB& media_log_cb) {
30 return renderer_config_->GetVideoDecoders(media_task_runner, media_log_cb); 30 return renderer_config_->GetVideoDecoders(media_task_runner, media_log_cb);
31 } 31 }
32 32
33 scoped_refptr<AudioRendererSink> RendererConfig::GetAudioRendererSink() { 33 scoped_refptr<AudioRendererSink> RendererConfig::GetAudioRendererSink() {
34 return renderer_config_->GetAudioRendererSink(); 34 return renderer_config_->GetAudioRendererSink();
35 } 35 }
36 36
37 scoped_ptr<VideoRendererSink> RendererConfig::GetVideoRendererSink() {
38 return renderer_config_->GetVideoRendererSink();
39 }
40
41 const AudioHardwareConfig& RendererConfig::GetAudioHardwareConfig() { 37 const AudioHardwareConfig& RendererConfig::GetAudioHardwareConfig() {
42 return renderer_config_->GetAudioHardwareConfig(); 38 return renderer_config_->GetAudioHardwareConfig();
43 } 39 }
44 40
45 RendererConfig::RendererConfig() 41 RendererConfig::RendererConfig()
46 : renderer_config_(internal::CreatePlatformRendererConfig().Pass()) { 42 : renderer_config_(internal::CreatePlatformRendererConfig().Pass()) {
47 } 43 }
48 44
49 RendererConfig::~RendererConfig() { 45 RendererConfig::~RendererConfig() {
50 } 46 }
51 47
52 } // namespace media 48 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/renderer_config.h ('k') | media/mojo/services/renderer_config_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698