Add 'cbcs' encryption scheme support in Android media.

media/base/android/media_codec_loop.cc

 // Copyright 2016 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_loop.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 21 matching lines @@
 MediaCodecLoop::InputData::InputData() {}
 
 MediaCodecLoop::InputData::InputData(const InputData& other)
     : memory(other.memory),
       length(other.length),
       key_id(other.key_id),
       iv(other.iv),
       subsamples(other.subsamples),
       presentation_time(other.presentation_time),
       is_eos(other.is_eos),
-      is_encrypted(other.is_encrypted) {}
+      encryption_scheme(other.encryption_scheme) {}
 
 MediaCodecLoop::InputData::~InputData() {}
 
 MediaCodecLoop::MediaCodecLoop(
     int sdk_int,
     Client* client,
     std::unique_ptr<MediaCodecBridge> media_codec,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : state_(STATE_READY),
       client_(client),
@@ skipping 139 matching lines @@
 
   if (input_data.is_eos) {
     media_codec_->QueueEOS(input_buffer.index);
     SetState(STATE_DRAINING);
     client_->OnInputDataQueued(true);
     return;
   }
 
   media::MediaCodecStatus status = MEDIA_CODEC_OK;
 
-  if (input_data.is_encrypted) {
+  if (input_data.encryption_scheme.is_encrypted()) {
     // Note that input_data might not have a valid memory ptr if this is a
     // re-send of a buffer that was sent before decryption keys arrived.
 
     status = media_codec_->QueueSecureInputBuffer(
         input_buffer.index, input_data.memory, input_data.length,
         input_data.key_id, input_data.iv, input_data.subsamples,
-        input_data.presentation_time);
+        input_data.encryption_scheme, input_data.presentation_time);
 
   } else {
     status = media_codec_->QueueInputBuffer(
         input_buffer.index, input_data.memory, input_data.length,
         input_data.presentation_time);
   }
 
   switch (status) {
     case MEDIA_CODEC_ERROR:
       DLOG(ERROR) << __func__ << ": MEDIA_CODEC_ERROR from QueueInputBuffer";
@@ skipping 149 matching lines @@
     RETURN_STRING(STATE_DRAINED);
     RETURN_STRING(STATE_ERROR);
   }
 #undef RETURN_STRING
 
   NOTREACHED() << "Unknown state " << state;
   return nullptr;
 }
 
 }  // namespace media