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

Side by Side Diff: chromecast/renderer/media/media_pipeline_proxy.cc

Issue 1148253006: Chromecast: Use std::vector to pass video config in CMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 "chromecast/renderer/media/media_pipeline_proxy.h" 5 #include "chromecast/renderer/media/media_pipeline_proxy.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/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 void MediaPipelineProxy::InitializeAudio( 207 void MediaPipelineProxy::InitializeAudio(
208 const ::media::AudioDecoderConfig& config, 208 const ::media::AudioDecoderConfig& config,
209 scoped_ptr<CodedFrameProvider> frame_provider, 209 scoped_ptr<CodedFrameProvider> frame_provider,
210 const ::media::PipelineStatusCB& status_cb) { 210 const ::media::PipelineStatusCB& status_cb) {
211 DCHECK(thread_checker_.CalledOnValidThread()); 211 DCHECK(thread_checker_.CalledOnValidThread());
212 has_audio_ = true; 212 has_audio_ = true;
213 audio_pipeline_->Initialize(config, frame_provider.Pass(), status_cb); 213 audio_pipeline_->Initialize(config, frame_provider.Pass(), status_cb);
214 } 214 }
215 215
216 void MediaPipelineProxy::InitializeVideo( 216 void MediaPipelineProxy::InitializeVideo(
217 const ::media::VideoDecoderConfig& config, 217 const std::vector<::media::VideoDecoderConfig>& configs,
218 scoped_ptr<CodedFrameProvider> frame_provider, 218 scoped_ptr<CodedFrameProvider> frame_provider,
219 const ::media::PipelineStatusCB& status_cb) { 219 const ::media::PipelineStatusCB& status_cb) {
220 DCHECK(thread_checker_.CalledOnValidThread()); 220 DCHECK(thread_checker_.CalledOnValidThread());
221 has_video_ = true; 221 has_video_ = true;
222 video_pipeline_->Initialize(config, frame_provider.Pass(), status_cb); 222 video_pipeline_->Initialize(configs, frame_provider.Pass(), status_cb);
223 } 223 }
224 224
225 void MediaPipelineProxy::StartPlayingFrom(base::TimeDelta time) { 225 void MediaPipelineProxy::StartPlayingFrom(base::TimeDelta time) {
226 DCHECK(thread_checker_.CalledOnValidThread()); 226 DCHECK(thread_checker_.CalledOnValidThread());
227 if (has_audio_) 227 if (has_audio_)
228 audio_pipeline_->StartFeeding(); 228 audio_pipeline_->StartFeeding();
229 if (has_video_) 229 if (has_video_)
230 video_pipeline_->StartFeeding(); 230 video_pipeline_->StartFeeding();
231 FORWARD_ON_IO_THREAD(StartPlayingFrom, time); 231 FORWARD_ON_IO_THREAD(StartPlayingFrom, time);
232 } 232 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 FORWARD_ON_IO_THREAD(Stop); 270 FORWARD_ON_IO_THREAD(Stop);
271 } 271 }
272 272
273 void MediaPipelineProxy::SetPlaybackRate(double playback_rate) { 273 void MediaPipelineProxy::SetPlaybackRate(double playback_rate) {
274 DCHECK(thread_checker_.CalledOnValidThread()); 274 DCHECK(thread_checker_.CalledOnValidThread());
275 FORWARD_ON_IO_THREAD(SetPlaybackRate, playback_rate); 275 FORWARD_ON_IO_THREAD(SetPlaybackRate, playback_rate);
276 } 276 }
277 277
278 } // namespace cma 278 } // namespace cma
279 } // namespace chromecast 279 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698