Fix an browser crash after video decoder failed to get created

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 618 matching lines @@
                                                   const gfx::Size& size,
                                                   jobject surface,
                                                   jobject media_crypto) {
   JNIEnv* env = AttachCurrentThread();
   const std::string mime = VideoCodecToAndroidMimeType(codec);
   if (mime.empty())
     return NULL;
 
   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(
       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,
@@ skipping 11 matching lines @@
                                                   int frame_rate,
                                                   int i_frame_interval,
                                                   int color_format) {
   JNIEnv* env = AttachCurrentThread();
   const std::string mime = VideoCodecToAndroidMimeType(codec);
   if (mime.empty())
     return NULL;
 
   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(
       Java_MediaCodecBridge_createVideoEncoderFormat(env,
                                                      j_mime.obj(),
                                                      size.width(),
                                                      size.height(),
                                                      bit_rate,
                                                      frame_rate,
                                                      i_frame_interval,
@@ skipping 24 matching lines @@
 void VideoCodecBridge::RequestKeyFrameSoon() {
   JNIEnv* env = AttachCurrentThread();
   Java_MediaCodecBridge_requestKeyFrameSoon(env, media_codec());
 }
 
 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace media