Switch to Lollipop APIs for MediaCodec

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 <jni.h>
 #include <string>
 
 #include "base/android/build_info.h"
@@ skipping 226 matching lines @@
 
 MediaCodecBridge::~MediaCodecBridge() {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
   if (j_media_codec_.obj())
     Java_MediaCodecBridge_release(env, j_media_codec_.obj());
 }
 
 bool MediaCodecBridge::StartInternal() {
   JNIEnv* env = AttachCurrentThread();
-  return Java_MediaCodecBridge_start(env, j_media_codec_.obj()) &&
-         GetOutputBuffers();
+  return Java_MediaCodecBridge_start(env, j_media_codec_.obj());
 }
 
 MediaCodecStatus MediaCodecBridge::Reset() {
   JNIEnv* env = AttachCurrentThread();
   return static_cast<MediaCodecStatus>(
       Java_MediaCodecBridge_flush(env, j_media_codec_.obj()));
 }
 
 void MediaCodecBridge::Stop() {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 161 matching lines @@
 
 void MediaCodecBridge::ReleaseOutputBuffer(int index, bool render) {
   DVLOG(3) << __PRETTY_FUNCTION__ << ": " << index;
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
 
   Java_MediaCodecBridge_releaseOutputBuffer(
       env, j_media_codec_.obj(), index, render);
 }
 
-int MediaCodecBridge::GetInputBuffersCount() {
-  JNIEnv* env = AttachCurrentThread();
-  return Java_MediaCodecBridge_getInputBuffersCount(env, j_media_codec_.obj());
-}
-
 int MediaCodecBridge::GetOutputBuffersCount() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_getOutputBuffersCount(env, j_media_codec_.obj());
 }
 
 size_t MediaCodecBridge::GetOutputBuffersCapacity() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_getOutputBuffersCapacity(env,
                                                         j_media_codec_.obj());
 }
 
-bool MediaCodecBridge::GetOutputBuffers() {
-  JNIEnv* env = AttachCurrentThread();
-  return Java_MediaCodecBridge_getOutputBuffers(env, j_media_codec_.obj());
-}
-
 void MediaCodecBridge::GetInputBuffer(int input_buffer_index,
                                       uint8** data,
                                       size_t* capacity) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_buffer(Java_MediaCodecBridge_getInputBuffer(
       env, j_media_codec_.obj(), input_buffer_index));
   *data = static_cast<uint8*>(env->GetDirectBufferAddress(j_buffer.obj()));
   *capacity = base::checked_cast<size_t>(
       env->GetDirectBufferCapacity(j_buffer.obj()));
 }
@@ skipping 318 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_isAdaptivePlaybackSupported(
       env, media_codec(), width, height);
 }
 
 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace media