chromecast/media/cma/pipeline/media_pipeline_impl.cc - Issue 1148253006: Chromecast: Use std::vector to pass video config in CMA

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/media/cma/pipeline/media_pipeline_impl.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: Rebase to TOT 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chromecast/media/cma/pipeline/media_pipeline_impl.h ('k') | chromecast/media/cma/pipeline/video_pipeline_impl.h » ('j') | chromecast/media/cma/pipeline/video_pipeline_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/pipeline/media_pipeline_impl.cc

diff --git a/chromecast/media/cma/pipeline/media_pipeline_impl.cc b/chromecast/media/cma/pipeline/media_pipeline_impl.cc

index 29140cb4960293953a21d604b093836ca787e2dd..fd20ea60aa35f1f52bd31021338d148acb314fb0 100644

--- a/chromecast/media/cma/pipeline/media_pipeline_impl.cc

+++ b/chromecast/media/cma/pipeline/media_pipeline_impl.cc

@@ -144,7 +144,7 @@ void MediaPipelineImpl::InitializeAudio(

}

void MediaPipelineImpl::InitializeVideo(

- const ::media::VideoDecoderConfig& config,

+ const std::vector<::media::VideoDecoderConfig>& configs,

scoped_ptr<CodedFrameProvider> frame_provider,

const ::media::PipelineStatusCB& status_cb) {

DCHECK(thread_checker_.CalledOnValidThread());

@@ -155,7 +155,7 @@ void MediaPipelineImpl::InitializeVideo(

return;

}

has_video_ = true;

- video_pipeline_->Initialize(config, frame_provider.Pass(), status_cb);

+ video_pipeline_->Initialize(configs, frame_provider.Pass(), status_cb);

}

void MediaPipelineImpl::StartPlayingFrom(base::TimeDelta time) {