media config: expand is_encrypted to a struct.

chromecast/media/cma/base/decoder_config_adapter.cc

Index: chromecast/media/cma/base/decoder_config_adapter.cc
diff --git a/chromecast/media/cma/base/decoder_config_adapter.cc b/chromecast/media/cma/base/decoder_config_adapter.cc
index fa8ac20e742dcfa1eb17c8eca6309b054e3eaaa1..2037cb593ffc5db4cee9e35328c2d674631b4d6f 100644
--- a/chromecast/media/cma/base/decoder_config_adapter.cc
+++ b/chromecast/media/cma/base/decoder_config_adapter.cc
@@ -175,6 +175,64 @@ VideoProfile ToVideoProfile(const ::media::VideoCodecProfile codec_profile) {
   }
 }
 
+::media::EncryptionScheme::CipherMode ToMediaCipherMode(
+    EncryptionScheme::CipherMode mode) {
+  switch(mode) {

[halliwell, 2016/01/13 03:29:41]

nit: space after switch.  Maybe worth running clang format.

[dougsteed, 2016/02/09 22:58:53]

Done.

+    case EncryptionScheme::kCipherModeNone:
+      return ::media::EncryptionScheme::kCipherModeNone;
+    case EncryptionScheme::kCipherModeAesCtr:
+      return ::media::EncryptionScheme::kCipherModeAesCtr;
+    case EncryptionScheme::kCipherModeAesCbc:
+      return ::media::EncryptionScheme::kCipherModeAesCbc;
+    default:
+      NOTREACHED();
+      return ::media::EncryptionScheme::kCipherModeNone;
+  }
+}
+
+EncryptionScheme::CipherMode ToCipherMode(
+    ::media::EncryptionScheme::CipherMode mode) {
+  switch(mode) {

[halliwell, 2016/01/13 03:29:41]

ditto

[dougsteed, 2016/02/09 22:58:53]

Done.

+    case ::media::EncryptionScheme::kCipherModeNone:
+      return EncryptionScheme::kCipherModeNone;
+    case ::media::EncryptionScheme::kCipherModeAesCtr:
+      return EncryptionScheme::kCipherModeAesCtr;
+    case ::media::EncryptionScheme::kCipherModeAesCbc:
+      return EncryptionScheme::kCipherModeAesCbc;
+    default:
+      NOTREACHED();
+      return EncryptionScheme::kCipherModeNone;
+  }
+}
+
+EncryptionScheme::PatternSpec ToPatternSpec(
+    const ::media::EncryptionScheme::PatternSpec& pattern) {
+  return EncryptionScheme::PatternSpec(
+      pattern.encrypt_blocks(), pattern.skip_blocks());
+}
+
+::media::EncryptionScheme::PatternSpec ToMediaPatternSpec(
+    const EncryptionScheme::PatternSpec& pattern) {
+  return ::media::EncryptionScheme::PatternSpec(
+      pattern.encrypt_blocks, pattern.skip_blocks);
+}
+
+// static

[halliwell, 2016/01/13 03:29:41]

nit, unnecessary

[dougsteed, 2016/02/09 22:58:53]

Done.

+EncryptionScheme ToEncryptionScheme(
+    const ::media::EncryptionScheme& scheme) {
+  return EncryptionScheme(
+    ToCipherMode(scheme.mode()),
+    ToPatternSpec(scheme.pattern()));
+}
+
+// static

[halliwell, 2016/01/13 03:29:41]

ditto

[dougsteed, 2016/02/09 22:58:53]

Done.

+::media::EncryptionScheme ToMediaEncryptionScheme(
+    const EncryptionScheme& scheme) {
+  return ::media::EncryptionScheme(
+    ToMediaCipherMode(scheme.mode),
+    ToMediaPatternSpec(scheme.pattern));
+}
+
 }  // namespace
 
 // static
@@ -193,7 +251,8 @@ AudioConfig DecoderConfigAdapter::ToCastAudioConfig(
       ::media::ChannelLayoutToChannelCount(config.channel_layout()),
   audio_config.samples_per_second = config.samples_per_second();
   audio_config.extra_data = config.extra_data();
-  audio_config.is_encrypted = config.is_encrypted();
+  audio_config.encryption_scheme = ToEncryptionScheme(
+      config.encryption_scheme());
   return audio_config;
 }
 
@@ -204,7 +263,8 @@ AudioConfig DecoderConfigAdapter::ToCastAudioConfig(
       ToMediaAudioCodec(config.codec),
       ToMediaSampleFormat(config.sample_format),
       ToMediaChannelLayout(config.channel_number), config.samples_per_second,
-      config.extra_data, config.is_encrypted);
+      config.extra_data,
+      ToMediaEncryptionScheme(config.encryption_scheme));
 }
 
 // static
@@ -220,7 +280,8 @@ VideoConfig DecoderConfigAdapter::ToCastVideoConfig(
   video_config.codec = ToVideoCodec(config.codec());
   video_config.profile = ToVideoProfile(config.profile());
   video_config.extra_data = config.extra_data();
-  video_config.is_encrypted = config.is_encrypted();
+  video_config.encryption_scheme = ToEncryptionScheme(
+      config.encryption_scheme());
   return video_config;
 }