Chromecast media pipeline: handle CENC "full sample encryption" case.

chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc

Index: chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
diff --git a/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc b/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
index 14eb742495f1ed97dd648749e14ba1252257d641..e428215d81c3c1eb06e24935b3b00a79b86743e6 100644
--- a/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
+++ b/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
@@ -141,8 +141,14 @@ void DecoderBufferBaseMarshaller::Write(
       (buffer->decrypt_config() != NULL &&
        buffer->decrypt_config()->iv().size() > 0);
   CHECK(msg->WritePod(has_decrypt_config));
-  if (has_decrypt_config)
-    DecryptConfigMarshaller::Write(*buffer->decrypt_config(), msg);
+
+  if (has_decrypt_config) {

[damienv1, 2014/10/17 15:46:05]

Note: I was thinking about sth like:

::media::DecryptConifg* decrypt_config = buffer->decrypt_config();

// Handle the corner case:  
scoped_ptr<::media::DecryptConifg> equivalent_decrypt_config;
if (decrypt_config->subsamples().empty()) {
  std::vector<media::SubsampleEntry> subsamples(1);
  subsamples[0].clear_bytes = 0;
  subsamples[0].cypher_bytes = buffer->data_size();
  decrypt_config_alternate.reset(new ::media::DecryptConfig(key, iv,
subsamples);
}

[gunsch, 2014/10/17 16:04:02]

heh, I had something exactly like this earlier and rewrote it because I thought
this approach was preferable :)

+    if (buffer->decrypt_config()->subsamples().size() == 0)
+      DecryptConfigMarshaller::WriteFullSampleEncryption(
+          *buffer->decrypt_config(), buffer->data_size(), msg);
+    else
+      DecryptConfigMarshaller::Write(*buffer->decrypt_config(), msg);
+  }
 
   CHECK(msg->WritePod(buffer->data_size()));
   CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size()));