Revert of media config: expand is_encrypted to a struct.

chromecast/public/media/decoder_config.h

 // Copyright 2015 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.
 
 #ifndef CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_
 #define CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 75 matching lines @@
   kVP9ProfileAny,
   kDolbyVisionCompatible_EL_MD,
   kDolbyVisionCompatible_BL_EL_MD,
   kDolbyVisionNonCompatible_BL_MD,
   kDolbyVisionNonCompatible_BL_EL_MD,
 
   kVideoProfileMin = kVideoProfileUnknown,
   kVideoProfileMax = kDolbyVisionNonCompatible_BL_EL_MD,
 };
 
-// Specification of whether and how the stream is encrypted (in whole or part).
-struct EncryptionScheme {
-  // Algorithm and mode that was used to encrypt the stream.
-  enum CipherMode {
-    CIPHER_MODE_UNENCRYPTED,
-    CIPHER_MODE_AES_CTR,
-    CIPHER_MODE_AES_CBC
-  };
-
-  // CENC 3rd Edition adds pattern encryption, through two new protection
-  // schemes: 'cens' (with AES-CTR) and 'cbcs' (with AES-CBC).
-  // The pattern applies independently to each 'encrypted' part of the frame (as
-  // defined by the relevant subsample entries), and reduces further the
-  // actual encryption applied through a repeating pattern of (encrypt:skip)
-  // 16 byte blocks. For example, in a (1:9) pattern, the first block is
-  // encrypted, and the next nine are skipped. This pattern is applied
-  // repeatedly until the end of the last 16-byte block in the subsample.
-  // Any remaining bytes are left clear.
-  // If either of encrypt_blocks or skip_blocks is 0, pattern encryption is
-  // disabled.
-  struct Pattern {
-    Pattern() {}
-    Pattern(uint32_t encrypt_blocks, uint32_t skip_blocks);
-    ~Pattern() {}
-    bool IsInEffect() const;
-
-    uint32_t encrypt_blocks = 0;
-    uint32_t skip_blocks = 0;
-  };
-
-  EncryptionScheme() {}
-  EncryptionScheme(CipherMode mode, const Pattern& pattern);
-  ~EncryptionScheme() {}
-  bool is_encrypted() const { return mode != CIPHER_MODE_UNENCRYPTED; }
-
-  CipherMode mode = CIPHER_MODE_UNENCRYPTED;
-  Pattern pattern;
-};
-
-inline EncryptionScheme::Pattern::Pattern(uint32_t encrypt_blocks,
-                                          uint32_t skip_blocks)
-    : encrypt_blocks(encrypt_blocks), skip_blocks(skip_blocks) {
-}
-
-inline bool EncryptionScheme::Pattern::IsInEffect() const {
-  return encrypt_blocks != 0 && skip_blocks != 0;
-}
-
-inline EncryptionScheme::EncryptionScheme(CipherMode mode,
-                                          const Pattern& pattern)
-    : mode(mode), pattern(pattern) {
-}
-
-inline EncryptionScheme Unencrypted() {
-  return EncryptionScheme();
-}
-
-inline EncryptionScheme AesCtrEncryptionScheme() {
-  return EncryptionScheme(EncryptionScheme::CIPHER_MODE_AES_CTR,
-                          EncryptionScheme::Pattern());
-}
-
-
-// TODO(erickung): Remove constructor once CMA backend implementation doesn't
+// TODO(erickung): Remove constructor once CMA backend implementation does't
 // create a new object to reset the configuration and use IsValidConfig() to
 // determine if the configuration is still valid or not.
 struct AudioConfig {
   AudioConfig();
   ~AudioConfig();
 
-  bool is_encrypted() const { return encryption_scheme.is_encrypted(); }
-
   // Stream id.
   StreamId id;
   // Audio codec.
   AudioCodec codec;
   // The format of each audio sample.
   SampleFormat sample_format;
   // Number of bytes in each channel.
   int bytes_per_channel;
   // Number of channels in this audio stream.
   int channel_number;
   // Number of audio samples per second.
   int samples_per_second;
   // Extra data buffer for certain codec initialization.
   std::vector<uint8_t> extra_data;
-  // Encryption scheme (if any) used for the content.
-  EncryptionScheme encryption_scheme;
+  // content is encrypted or not.
+  bool is_encrypted;
 };
 
 inline AudioConfig::AudioConfig()
     : id(kPrimary),
       codec(kAudioCodecUnknown),
       sample_format(kUnknownSampleFormat),
       bytes_per_channel(0),
       channel_number(0),
-      samples_per_second(0) {
+      samples_per_second(0),
+      is_encrypted(false) {
 }
 
 inline AudioConfig::~AudioConfig() {
 }
 
 // TODO(erickung): Remove constructor once CMA backend implementation does't
 // create a new object to reset the configuration and use IsValidConfig() to
 // determine if the configuration is still valid or not.
 struct VideoConfig {
   VideoConfig();
   ~VideoConfig();
 
-  bool is_encrypted() const { return encryption_scheme.is_encrypted(); }
-
   // Stream Id.
   StreamId id;
   // Video codec.
   VideoCodec codec;
   // Video codec profile.
   VideoProfile profile;
   // Additional video config for the video stream if available. Consumers of
   // this structure should make an explicit copy of |additional_config| if it
   // will be used after SetConfig() finishes.
   VideoConfig* additional_config;
   // Extra data buffer for certain codec initialization.
   std::vector<uint8_t> extra_data;
-  // Encryption scheme (if any) used for the content.
-  EncryptionScheme encryption_scheme;
+  // content is encrypted or not.
+  bool is_encrypted;
 };
 
 inline VideoConfig::VideoConfig()
     : id(kPrimary),
       codec(kVideoCodecUnknown),
       profile(kVideoProfileUnknown),
-      additional_config(nullptr) {
+      additional_config(nullptr),
+      is_encrypted(false) {
 }
 
 inline VideoConfig::~VideoConfig() {
 }
 
 // TODO(erickung): Remove following two inline IsValidConfig() functions. These
 // are to keep existing CMA backend implementation consistent until the clean up
 // is done. These SHOULD NOT be used in New CMA backend implementation.
 inline bool IsValidConfig(const AudioConfig& config) {
   return config.codec >= kAudioCodecMin &&
@@ skipping 12 matching lines @@
 inline bool IsValidConfig(const VideoConfig& config) {
   return config.codec >= kVideoCodecMin &&
       config.codec <= kVideoCodecMax &&
       config.codec != kVideoCodecUnknown;
 }
 
 }  // namespace media
 }  // namespace chromecast
 
 #endif  // CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_