chromecast/media/cma/backend/audio_video_pipeline_device_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/backend/audio_video_pipeline_device_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: one more tweak in chromecast/common Created 5 years 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/common/media/cma_param_traits.cc ('K') | « chromecast/media/audio/cast_audio_output_stream_unittest.cc ('k') | chromecast/media/cma/base/decoder_config_adapter.cc » ('j') | chromecast/media/cma/base/decoder_config_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

diff --git a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

index 3dcdb7daae84bd8e871ef32ec098bf82a593ee18..ec405a2d469706b0849b8f485a6e7fc09b11e33d 100644

--- a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

+++ b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

@@ -263,7 +263,7 @@ scoped_ptr<BufferFeeder> BufferFeeder::LoadVideo(MediaPipelineBackend* backend,

video_config.codec = kCodecH264;

video_config.profile = kH264Main;

video_config.additional_config = NULL;

- video_config.is_encrypted = false;

+ video_config.encryption_scheme = EncryptionScheme(false);

halliwell 2016/01/13 03:29:41 Good example of why this constructor isn't clear.

dougsteed 2016/02/09 22:58:53 Done.

} else {

base::FilePath file_path = GetTestDataFilePath(filename);

DemuxResult demux_result = FFmpegDemuxForTest(file_path, false /* audio */);