Pass DecryptConfig parameters over IPC and use it in AVDA.

media/base/bitstream_buffer.h

 // Copyright (c) 2011 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 MEDIA_BASE_BITSTREAM_BUFFER_H_
 #define MEDIA_BASE_BITSTREAM_BUFFER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/time/time.h"
+#include "media/base/decrypt_config.h"
 #include "media/base/timestamp_constants.h"
 
 namespace media {
 
 // Class for passing bitstream buffers around.  Does not take ownership of the
 // data.  This is the media-namespace equivalent of PP_VideoBitstreamBuffer_Dev.
 class BitstreamBuffer {
  public:
-  BitstreamBuffer(int32 id, base::SharedMemoryHandle handle, size_t size)
-      : id_(id),
-        handle_(handle),
-        size_(size),
-        presentation_timestamp_(kNoTimestamp()) {}
+  BitstreamBuffer(int32 id, base::SharedMemoryHandle handle, size_t size);
 
   BitstreamBuffer(int32 id,
                   base::SharedMemoryHandle handle,
                   size_t size,
-                  base::TimeDelta presentation_timestamp)
-      : id_(id),
-        handle_(handle),
-        size_(size),
-        presentation_timestamp_(presentation_timestamp) {}
+                  base::TimeDelta presentation_timestamp);
+
+  ~BitstreamBuffer();
+
+  void SetDecryptParams(const DecryptConfig& decrypt_config);

[xhwang, 2015/10/22 06:13:51]

nit: maybe just SetDecryptConfig?

[Tima Vaisburd, 2015/10/22 21:57:26]

Done.

 
   int32 id() const { return id_; }
   base::SharedMemoryHandle handle() const { return handle_; }
   size_t size() const { return size_; }
 
   // The timestamp is only valid if it's not equal to |media::kNoTimestamp()|.
   base::TimeDelta presentation_timestamp() const {
     return presentation_timestamp_;
   }
 
+  // The following methods come from DecryptConfig.
+
+  const std::string& key_id() const { return key_id_; }
+  const std::string& iv() const { return iv_; }
+  const std::vector<SubsampleEntry>& subsamples() const { return subsamples_; }
+
  private:
   int32 id_;
   base::SharedMemoryHandle handle_;
   size_t size_;
 
   // This is only set when necessary. For example, AndroidVideoDecodeAccelerator
   // needs the timestamp because the underlying decoder may require it to
   // determine the output order.
   base::TimeDelta presentation_timestamp_;
 
+  // The following fields come from DecryptConfig.
+
+  std::string key_id_;                      // key ID.
+  std::string iv_;                          // initialization vector
+  std::vector<SubsampleEntry> subsamples_;  // clear/cypher sizes

[xhwang, 2015/10/22 06:13:51]

Can you just have a scoped_ptr<DecryptConfig> here?

[Tima Vaisburd, 2015/10/22 17:15:45]

Yes, I wanted that from the very beginning, but was stopped by l.62 comment. Do
you know why do we need the copy?

[xhwang, 2015/10/22 18:11:25]

ouch...

Maybe it's because of this that we allow copy and assign:

https://code.google.com/p/chromium/codesearch#chromium/src/ppapi/proxy/video_...

So this change looks good here. Could you please add a TODO about investigating
the possibility to disable copy and assign for this class? Thanks!

[Tima Vaisburd, 2015/10/22 21:57:26]

Done.

+
   // Allow compiler-generated copy & assign constructors.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_BITSTREAM_BUFFER_H_