Add 'cbcs' encryption scheme support in Android media.

media/base/android/sdk_media_codec_bridge.h

 // Copyright (c) 2013 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_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
 
 #include <jni.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 31 matching lines @@
       const base::TimeDelta& presentation_time) override;
   using MediaCodecBridge::QueueSecureInputBuffer;
   MediaCodecStatus QueueSecureInputBuffer(
       int index,
       const uint8_t* data,
       size_t data_size,
       const std::vector<char>& key_id,
       const std::vector<char>& iv,
       const SubsampleEntry* subsamples,
       int subsamples_size,
+      const EncryptionScheme& encryption_scheme,

[xhwang, 2016/06/15 05:29:05]

OOC, can we have Pattern and Subsamples at the same time? It seems we shouldn't.
Do we have code the enforce this somewhere?

[dougsteed, 2016/06/15 17:57:38]

We definitely need both. Pattern applies within the "encrypted" part of the
subsample.

       const base::TimeDelta& presentation_time) override;
   void QueueEOS(int input_buffer_index) override;
   MediaCodecStatus DequeueInputBuffer(const base::TimeDelta& timeout,
                                       int* index) override;
   MediaCodecStatus DequeueOutputBuffer(const base::TimeDelta& timeout,
                                        int* index,
                                        size_t* offset,
                                        size_t* size,
                                        base::TimeDelta* presentation_time,
                                        bool* end_of_stream,
@@ skipping 141 matching lines @@
   VideoCodecBridge(const std::string& mime,
                    bool is_secure,
                    MediaCodecDirection direction);
 
   int adaptive_playback_supported_for_testing_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_