chromecast/media/cma/pipeline/media_pipeline_impl.h - 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.h

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: Add more DCHECK 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.h ('k') | chromecast/media/cma/pipeline/media_pipeline_impl.cc » ('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.h

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

index eb14a555b989f125c13b0546a64d69476c5445a3..794437ab23de555d52b9c0daaf89c8c679858ae2 100644

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

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

@@ -45,7 +45,7 @@ class MediaPipelineImpl : public MediaPipeline {

scoped_ptr<CodedFrameProvider> frame_provider,

const ::media::PipelineStatusCB& status_cb) override;

void InitializeVideo(

- const ::media::VideoDecoderConfig& config,

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

scoped_ptr<CodedFrameProvider> frame_provider,

const ::media::PipelineStatusCB& status_cb) override;

void StartPlayingFrom(base::TimeDelta time) override;

@@ -83,7 +83,7 @@ class MediaPipelineImpl : public MediaPipeline {

bool has_video_;

scoped_ptr<AudioPipelineImpl> audio_pipeline_;

scoped_ptr<VideoPipelineImpl> video_pipeline_;

- scoped_ptr< ::media::SerialRunner> pending_callbacks_;

+ scoped_ptr<::media::SerialRunner> pending_callbacks_;

// Playback rate set by the upper layer.

float target_playback_rate_;