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

Unified Diff: media/formats/webm/webm_video_client.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ddorwin comments 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/formats/webm/webm_video_client.cc
diff --git a/media/formats/webm/webm_video_client.cc b/media/formats/webm/webm_video_client.cc
index 6e57dfbe4f6b6327be3a5e9fbc88da9e54d45d81..9d91cc489deeb58e594d638af49f23f1e2f1f1fb 100644
--- a/media/formats/webm/webm_video_client.cc
+++ b/media/formats/webm/webm_video_client.cc
@@ -4,6 +4,7 @@
#include "media/formats/webm/webm_video_client.h"
+#include "media/base/encryption_scheme.h"
ddorwin 2016/03/02 23:24:05 This is no longer necessary since we're just passi
dougsteed 2016/03/03 04:45:00 Done.
#include "media/base/video_decoder_config.h"
#include "media/formats/webm/webm_constants.h"
@@ -33,7 +34,7 @@ void WebMVideoClient::Reset() {
bool WebMVideoClient::InitializeConfig(
const std::string& codec_id,
const std::vector<uint8_t>& codec_private,
- bool is_encrypted,
+ const EncryptionScheme& encryption_scheme,
VideoDecoderConfig* config) {
DCHECK(config);
@@ -93,7 +94,7 @@ bool WebMVideoClient::InitializeConfig(
config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709,
coded_size, visible_rect, natural_size, codec_private,
- is_encrypted);
+ encryption_scheme);
return config->IsValidConfig();
}

Powered by Google App Engine
This is Rietveld 408576698