Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/media_jni_registrar.cc

Index: media/base/android/media_jni_registrar.cc
diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc
index 202046987ea1fc81da1419bfb0809fc89aab4f33..cc8bc1d6d3ca5383f3acddfe1aa6453ef2b66ee8 100644
--- a/media/base/android/media_jni_registrar.cc
+++ b/media/base/android/media_jni_registrar.cc
@@ -10,10 +10,11 @@
 
 #include "media/audio/android/audio_manager_android.h"
 #include "media/audio/android/audio_record_input.h"
-#include "media/base/android/media_codec_bridge.h"
+#include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_player_listener.h"
+#include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/base/android/webaudio_media_codec_bridge.h"
 #include "media/capture/video/android/video_capture_device_android.h"
 #include "media/capture/video/android/video_capture_device_factory_android.h"
@@ -21,24 +22,19 @@
 namespace media {
 
 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
-  { "AudioManagerAndroid",
-    AudioManagerAndroid::RegisterAudioManager },
-  { "AudioRecordInput",
-    AudioRecordInputStream::RegisterAudioRecordInput },
-  { "MediaCodecBridge",
-    MediaCodecBridge::RegisterMediaCodecBridge },
-  { "MediaDrmBridge",
-    MediaDrmBridge::RegisterMediaDrmBridge },
-  { "MediaPlayerBridge",
-    MediaPlayerBridge::RegisterMediaPlayerBridge },
-  { "MediaPlayerListener",
-    MediaPlayerListener::RegisterMediaPlayerListener },
-  { "VideoCaptureDevice",
-    VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },
-  { "VideoCaptureDeviceFactory",
-    VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory },
-  { "WebAudioMediaCodecBridge",
-    WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge },
+    {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager},
+    {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput},
+    {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},
+    {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},
+    {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},
+    {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge},
+    {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil},
+    {"VideoCaptureDevice",
+     VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice},
+    {"VideoCaptureDeviceFactory",
+     VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory},
+    {"WebAudioMediaCodecBridge",
+     WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge},
 };
 
 bool RegisterJni(JNIEnv* env) {