Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chromecast / media / cma / ipc_streamer / decoder_buffer_base_marshaller.cc

diff --git a/src/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc b/src/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
index bfdb7c1..dc1f8f5 100644 (file)
--- a/src/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
+++ b/src/chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc
@@ -24,12 +24,12 @@ class DecoderBufferFromMsg : public DecoderBufferBase {
   void Initialize();
 
   // DecoderBufferBase implementation.
-  virtual base::TimeDelta timestamp() const OVERRIDE;
-  virtual const uint8* data() const OVERRIDE;
-  virtual uint8* writable_data() const OVERRIDE;
-  virtual int data_size() const OVERRIDE;
-  virtual const ::media::DecryptConfig* decrypt_config() const OVERRIDE;
-  virtual bool end_of_stream() const OVERRIDE;
+  virtual base::TimeDelta timestamp() const override;
+  virtual const uint8* data() const override;
+  virtual uint8* writable_data() const override;
+  virtual int data_size() const override;
+  virtual const ::media::DecryptConfig* decrypt_config() const override;
+  virtual bool end_of_stream() const override;
 
  private:
   virtual ~DecoderBufferFromMsg();
@@ -141,8 +141,24 @@ 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) {
+    // DecryptConfig may contain 0 subsamples if all content is encrypted.
+    // Map this case to a single fully-encrypted "subsample" for more consistent
+    // backend handling.
+    if (buffer->decrypt_config()->subsamples().empty()) {
+      std::vector< ::media::SubsampleEntry> encrypted_subsample_list(1);
+      encrypted_subsample_list[0].clear_bytes = 0;
+      encrypted_subsample_list[0].cypher_bytes = buffer->data_size();
+      ::media::DecryptConfig full_sample_config(
+          buffer->decrypt_config()->key_id(),
+          buffer->decrypt_config()->iv(),
+          encrypted_subsample_list);
+      DecryptConfigMarshaller::Write(full_sample_config, msg);
+    } else {
+      DecryptConfigMarshaller::Write(*buffer->decrypt_config(), msg);
+    }
+  }
 
   CHECK(msg->WritePod(buffer->data_size()));
   CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size()));