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

Unified Diff: chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.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: Remove DCHECK when config is updated. Will create another CL for the change 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
Index: chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc
diff --git a/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc b/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc
index a10d24a56aff4af4d87765e000ee347d59ceb0da..ba8109f02b72e51c4cb81b1126fb40aa95dfd7a7 100644
--- a/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc
+++ b/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc
@@ -91,14 +91,15 @@ void AudioVideoPipelineImplTest::Initialize(
::media::CHANNEL_LAYOUT_STEREO,
44100,
NULL, 0, false);
- ::media::VideoDecoderConfig video_config(
+ std::vector<::media::VideoDecoderConfig> video_configs;
+ video_configs.push_back(::media::VideoDecoderConfig(
::media::kCodecH264,
::media::H264PROFILE_MAIN,
::media::VideoFrame::I420,
gfx::Size(640, 480),
gfx::Rect(0, 0, 640, 480),
gfx::Size(640, 480),
- NULL, 0, false);
+ NULL, 0, false));
// Frame generation on the producer side.
std::vector<FrameGeneratorForTest::FrameSpec> frame_specs;
@@ -135,7 +136,7 @@ void AudioVideoPipelineImplTest::Initialize(
next_task) :
base::Bind(&MediaPipeline::InitializeVideo,
base::Unretained(media_pipeline_.get()),
- video_config,
+ video_configs,
base::Passed(&frame_provider_base),
next_task);
« no previous file with comments | « chromecast/media/cma/pipeline/audio_pipeline_impl.cc ('k') | chromecast/media/cma/pipeline/media_pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698