Add 'cbcs' encryption scheme support in Android media.

media/base/android/sdk_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/sdk_media_codec_bridge.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
@@ skipping 160 matching lines @@
 // TODO(timav): Combine this and above methods together keeping only the first
 // interface after we switch to Spitzer pipeline.
 MediaCodecStatus SdkMediaCodecBridge::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,
     base::TimeDelta presentation_time) {
   DVLOG(3) << __FUNCTION__ << index << ": " << data_size;
   if (data_size >
       base::checked_cast<size_t>(std::numeric_limits<int32_t>::max())) {
     return MEDIA_CODEC_ERROR;
   }
   if (data && !FillInputBuffer(index, data, data_size))
     return MEDIA_CODEC_ERROR;
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 32 matching lines @@
 
   ScopedJavaLocalRef<jintArray> clear_array =
       ToJavaIntArray(env, std::move(native_clear_array), new_subsamples_size);
   ScopedJavaLocalRef<jintArray> cypher_array =
       ToJavaIntArray(env, std::move(native_cypher_array), new_subsamples_size);
 
   return static_cast<MediaCodecStatus>(
       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()));
 }
 
 void SdkMediaCodecBridge::QueueEOS(int input_buffer_index) {
   DVLOG(3) << __FUNCTION__ << ": " << input_buffer_index;
   JNIEnv* env = AttachCurrentThread();
   Java_MediaCodecBridge_queueInputBuffer(
       env, j_media_codec_, input_buffer_index, 0, 0, 0, kBufferFlagEndOfStream);
 }
 
@@ skipping 423 matching lines @@
   if (adaptive_playback_supported_for_testing_ == 0)
     return false;
   else if (adaptive_playback_supported_for_testing_ > 0)
     return true;
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_isAdaptivePlaybackSupported(env, media_codec(),
                                                            width, height);
 }
 
 }  // namespace media