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

Unified Diff: chromecast/media/cma/test/mock_frame_provider.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
Index: chromecast/media/cma/test/mock_frame_provider.cc
diff --git a/chromecast/media/cma/test/mock_frame_provider.cc b/chromecast/media/cma/test/mock_frame_provider.cc
index fdab8895861d7cfd46409224e3d9f9424ea9223b..e1b6eebe3bd94de95ab34512a528817abe7d7ccb 100644
--- a/chromecast/media/cma/test/mock_frame_provider.cc
+++ b/chromecast/media/cma/test/mock_frame_provider.cc
@@ -82,7 +82,7 @@ void MockFrameProvider::DoRead(const ReadCB& read_cb) {
::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN,
::media::PIXEL_FORMAT_YV12, ::media::COLOR_SPACE_UNSPECIFIED,
coded_size, visible_rect, natural_size, ::media::EmptyExtraData(),
- false);
+ ::media::EncryptionScheme(false));
halliwell 2016/01/13 03:29:41 ditto
dougsteed 2016/02/09 22:58:53 Done.
audio_config = ::media::AudioDecoderConfig(
::media::kCodecAAC,
@@ -90,7 +90,7 @@ void MockFrameProvider::DoRead(const ReadCB& read_cb) {
::media::CHANNEL_LAYOUT_STEREO,
44100,
::media::EmptyExtraData(),
- false);
+ ::media::EncryptionScheme(false));
halliwell 2016/01/13 03:29:41 ditto
dougsteed 2016/02/09 22:58:53 Done.
}
read_cb.Run(buffer, audio_config, video_config);

Powered by Google App Engine
This is Rietveld 408576698