Add 'cbcs' encryption scheme support in Android media.

media/base/android/sdk_media_codec_bridge.cc

Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
index e9a8f2f105d51ffa1ef7b461b87f5609aa8fafa1..5d3c170e001788e78c7e1f1836c27264453eb886 100644
--- a/media/base/android/sdk_media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -178,6 +178,7 @@ MediaCodecStatus SdkMediaCodecBridge::QueueSecureInputBuffer(
     const std::vector<char>& iv,
     const SubsampleEntry* subsamples,
     int subsamples_size,
+    const EncryptionScheme& encryption_scheme,
     base::TimeDelta presentation_time) {
   DVLOG(3) << __FUNCTION__ << index << ": " << data_size;
   if (data_size >
@@ -230,6 +231,9 @@ MediaCodecStatus SdkMediaCodecBridge::QueueSecureInputBuffer(
       Java_MediaCodecBridge_queueSecureInputBuffer(
           env, j_media_codec_.obj(), index, 0, j_iv.obj(), j_key_id.obj(),
           clear_array, cypher_array, new_subsamples_size,
+          static_cast<int>(encryption_scheme.mode()),
+          static_cast<int>(encryption_scheme.pattern().encrypt_blocks()),
+          static_cast<int>(encryption_scheme.pattern().skip_blocks()),

[xhwang, 2016/10/20 23:52:07]

To be safe, does it make sense to use saturated_cast?

[dougsteed, 2016/10/21 17:15:05]

saturated_cast doesn't work for enum, so I'd have to do static_cast inside
saturated_cast. I'm not quite sure I see the need for this here, I think passing
them as int seems adequate (all of these are small values that will easily fit
in the obvious ranges). But maybe I am missing something.

           presentation_time.InMicroseconds()));
 }