Add 'cbcs' encryption scheme support in Android media.

media/base/android/media_codec_bridge.cc

 // 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.
 
 #include "media/base/android/media_codec_bridge.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/android/build_info.h"
@@ skipping 16 matching lines @@
 
 MediaCodecBridge::~MediaCodecBridge() {}
 
 MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
     int index,
     const uint8_t* data,
     size_t data_size,
     const std::string& key_id,
     const std::string& iv,
     const std::vector<SubsampleEntry>& subsamples,
+    const EncryptionScheme& encryption_scheme,
     const base::TimeDelta& presentation_time) {
   const std::vector<char> key_vec(key_id.begin(), key_id.end());
   const std::vector<char> iv_vec(iv.begin(), iv.end());
   return QueueSecureInputBuffer(index, data, data_size, key_vec, iv_vec,
                                 subsamples.empty() ? nullptr : &subsamples[0],
-                                subsamples.size(), presentation_time);
+                                subsamples.size(), encryption_scheme,
+                                presentation_time);
 }
 
 MediaCodecStatus MediaCodecBridge::CopyFromOutputBuffer(int index,
                                                         size_t offset,
                                                         void* dst,
                                                         size_t num) {
   const uint8_t* src_data = nullptr;
   size_t src_capacity = 0;
   MediaCodecStatus status =
       GetOutputBufferAddress(index, offset, &src_data, &src_capacity);
@@ skipping 19 matching lines @@
     LOG(ERROR) << "Input buffer size " << size
                << " exceeds MediaCodec input buffer capacity: " << capacity;
     return false;
   }
 
   memcpy(dst, data, size);
   return true;
 }
 
 }  // namespace media