Index: media/mojo/interfaces/media_types.mojom |
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom |
index 5f4d9420c041eecfeda78e2578e8d4e789ed2ddd..44e6cdf71856b218318b71bab1b40b1c22b5b5ce 100644 |
--- a/media/mojo/interfaces/media_types.mojom |
+++ b/media/mojo/interfaces/media_types.mojom |
@@ -168,29 +168,6 @@ |
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, |
- AES_CTR, |
- AES_CBC, |
- MAX = AES_CBC |
-}; |
- |
-// This defines a mojo transport format for media::EncryptionScheme::Pattern |
-// See media/base/encryption_scheme.h for description. |
-struct Pattern { |
- 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; |
- Pattern pattern; |
-}; |
- |
// This defines a mojo transport format for media::AudioDecoderConfig. |
// See media/base/audio_decoder_config.h for descriptions. |
struct AudioDecoderConfig { |
@@ -201,7 +178,7 @@ |
array<uint8>? extra_data; |
int64 seek_preroll_usec; |
int32 codec_delay; |
- EncryptionScheme encryption_scheme; |
+ bool is_encrypted; |
}; |
// This defines a mojo transport format for media::VideoDecoderConfig. |
@@ -215,7 +192,7 @@ |
mojo.Rect visible_rect; |
mojo.Size natural_size; |
array<uint8>? extra_data; |
- EncryptionScheme encryption_scheme; |
+ bool is_encrypted; |
}; |
// This defines a mojo transport format for media::SubsampleEntry. |