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

Side by Side Diff: chromecast/media/base/switching_media_renderer.cc

Issue 975973003: Chromecast: fix SwitchingMediaRenderer::Initialize signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « chromecast/media/base/switching_media_renderer.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chromecast/media/base/switching_media_renderer.h" 5 #include "chromecast/media/base/switching_media_renderer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/audio_decoder_config.h" 8 #include "media/base/audio_decoder_config.h"
9 #include "media/base/demuxer_stream.h" 9 #include "media/base/demuxer_stream.h"
10 #include "media/base/demuxer_stream_provider.h" 10 #include "media/base/demuxer_stream_provider.h"
11 11
12 namespace chromecast { 12 namespace chromecast {
13 namespace media { 13 namespace media {
14 14
15 SwitchingMediaRenderer::SwitchingMediaRenderer( 15 SwitchingMediaRenderer::SwitchingMediaRenderer(
16 scoped_ptr<::media::Renderer> default_renderer, 16 scoped_ptr<::media::Renderer> default_renderer,
17 scoped_ptr<::media::Renderer> cma_renderer) 17 scoped_ptr<::media::Renderer> cma_renderer)
18 : default_renderer_(default_renderer.Pass()), 18 : default_renderer_(default_renderer.Pass()),
19 cma_renderer_(cma_renderer.Pass()) { 19 cma_renderer_(cma_renderer.Pass()) {
20 DCHECK(default_renderer_); 20 DCHECK(default_renderer_);
21 DCHECK(cma_renderer_); 21 DCHECK(cma_renderer_);
22 } 22 }
23 23
24 SwitchingMediaRenderer::~SwitchingMediaRenderer() { 24 SwitchingMediaRenderer::~SwitchingMediaRenderer() {
25 } 25 }
26 26
27 void SwitchingMediaRenderer::Initialize( 27 void SwitchingMediaRenderer::Initialize(
28 ::media::DemuxerStreamProvider* demuxer_stream_provider, 28 ::media::DemuxerStreamProvider* demuxer_stream_provider,
29 const base::Closure& init_cb, 29 const ::media::PipelineStatusCB& init_cb,
30 const ::media::StatisticsCB& statistics_cb, 30 const ::media::StatisticsCB& statistics_cb,
31 const ::media::BufferingStateCB& buffering_state_cb, 31 const ::media::BufferingStateCB& buffering_state_cb,
32 const ::media::Renderer::PaintCB& paint_cb, 32 const ::media::Renderer::PaintCB& paint_cb,
33 const base::Closure& ended_cb, 33 const base::Closure& ended_cb,
34 const ::media::PipelineStatusCB& error_cb, 34 const ::media::PipelineStatusCB& error_cb,
35 const base::Closure& waiting_for_decryption_key_cb) { 35 const base::Closure& waiting_for_decryption_key_cb) {
36 // At this point the DemuxerStreamProvider should be fully initialized, so we 36 // At this point the DemuxerStreamProvider should be fully initialized, so we
37 // have enough information to decide which renderer to use. 37 // have enough information to decide which renderer to use.
38 demuxer_stream_provider_ = demuxer_stream_provider; 38 demuxer_stream_provider_ = demuxer_stream_provider;
39 DCHECK(demuxer_stream_provider_); 39 DCHECK(demuxer_stream_provider_);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 bool SwitchingMediaRenderer::HasAudio() { 95 bool SwitchingMediaRenderer::HasAudio() {
96 return GetRenderer()->HasAudio(); 96 return GetRenderer()->HasAudio();
97 } 97 }
98 98
99 bool SwitchingMediaRenderer::HasVideo() { 99 bool SwitchingMediaRenderer::HasVideo() {
100 return GetRenderer()->HasVideo(); 100 return GetRenderer()->HasVideo();
101 } 101 }
102 102
103 } // namespace media 103 } // namespace media
104 } // namespace chromecast 104 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/base/switching_media_renderer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698