Add 'cbcs' encryption scheme support in Android media.

media/base/android/ndk_media_codec_bridge.h

 // Copyright 2015 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_NDK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
 
 #include <media/NdkMediaCodec.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 26 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,
       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 18 matching lines @@
   };
 
   std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
 
   DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_