Revert of media config: expand is_encrypted to a struct.

media/mojo/interfaces/media_types.mojom

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 module media.interfaces;
 
 import "ui/mojo/geometry/geometry.mojom";
 
 // See media/base/buffering_state.h for descriptions.
 // Kept in sync with media::BufferingState via static_asserts.
@@ skipping 150 matching lines @@
   H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
   VP8PROFILE_MIN = 11,
   VP8PROFILE_ANY = VP8PROFILE_MIN,
   VP8PROFILE_MAX = VP8PROFILE_ANY,
   VP9PROFILE_MIN = 12,
   VP9PROFILE_ANY = VP9PROFILE_MIN,
   VP9PROFILE_MAX = VP9PROFILE_ANY,
   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 {
   AudioCodec codec;
   SampleFormat sample_format;
   ChannelLayout channel_layout;
   int32 samples_per_second;
   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.
 // See media/base/video_decoder_config.h for descriptions.
 struct VideoDecoderConfig {
   VideoCodec codec;
   VideoCodecProfile profile;
   VideoFormat format;
   ColorSpace color_space;
   mojo.Size coded_size;
   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.
 // See media/base/decrypt_config.h for descriptions.
 struct SubsampleEntry {
   uint32 clear_bytes;
   uint32 cypher_bytes;
 };
 
 // This defines a mojo transport format for media::DecryptConfig.
@@ skipping 85 matching lines @@
 
   // Stride and offsets for each plane. Offsets are relative to the start
   // of |frame_data|.
   int32 y_stride;
   int32 u_stride;
   int32 v_stride;
   uint64 y_offset;
   uint64 u_offset;
   uint64 v_offset;
 };