chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc - Issue 1490613005: media config: expand is_encrypted to a struct.

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/audio_video_pipeline_impl_unittest.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mojo changes; Message->base::Pickle Created 4 years, 10 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

« chromecast/media/audio/cast_audio_output_stream_unittest.cc ('K') | « chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc ('k') | chromecast/media/cma/test/mock_frame_provider.cc » ('j') | chromecast/public/media/decoder_config.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 bd747dd5c4abe8c14ce6ef22756ae8707c8ae04a..81618cf07e08950412c4e49a9cf8a2a346033fac 100644

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

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

@@ -66,7 +66,7 @@ class AudioVideoPipelineImplTest

::media::AudioDecoderConfig audio_config(

::media::kCodecMP3, ::media::kSampleFormatS16,

::media::CHANNEL_LAYOUT_STEREO, 44100, ::media::EmptyExtraData(),

- false);

+ ::media::EncryptionScheme::unencrypted());

AvPipelineClient client;

client.eos_cb = base::Bind(&AudioVideoPipelineImplTest::OnEos,

base::Unretained(this), STREAM_AUDIO);

@@ -80,7 +80,7 @@ class AudioVideoPipelineImplTest

::media::kCodecH264, ::media::H264PROFILE_MAIN,

::media::PIXEL_FORMAT_I420, ::media::COLOR_SPACE_UNSPECIFIED,

gfx::Size(640, 480), gfx::Rect(0, 0, 640, 480), gfx::Size(640, 480),

- ::media::EmptyExtraData(), false));

+ ::media::EmptyExtraData(), ::media::EncryptionScheme::unencrypted()));

VideoPipelineClient client;

client.av_pipeline_client.eos_cb =

base::Bind(&AudioVideoPipelineImplTest::OnEos, base::Unretained(this),