Fix a crash in PeerConnectionFactory.SetVideoHwAccelerationOptions.

webrtc/sdk/android/src/jni/video_jni.cc

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
 
 namespace webrtc_jni {
 
 // TODO(sakal): Remove this once MediaCodecVideoDecoder/Encoder are no longer
 // used and all applications inject their own codecs.
 // This is semi broken if someone wants to create multiple peerconnection
 // factories.
-static MediaCodecVideoDecoderFactory* media_codec_decoder_factory;
+static bool use_media_codec_decoder_factory;
 
 cricket::WebRtcVideoEncoderFactory* CreateVideoEncoderFactory(
     JNIEnv* jni,
     jobject j_encoder_factory) {
   RTC_DCHECK(j_encoder_factory == nullptr)
       << "Injectable video encoders are not supported yet.";
   return new MediaCodecVideoEncoderFactory();
 }
 
 cricket::WebRtcVideoDecoderFactory* CreateVideoDecoderFactory(
     JNIEnv* jni,
     jobject j_decoder_factory) {
-  if (j_decoder_factory != nullptr) {
-    media_codec_decoder_factory = nullptr;
+  use_media_codec_decoder_factory = j_decoder_factory == nullptr;
+
+  if (use_media_codec_decoder_factory) {
+    return new MediaCodecVideoDecoderFactory();
+  } else {
     return new VideoDecoderFactoryWrapper(jni, j_decoder_factory);
-  } else {
-    media_codec_decoder_factory = new MediaCodecVideoDecoderFactory();
-    return media_codec_decoder_factory;
   }
 }
 
 jobject GetJavaSurfaceTextureHelper(
     const rtc::scoped_refptr<SurfaceTextureHelper>& surface_texture_helper) {
   return surface_texture_helper
              ? surface_texture_helper->GetJavaSurfaceTextureHelper()
              : nullptr;
 }
 
@@ skipping 42 matching lines @@
 
   MediaCodecVideoEncoderFactory* encoder_factory =
       static_cast<MediaCodecVideoEncoderFactory*>(
           owned_factory->encoder_factory());
   if (encoder_factory &&
       jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) {
     LOG(LS_INFO) << "Set EGL context for HW encoding.";
     encoder_factory->SetEGLContext(jni, local_egl_context);
   }
 
-  if (media_codec_decoder_factory) {
+  MediaCodecVideoDecoderFactory* decoder_factory =
+      static_cast<MediaCodecVideoDecoderFactory*>(
+          owned_factory->decoder_factory());
+  if (use_media_codec_decoder_factory && decoder_factory) {
     LOG(LS_INFO) << "Set EGL context for HW decoding.";
-    media_codec_decoder_factory->SetEGLContext(jni, remote_egl_context);
+    decoder_factory->SetEGLContext(jni, remote_egl_context);
   }
 }
 
 }  // namespace webrtc_jni