Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/media_decoder_job.cc

 // Copyright 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_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 264 matching lines @@
     return MEDIA_CODEC_INPUT_END_OF_STREAM;
   }
 
   if (unit.key_id.empty() || unit.iv.empty()) {
     DCHECK(unit.iv.empty() || !unit.key_id.empty());
     return media_codec_bridge_->QueueInputBuffer(
         input_buf_index, &unit.data[0], unit.data.size(), unit.timestamp);
   }
 
   MediaCodecStatus status = media_codec_bridge_->QueueSecureInputBuffer(
-      input_buf_index,
-      &unit.data[0], unit.data.size(),
-      reinterpret_cast<const uint8*>(&unit.key_id[0]), unit.key_id.size(),
-      reinterpret_cast<const uint8*>(&unit.iv[0]), unit.iv.size(),
+      input_buf_index, &unit.data[0], unit.data.size(), unit.key_id, unit.iv,
       unit.subsamples.empty() ? NULL : &unit.subsamples[0],
-      unit.subsamples.size(),
-      unit.timestamp);
+      unit.subsamples.size(), unit.timestamp);
 
   // In case of MEDIA_CODEC_NO_KEY, we must reuse the |input_buf_index_|.
   // Otherwise MediaDrm will report errors.
   if (status == MEDIA_CODEC_NO_KEY)
     input_buf_index_ = input_buf_index;
 
   return status;
 }
 
 bool MediaDecoderJob::HasData() const {
@@ skipping 385 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media