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

Unified Diff: media/mojo/interfaces/media_types.mojom

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple 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/mojo/interfaces/media_types.mojom
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
index 085256eac3a139d30c26905ba51c1d4dd508dd21..de7db32e0db2e6abec65f083b3a659454dd15779 100644
--- a/media/mojo/interfaces/media_types.mojom
+++ b/media/mojo/interfaces/media_types.mojom
@@ -168,6 +168,29 @@ enum VideoCodecProfile {
VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
};
+// See media/base/encryption_scheme.h.
+// Kept in sync with media::CipherMode via static_asserts.
+enum CipherMode {
+ Unencrypted = 0,
+ AesCtr,
+ AesCbc,
+ Max = AesCbc
+};
+
+// This defines a mojo transport format for media::EncryptionScheme::PatternSpec
+// See media/base/encryption_scheme.h for description.
+struct PatternSpec {
+ uint32 encrypt_blocks;
+ uint32 skip_blocks;
+};
+
+// This defines a mojo transport format for media::EncryptionScheme.
+// See media/base/encryption_scheme.h for description.
+struct EncryptionScheme {
+ CipherMode mode;
+ PatternSpec pattern;
+};
+
// This defines a mojo transport format for media::AudioDecoderConfig.
// See media/base/audio_decoder_config.h for descriptions.
struct AudioDecoderConfig {
@@ -178,7 +201,7 @@ struct AudioDecoderConfig {
array<uint8>? extra_data;
int64 seek_preroll_usec;
int32 codec_delay;
- bool is_encrypted;
+ EncryptionScheme encryption_scheme;
};
// This defines a mojo transport format for media::VideoDecoderConfig.
@@ -192,7 +215,7 @@ struct VideoDecoderConfig {
mojo.Rect visible_rect;
mojo.Size natural_size;
array<uint8>? extra_data;
- bool is_encrypted;
+ EncryptionScheme encryption_scheme;
};
// This defines a mojo transport format for media::SubsampleEntry.

Powered by Google App Engine
This is Rietveld 408576698