media config: expand is_encrypted to a struct.

chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc

Index: chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc
diff --git a/chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc b/chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc
index 2bc40f48fbdec437609221b1ce995410d1bf72e1..a253b0095846a6452a61749d0a73ecdf9cdc4c95 100644
--- a/chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc
+++ b/chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chromecast/media/cma/ipc/media_message.h"
+#include "chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h"
 #include "media/base/audio_decoder_config.h"
 
 namespace chromecast {
@@ -25,7 +26,7 @@ void AudioDecoderConfigMarshaller::Write(
   CHECK(msg->WritePod(config.channel_layout()));
   CHECK(msg->WritePod(config.samples_per_second()));
   CHECK(msg->WritePod(config.sample_format()));
-  CHECK(msg->WritePod(config.is_encrypted()));
+  EncryptionSchemeMarshaller::Write(config.encryption_scheme(), msg);
   CHECK(msg->WritePod(config.extra_data().size()));
   if (!config.extra_data().empty())
     CHECK(msg->WriteBuffer(&config.extra_data()[0],
@@ -39,15 +40,15 @@ void AudioDecoderConfigMarshaller::Write(
   ::media::SampleFormat sample_format;
   ::media::ChannelLayout channel_layout;
   int samples_per_second;
-  bool is_encrypted;
   size_t extra_data_size;
   std::vector<uint8_t> extra_data;
+  ::media::EncryptionScheme encryption_scheme;
 
   CHECK(msg->ReadPod(&codec));
   CHECK(msg->ReadPod(&channel_layout));
   CHECK(msg->ReadPod(&samples_per_second));
   CHECK(msg->ReadPod(&sample_format));
-  CHECK(msg->ReadPod(&is_encrypted));
+  encryption_scheme = EncryptionSchemeMarshaller::Read(msg);
   CHECK(msg->ReadPod(&extra_data_size));
 
   CHECK_GE(codec, ::media::kUnknownAudioCodec);
@@ -65,7 +66,7 @@ void AudioDecoderConfigMarshaller::Write(
   return ::media::AudioDecoderConfig(
       codec, sample_format,
       channel_layout, samples_per_second,
-      extra_data, is_encrypted);
+      extra_data, encryption_scheme);
 }
 
 }  // namespace media