Fix an browser crash after video decoder failed to get created

media/base/android/media_codec_bridge.cc

Index: media/base/android/media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
index 4ba492acebfa9cef09fd2e69e9c14a375b035e9a..6e7987fd055a936f3d71abab0b47260cb1ce0c0f 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -636,6 +636,8 @@ VideoCodecBridge* VideoCodecBridge::CreateDecoder(const VideoCodec& codec,
 
   scoped_ptr<VideoCodecBridge> bridge(
       new VideoCodecBridge(mime, is_secure, MEDIA_CODEC_DECODER));
+  if (!bridge->media_codec())
+    return NULL;

[xhwang, 2013/12/19 07:29:05]

Shall we have a Create function that could return NULL (preferably in Java)?

[qinmin, 2013/12/19 18:26:25]

The java side MediaCodecBridge.Create() function already returning a NULL.
If we really want to get rid of this if statement, then we have to either 
1. create the java object here rather than in MediaCodecBridge ctor. And then we
need to have another contructor in VideoDecoderBridge which takes a jobject as
an input. Or
2. Have a static MediaCodecBridge::Create() function, and do type cast in all
child classes's Create() function.

I feel both approaches are not elegant.



On 2013/12/19 07:29:05, xhwang wrote:

 
   ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
   ScopedJavaLocalRef<jobject> j_format(
@@ -667,6 +669,8 @@ VideoCodecBridge* VideoCodecBridge::CreateEncoder(const VideoCodec& codec,
 
   scoped_ptr<VideoCodecBridge> bridge(
       new VideoCodecBridge(mime, false, MEDIA_CODEC_ENCODER));
+  if (!bridge->media_codec())
+    return NULL;
 
   ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
   ScopedJavaLocalRef<jobject> j_format(