Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/sdk_media_codec_bridge.cc

Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
similarity index 56%
copy from media/base/android/media_codec_bridge.cc
copy to media/base/android/sdk_media_codec_bridge.cc
index 9bae69edd36f1d72d57318f82f220be973df71e2..14e21dcfe78a292e472fe10d68175c277cf0c490 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -2,7 +2,7 @@
 // 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 "media/base/android/sdk_media_codec_bridge.h"
 
 #include <algorithm>
 
@@ -11,11 +11,9 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
 #include "jni/MediaCodecBridge_jni.h"
 #include "media/base/bit_reader.h"
 #include "media/base/decrypt_config.h"
@@ -26,12 +24,12 @@ using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaIntArrayToIntVector;
 using base::android::ScopedJavaLocalRef;
 
-#define RETURN_ON_ERROR(condition)                          \
-  do {                                                           \
-    if (!(condition)) {                                          \
+#define RETURN_ON_ERROR(condition)                             \
+  do {                                                         \
+    if (!(condition)) {                                        \
       LOG(ERROR) << "Unable to parse AAC header: " #condition; \
-      return false;                                              \
-    }                                                            \
+      return false;                                            \
+    }                                                          \
   } while (0)
 
 namespace media {
@@ -42,6 +40,13 @@ enum {
   kConfigureFlagEncode = 1,    // CONFIGURE_FLAG_ENCODE
 };
 
+static ScopedJavaLocalRef<jintArray>
+ToJavaIntArray(JNIEnv* env, scoped_ptr<jint[]> native_array, int size) {
+  ScopedJavaLocalRef<jintArray> j_array(env, env->NewIntArray(size));
+  env->SetIntArrayRegion(j_array.obj(), 0, size, native_array.get());
+  return j_array;
+}
+
 static const std::string AudioCodecToAndroidMimeType(const AudioCodec& codec) {
   switch (codec) {
     case kCodecMP3:
@@ -72,210 +77,9 @@ static const std::string VideoCodecToAndroidMimeType(const VideoCodec& codec) {
   }
 }
 
-static const std::string CodecTypeToAndroidMimeType(const std::string& codec) {
-  // TODO(xhwang): Shall we handle more detailed strings like "mp4a.40.2"?
-  if (codec == "avc1")
-    return "video/avc";
-  if (codec == "hvc1")
-    return "video/hevc";
-  if (codec == "mp4a")
-    return "audio/mp4a-latm";
-  if (codec == "vp8" || codec == "vp8.0")
-    return "video/x-vnd.on2.vp8";
-  if (codec == "vp9" || codec == "vp9.0")
-    return "video/x-vnd.on2.vp9";
-  if (codec == "vorbis")
-    return "audio/vorbis";
-  if (codec == "opus")
-    return "audio/opus";
-  return std::string();
-}
-
-// TODO(qinmin): using a map to help all the conversions in this class.
-static const std::string AndroidMimeTypeToCodecType(const std::string& mime) {
-  if (mime == "video/mp4v-es")
-    return "mp4v";
-  if (mime == "video/avc")
-    return "avc1";
-  if (mime == "video/hevc")
-    return "hvc1";
-  if (mime == "video/x-vnd.on2.vp8")
-    return "vp8";
-  if (mime == "video/x-vnd.on2.vp9")
-    return "vp9";
-  if (mime == "audio/mp4a-latm")
-    return "mp4a";
-  if (mime == "audio/mpeg")
-    return "mp3";
-  if (mime == "audio/vorbis")
-    return "vorbis";
-  if (mime == "audio/opus")
-    return "opus";
-  return std::string();
-}
-
-static ScopedJavaLocalRef<jintArray>
-ToJavaIntArray(JNIEnv* env, scoped_ptr<jint[]> native_array, int size) {
-  ScopedJavaLocalRef<jintArray> j_array(env, env->NewIntArray(size));
-  env->SetIntArrayRegion(j_array.obj(), 0, size, native_array.get());
-  return j_array;
-}
-
-// static
-bool MediaCodecBridge::IsAvailable() {
-  // MediaCodec is only available on JB and greater.
-  if (base::android::BuildInfo::GetInstance()->sdk_int() < 16)
-    return false;
-  // Blacklist some devices on Jellybean as for MediaCodec support is buggy.
-  // http://crbug.com/365494.
-  if (base::android::BuildInfo::GetInstance()->sdk_int() == 16) {
-    std::string model(base::android::BuildInfo::GetInstance()->model());
-    return model != "GT-I9100" && model != "GT-I9300" && model != "GT-N7000";
-  }
-  return true;
-}
-
-// static
-bool MediaCodecBridge::SupportsSetParameters() {
-  // MediaCodec.setParameters() is only available starting with K.
-  return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
-}
-
-// static
-bool MediaCodecBridge::SupportsGetName() {
-  // MediaCodec.getName() is only available on JB MR2 and greater.
-  return base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
-}
-
-// static
-std::vector<MediaCodecBridge::CodecsInfo> MediaCodecBridge::GetCodecsInfo() {
-  std::vector<CodecsInfo> codecs_info;
-  if (!IsAvailable())
-    return codecs_info;
-
-  JNIEnv* env = AttachCurrentThread();
-  std::string mime_type;
-  ScopedJavaLocalRef<jobjectArray> j_codec_info_array =
-      Java_MediaCodecBridge_getCodecsInfo(env);
-  jsize len = env->GetArrayLength(j_codec_info_array.obj());
-  for (jsize i = 0; i < len; ++i) {
-    ScopedJavaLocalRef<jobject> j_info(
-        env, env->GetObjectArrayElement(j_codec_info_array.obj(), i));
-    ScopedJavaLocalRef<jstring> j_codec_type =
-        Java_CodecInfo_codecType(env, j_info.obj());
-    ConvertJavaStringToUTF8(env, j_codec_type.obj(), &mime_type);
-    ScopedJavaLocalRef<jstring> j_codec_name =
-        Java_CodecInfo_codecName(env, j_info.obj());
-    CodecsInfo info;
-    info.codecs = AndroidMimeTypeToCodecType(mime_type);
-    ConvertJavaStringToUTF8(env, j_codec_name.obj(), &info.name);
-    info.direction = static_cast<MediaCodecDirection>(
-        Java_CodecInfo_direction(env, j_info.obj()));
-    codecs_info.push_back(info);
-  }
-  return codecs_info;
-}
-
-// static
-std::string MediaCodecBridge::GetDefaultCodecName(
-    const std::string& mime_type,
-    MediaCodecDirection direction) {
-  if (!IsAvailable())
-    return std::string();
-
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type);
-  ScopedJavaLocalRef<jstring> j_codec_name =
-      Java_MediaCodecBridge_getDefaultCodecName(env, j_mime.obj(), direction);
-  return ConvertJavaStringToUTF8(env, j_codec_name.obj());
-}
-
-// static
-std::set<int> MediaCodecBridge::GetEncoderColorFormats(
-    const std::string& mime_type) {
-  std::set<int> color_formats;
-  if (!IsAvailable())
-    return color_formats;
-
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type);
-  ScopedJavaLocalRef<jintArray> j_color_format_array =
-      Java_MediaCodecBridge_getEncoderColorFormatsForMime(env, j_mime.obj());
-
-  if (j_color_format_array.obj()) {
-    std::vector<int> formats;
-    JavaIntArrayToIntVector(env, j_color_format_array.obj(), &formats);
-    color_formats = std::set<int>(formats.begin(), formats.end());
-  }
-
-  return color_formats;
-}
-
-// static
-bool MediaCodecBridge::CanDecode(const std::string& codec, bool is_secure) {
-  if (!IsAvailable())
-    return false;
-
-  JNIEnv* env = AttachCurrentThread();
-  std::string mime = CodecTypeToAndroidMimeType(codec);
-  if (mime.empty())
-    return false;
-  ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
-  ScopedJavaLocalRef<jobject> j_media_codec_bridge =
-      Java_MediaCodecBridge_create(env, j_mime.obj(), is_secure, false);
-  if (!j_media_codec_bridge.is_null()) {
-    Java_MediaCodecBridge_release(env, j_media_codec_bridge.obj());
-    return true;
-  }
-  return false;
-}
-
-// static
-bool MediaCodecBridge::IsKnownUnaccelerated(const std::string& mime_type,
-                                            MediaCodecDirection direction) {
-  if (!IsAvailable())
-    return true;
-
-  std::string codec_name;
-  if (SupportsGetName()) {
-    codec_name = GetDefaultCodecName(mime_type, direction);
-  } else {
-    std::string codec_type = AndroidMimeTypeToCodecType(mime_type);
-    std::vector<media::MediaCodecBridge::CodecsInfo> codecs_info =
-        MediaCodecBridge::GetCodecsInfo();
-    for (size_t i = 0; i < codecs_info.size(); ++i) {
-      if (codecs_info[i].codecs == codec_type &&
-          codecs_info[i].direction == direction) {
-        codec_name = codecs_info[i].name;
-        break;
-      }
-    }
-  }
-  DVLOG(1) << __PRETTY_FUNCTION__ << "Default codec for " << mime_type <<
-      " : " << codec_name;
-  // It would be nice if MediaCodecInfo externalized some notion of
-  // HW-acceleration but it doesn't. Android Media guidance is that the
-  // "OMX.google" prefix is always used for SW decoders, so that's what we
-  // use. "OMX.SEC.*" codec is Samsung software implementation - report it
-  // as unaccelerated as well. Also temporary blacklist Exynos and MediaTek
-  // devices while HW decoder video freezes and distortions are
-  // investigated - http://crbug.com/446974.
-  if (codec_name.length() > 0) {
-    return (base::StartsWith(codec_name, "OMX.google.",
-                             base::CompareCase::SENSITIVE) ||
-            base::StartsWith(codec_name, "OMX.SEC.",
-                             base::CompareCase::SENSITIVE) ||
-            base::StartsWith(codec_name, "OMX.MTK.",
-                             base::CompareCase::SENSITIVE) ||
-            base::StartsWith(codec_name, "OMX.Exynos.",
-                             base::CompareCase::SENSITIVE));
-  }
-  return true;
-}
-
-MediaCodecBridge::MediaCodecBridge(const std::string& mime,
-                                   bool is_secure,
-                                   MediaCodecDirection direction) {
+SdkMediaCodecBridge::SdkMediaCodecBridge(const std::string& mime,
+                                         bool is_secure,
+                                         MediaCodecDirection direction) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
   DCHECK(!mime.empty());
@@ -284,43 +88,43 @@ MediaCodecBridge::MediaCodecBridge(const std::string& mime,
       Java_MediaCodecBridge_create(env, j_mime.obj(), is_secure, direction));
 }
 
-MediaCodecBridge::~MediaCodecBridge() {
+SdkMediaCodecBridge::~SdkMediaCodecBridge() {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
   if (j_media_codec_.obj())
     Java_MediaCodecBridge_release(env, j_media_codec_.obj());
 }
 
-bool MediaCodecBridge::StartInternal() {
+bool SdkMediaCodecBridge::StartInternal() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_start(env, j_media_codec_.obj());
 }
 
-MediaCodecStatus MediaCodecBridge::Reset() {
+MediaCodecStatus SdkMediaCodecBridge::Reset() {
   JNIEnv* env = AttachCurrentThread();
   return static_cast<MediaCodecStatus>(
       Java_MediaCodecBridge_flush(env, j_media_codec_.obj()));
 }
 
-void MediaCodecBridge::Stop() {
+void SdkMediaCodecBridge::Stop() {
   JNIEnv* env = AttachCurrentThread();
   Java_MediaCodecBridge_stop(env, j_media_codec_.obj());
 }
 
-void MediaCodecBridge::GetOutputFormat(int* width, int* height) {
+void SdkMediaCodecBridge::GetOutputFormat(int* width, int* height) {
   JNIEnv* env = AttachCurrentThread();
 
   *width = Java_MediaCodecBridge_getOutputWidth(env, j_media_codec_.obj());
   *height = Java_MediaCodecBridge_getOutputHeight(env, j_media_codec_.obj());
 }
 
-int MediaCodecBridge::GetOutputSamplingRate() {
+int SdkMediaCodecBridge::GetOutputSamplingRate() {
   JNIEnv* env = AttachCurrentThread();
 
   return Java_MediaCodecBridge_getOutputSamplingRate(env, j_media_codec_.obj());
 }
 
-MediaCodecStatus MediaCodecBridge::QueueInputBuffer(
+MediaCodecStatus SdkMediaCodecBridge::QueueInputBuffer(
     int index,
     const uint8* data,
     size_t data_size,
@@ -331,34 +135,14 @@ MediaCodecStatus MediaCodecBridge::QueueInputBuffer(
   if (data && !FillInputBuffer(index, data, data_size))
     return MEDIA_CODEC_ERROR;
   JNIEnv* env = AttachCurrentThread();
-  return static_cast<MediaCodecStatus>(
-      Java_MediaCodecBridge_queueInputBuffer(env,
-                                             j_media_codec_.obj(),
-                                             index,
-                                             0,
-                                             data_size,
-                                             presentation_time.InMicroseconds(),
-                                             0));
-}
-
-MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
-    int index,
-    const uint8* data,
-    size_t data_size,
-    const std::string& key_id,
-    const std::string& iv,
-    const std::vector<SubsampleEntry>& subsamples,
-    const base::TimeDelta& presentation_time) {
-  return QueueSecureInputBuffer(
-      index, data, data_size, reinterpret_cast<const uint8_t*>(key_id.data()),
-      key_id.size(), reinterpret_cast<const uint8_t*>(iv.data()), iv.size(),
-      subsamples.empty() ? nullptr : &subsamples[0], subsamples.size(),
-      presentation_time);
+  return static_cast<MediaCodecStatus>(Java_MediaCodecBridge_queueInputBuffer(
+      env, j_media_codec_.obj(), index, 0, data_size,
+      presentation_time.InMicroseconds(), 0));
 }
 
 // TODO(timav): Combine this and above methods together keeping only the first
 // interface after we switch to Spitzer pipeline.
-MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
+MediaCodecStatus SdkMediaCodecBridge::QueueSecureInputBuffer(
     int index,
     const uint8* data,
     size_t data_size,
@@ -416,31 +200,20 @@ MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
 
   return static_cast<MediaCodecStatus>(
       Java_MediaCodecBridge_queueSecureInputBuffer(
-          env,
-          j_media_codec_.obj(),
-          index,
-          0,
-          j_iv.obj(),
-          j_key_id.obj(),
-          clear_array.obj(),
-          cypher_array.obj(),
-          new_subsamples_size,
+          env, j_media_codec_.obj(), index, 0, j_iv.obj(), j_key_id.obj(),
+          clear_array.obj(), cypher_array.obj(), new_subsamples_size,
           presentation_time.InMicroseconds()));
 }
 
-void MediaCodecBridge::QueueEOS(int input_buffer_index) {
+void SdkMediaCodecBridge::QueueEOS(int input_buffer_index) {
   DVLOG(3) << __PRETTY_FUNCTION__ << ": " << input_buffer_index;
   JNIEnv* env = AttachCurrentThread();
-  Java_MediaCodecBridge_queueInputBuffer(env,
-                                         j_media_codec_.obj(),
-                                         input_buffer_index,
-                                         0,
-                                         0,
-                                         0,
+  Java_MediaCodecBridge_queueInputBuffer(env, j_media_codec_.obj(),
+                                         input_buffer_index, 0, 0, 0,
                                          kBufferFlagEndOfStream);
 }
 
-MediaCodecStatus MediaCodecBridge::DequeueInputBuffer(
+MediaCodecStatus SdkMediaCodecBridge::DequeueInputBuffer(
     const base::TimeDelta& timeout,
     int* index) {
   JNIEnv* env = AttachCurrentThread();
@@ -454,7 +227,7 @@ MediaCodecStatus MediaCodecBridge::DequeueInputBuffer(
   return status;
 }
 
-MediaCodecStatus MediaCodecBridge::DequeueOutputBuffer(
+MediaCodecStatus SdkMediaCodecBridge::DequeueOutputBuffer(
     const base::TimeDelta& timeout,
     int* index,
     size_t* offset,
@@ -464,8 +237,8 @@ MediaCodecStatus MediaCodecBridge::DequeueOutputBuffer(
     bool* key_frame) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> result =
-      Java_MediaCodecBridge_dequeueOutputBuffer(
-          env, j_media_codec_.obj(), timeout.InMicroseconds());
+      Java_MediaCodecBridge_dequeueOutputBuffer(env, j_media_codec_.obj(),
+                                                timeout.InMicroseconds());
   *index = Java_DequeueOutputResult_index(env, result.obj());
   *offset = base::checked_cast<size_t>(
       Java_DequeueOutputResult_offset(env, result.obj()));
@@ -489,82 +262,87 @@ MediaCodecStatus MediaCodecBridge::DequeueOutputBuffer(
   return status;
 }
 
-void MediaCodecBridge::ReleaseOutputBuffer(int index, bool render) {
+void SdkMediaCodecBridge::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);
+  Java_MediaCodecBridge_releaseOutputBuffer(env, j_media_codec_.obj(), index,
+                                            render);
 }
 
-int MediaCodecBridge::GetOutputBuffersCount() {
+int SdkMediaCodecBridge::GetOutputBuffersCount() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_getOutputBuffersCount(env, j_media_codec_.obj());
 }
 
-size_t MediaCodecBridge::GetOutputBuffersCapacity() {
+size_t SdkMediaCodecBridge::GetOutputBuffersCapacity() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_getOutputBuffersCapacity(env,
                                                         j_media_codec_.obj());
 }
 
-void MediaCodecBridge::GetInputBuffer(int input_buffer_index,
-                                      uint8** data,
-                                      size_t* capacity) {
+void SdkMediaCodecBridge::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()));
+  *capacity =
+      base::checked_cast<size_t>(env->GetDirectBufferCapacity(j_buffer.obj()));
 }
 
-bool MediaCodecBridge::CopyFromOutputBuffer(int index,
-                                            size_t offset,
-                                            void* dst,
-                                            int dst_size) {
+bool SdkMediaCodecBridge::CopyFromOutputBuffer(int index,
+                                               size_t offset,
+                                               void* dst,
+                                               int dst_size) {
   void* src_data = nullptr;
-  int src_capacity = GetOutputBufferAddress(index, offset, &src_data);
-  if (src_capacity < dst_size)
+  size_t src_capacity = GetOutputBufferAddress(index, offset, &src_data);
+  if (src_capacity < offset ||
+      src_capacity - offset < static_cast<size_t>(dst_size)) {
     return false;
-  memcpy(dst, src_data, dst_size);
+  }
+  memcpy(dst, static_cast<uint8*>(src_data) + offset, dst_size);
   return true;
 }
 
-int MediaCodecBridge::GetOutputBufferAddress(int index,
-                                             size_t offset,
-                                             void** addr) {
+int SdkMediaCodecBridge::GetOutputBufferAddress(int index,
+                                                size_t offset,
+                                                void** addr) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_buffer(
       Java_MediaCodecBridge_getOutputBuffer(env, j_media_codec_.obj(), index));
-  *addr = reinterpret_cast<uint8*>(
-      env->GetDirectBufferAddress(j_buffer.obj())) + offset;
+  *addr =
+      reinterpret_cast<uint8*>(env->GetDirectBufferAddress(j_buffer.obj())) +
+      offset;
   return env->GetDirectBufferCapacity(j_buffer.obj()) - offset;
 }
 
-bool MediaCodecBridge::FillInputBuffer(int index,
-                                       const uint8* data,
-                                       size_t size) {
-  uint8* dst = NULL;
-  size_t capacity = 0;
-  GetInputBuffer(index, &dst, &capacity);
-  CHECK(dst);
+// static
+bool SdkMediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
 
-  if (size > capacity) {
-    LOG(ERROR) << "Input buffer size " << size
-               << " exceeds MediaCodec input buffer capacity: " << capacity;
-    return false;
-  }
+// static
+AudioCodecBridge* AudioCodecBridge::Create(const AudioCodec& codec) {
+  if (!MediaCodecBridge::IsAvailable())
+    return nullptr;
 
-  memcpy(dst, data, size);
-  return true;
+  const std::string mime = AudioCodecToAndroidMimeType(codec);
+  return mime.empty() ? nullptr : new AudioCodecBridge(mime);
+}
+
+// static
+bool AudioCodecBridge::IsKnownUnaccelerated(const AudioCodec& codec) {
+  return MediaCodecBridge::IsKnownUnaccelerated(
+      AudioCodecToAndroidMimeType(codec), MEDIA_CODEC_DECODER);
 }
 
 AudioCodecBridge::AudioCodecBridge(const std::string& mime)
     // Audio codec doesn't care about security level and there is no need for
     // audio encoding yet.
-    : MediaCodecBridge(mime, false, MEDIA_CODEC_DECODER) {}
+    : SdkMediaCodecBridge(mime, false, MEDIA_CODEC_DECODER) {}
 
 bool AudioCodecBridge::Start(const AudioCodec& codec,
                              int sample_rate,
@@ -595,8 +373,8 @@ bool AudioCodecBridge::Start(const AudioCodec& codec,
     return false;
   }
 
-  if (!Java_MediaCodecBridge_configureAudio(
-           env, media_codec(), j_format.obj(), media_crypto, 0, play_audio)) {
+  if (!Java_MediaCodecBridge_configureAudio(env, media_codec(), j_format.obj(),
+                                            media_crypto, 0, play_audio)) {
     return false;
   }
 
@@ -649,14 +427,14 @@ bool AudioCodecBridge::ConfigureMediaFormat(jobject j_format,
       // The first header is identification header.
       ScopedJavaLocalRef<jbyteArray> first_header =
           base::android::ToJavaByteArray(env, current_pos, header_length[0]);
-      Java_MediaCodecBridge_setCodecSpecificData(
-          env, j_format, 0, first_header.obj());
+      Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 0,
+                                                 first_header.obj());
       // The last header is codec header.
       ScopedJavaLocalRef<jbyteArray> last_header =
-          base::android::ToJavaByteArray(
-              env, extra_data + total_length, extra_data_size - total_length);
-      Java_MediaCodecBridge_setCodecSpecificData(
-          env, j_format, 1, last_header.obj());
+          base::android::ToJavaByteArray(env, extra_data + total_length,
+                                         extra_data_size - total_length);
+      Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 1,
+                                                 last_header.obj());
       break;
     }
     case kCodecAAC: {
@@ -693,8 +471,8 @@ bool AudioCodecBridge::ConfigureMediaFormat(jobject j_format,
       csd[1] = (frequency_index & 0x01) << 7 | channel_config << 3;
       ScopedJavaLocalRef<jbyteArray> byte_array =
           base::android::ToJavaByteArray(env, csd, kCsdLength);
-      Java_MediaCodecBridge_setCodecSpecificData(
-          env, j_format, 0, byte_array.obj());
+      Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 0,
+                                                 byte_array.obj());
 
       // TODO(qinmin): pass an extra variable to this function to determine
       // whether we need to call this.
@@ -702,8 +480,8 @@ bool AudioCodecBridge::ConfigureMediaFormat(jobject j_format,
       break;
     }
     case kCodecOpus: {
-      if (!extra_data || extra_data_size == 0 ||
-          codec_delay_ns < 0 || seek_preroll_ns < 0) {
+      if (!extra_data || extra_data_size == 0 || codec_delay_ns < 0 ||
+          seek_preroll_ns < 0) {
         LOG(ERROR) << "Invalid Opus Header";
         return false;
       }
@@ -714,17 +492,15 @@ bool AudioCodecBridge::ConfigureMediaFormat(jobject j_format,
       Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 0, csd0.obj());
 
       // csd1 - Codec Delay
-      ScopedJavaLocalRef<jbyteArray> csd1 =
-          base::android::ToJavaByteArray(
-              env, reinterpret_cast<const uint8*>(&codec_delay_ns),
-              sizeof(int64_t));
+      ScopedJavaLocalRef<jbyteArray> csd1 = base::android::ToJavaByteArray(
+          env, reinterpret_cast<const uint8*>(&codec_delay_ns),
+          sizeof(int64_t));
       Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 1, csd1.obj());
 
       // csd2 - Seek Preroll
-      ScopedJavaLocalRef<jbyteArray> csd2 =
-          base::android::ToJavaByteArray(
-              env, reinterpret_cast<const uint8*>(&seek_preroll_ns),
-              sizeof(int64_t));
+      ScopedJavaLocalRef<jbyteArray> csd2 = base::android::ToJavaByteArray(
+          env, reinterpret_cast<const uint8*>(&seek_preroll_ns),
+          sizeof(int64_t));
       Java_MediaCodecBridge_setCodecSpecificData(env, j_format, 2, csd2.obj());
       break;
     }
@@ -750,7 +526,7 @@ int64 AudioCodecBridge::PlayOutputBuffer(int index,
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> byte_array = base::android::ToJavaByteArray(
-          env, static_cast<uint8*>(buffer), numBytes);
+      env, static_cast<uint8*>(buffer), numBytes);
   return Java_MediaCodecBridge_playOutputBuffer(env, media_codec(),
                                                 byte_array.obj(), postpone);
 }
@@ -761,21 +537,6 @@ void AudioCodecBridge::SetVolume(double volume) {
 }
 
 // static
-AudioCodecBridge* AudioCodecBridge::Create(const AudioCodec& codec) {
-  if (!MediaCodecBridge::IsAvailable())
-    return NULL;
-
-  const std::string mime = AudioCodecToAndroidMimeType(codec);
-  return mime.empty() ? NULL : new AudioCodecBridge(mime);
-}
-
-// static
-bool AudioCodecBridge::IsKnownUnaccelerated(const AudioCodec& codec) {
-  return MediaCodecBridge::IsKnownUnaccelerated(
-      AudioCodecToAndroidMimeType(codec), MEDIA_CODEC_DECODER);
-}
-
-// static
 bool VideoCodecBridge::IsKnownUnaccelerated(const VideoCodec& codec,
                                             MediaCodecDirection direction) {
   return MediaCodecBridge::IsKnownUnaccelerated(
@@ -789,16 +550,16 @@ VideoCodecBridge* VideoCodecBridge::CreateDecoder(const VideoCodec& codec,
                                                   jobject surface,
                                                   jobject media_crypto) {
   if (!MediaCodecBridge::IsAvailable())
-    return NULL;
+    return nullptr;
 
   const std::string mime = VideoCodecToAndroidMimeType(codec);
   if (mime.empty())
-    return NULL;
+    return nullptr;
 
   scoped_ptr<VideoCodecBridge> bridge(
       new VideoCodecBridge(mime, is_secure, MEDIA_CODEC_DECODER));
   if (!bridge->media_codec())
-    return NULL;
+    return nullptr;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
@@ -806,16 +567,13 @@ VideoCodecBridge* VideoCodecBridge::CreateDecoder(const VideoCodec& codec,
       Java_MediaCodecBridge_createVideoDecoderFormat(
           env, j_mime.obj(), size.width(), size.height()));
   DCHECK(!j_format.is_null());
-  if (!Java_MediaCodecBridge_configureVideo(env,
-                                            bridge->media_codec(),
-                                            j_format.obj(),
-                                            surface,
-                                            media_crypto,
-                                            0)) {
-    return NULL;
+  if (!Java_MediaCodecBridge_configureVideo(env, bridge->media_codec(),
+                                            j_format.obj(), surface,
+                                            media_crypto, 0)) {
+    return nullptr;
   }
 
-  return bridge->StartInternal() ? bridge.release() : NULL;
+  return bridge->StartInternal() ? bridge.release() : nullptr;
 }
 
 // static
@@ -826,45 +584,37 @@ VideoCodecBridge* VideoCodecBridge::CreateEncoder(const VideoCodec& codec,
                                                   int i_frame_interval,
                                                   int color_format) {
   if (!MediaCodecBridge::IsAvailable())
-    return NULL;
+    return nullptr;
 
   const std::string mime = VideoCodecToAndroidMimeType(codec);
   if (mime.empty())
-    return NULL;
+    return nullptr;
 
   scoped_ptr<VideoCodecBridge> bridge(
       new VideoCodecBridge(mime, false, MEDIA_CODEC_ENCODER));
   if (!bridge->media_codec())
-    return NULL;
+    return nullptr;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
   ScopedJavaLocalRef<jobject> j_format(
-      Java_MediaCodecBridge_createVideoEncoderFormat(env,
-                                                     j_mime.obj(),
-                                                     size.width(),
-                                                     size.height(),
-                                                     bit_rate,
-                                                     frame_rate,
-                                                     i_frame_interval,
-                                                     color_format));
+      Java_MediaCodecBridge_createVideoEncoderFormat(
+          env, j_mime.obj(), size.width(), size.height(), bit_rate, frame_rate,
+          i_frame_interval, color_format));
   DCHECK(!j_format.is_null());
-  if (!Java_MediaCodecBridge_configureVideo(env,
-                                            bridge->media_codec(),
-                                            j_format.obj(),
-                                            NULL,
-                                            NULL,
+  if (!Java_MediaCodecBridge_configureVideo(env, bridge->media_codec(),
+                                            j_format.obj(), nullptr, nullptr,
                                             kConfigureFlagEncode)) {
-    return NULL;
+    return nullptr;
   }
 
-  return bridge->StartInternal() ? bridge.release() : NULL;
+  return bridge->StartInternal() ? bridge.release() : nullptr;
 }
 
 VideoCodecBridge::VideoCodecBridge(const std::string& mime,
                                    bool is_secure,
                                    MediaCodecDirection direction)
-    : MediaCodecBridge(mime, is_secure, direction),
+    : SdkMediaCodecBridge(mime, is_secure, direction),
       adaptive_playback_supported_for_testing_(-1) {}
 
 void VideoCodecBridge::SetVideoBitrate(int bps) {
@@ -883,12 +633,8 @@ bool VideoCodecBridge::IsAdaptivePlaybackSupported(int width, int height) {
   else if (adaptive_playback_supported_for_testing_ > 0)
     return true;
   JNIEnv* env = AttachCurrentThread();
-  return Java_MediaCodecBridge_isAdaptivePlaybackSupported(
-      env, media_codec(), width, height);
-}
-
-bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
-  return RegisterNativesImpl(env);
+  return Java_MediaCodecBridge_isAdaptivePlaybackSupported(env, media_codec(),
+                                                           width, height);
 }
 
 }  // namespace media