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

Unified Diff: media/base/test_helpers.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
Index: media/base/test_helpers.cc
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc
index b88450457c2f20825fc5c1cd087783e44bd6727f..672b17cbb1aa2952b402a4302e0785c69d036e69 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -18,6 +18,7 @@
#include "media/base/audio_buffer.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/media_util.h"
#include "ui/gfx/geometry/rect.h"
@@ -132,7 +133,7 @@ static VideoDecoderConfig GetTestConfig(VideoCodec codec,
return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN,
PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
coded_size, visible_rect, natural_size,
- EmptyExtraData(), is_encrypted);
+ EmptyExtraData(), EncryptionScheme(is_encrypted));
}
static const gfx::Size kNormalSize(320, 240);

Powered by Google App Engine
This is Rietveld 408576698