Move all Android specific stuff to android_codec_factory_helper.

This helps separate concerns, so that the VideoProcessorIntegrationTest
is almost oblivious to the fact that it needs to connect to the JVM
to get the Android HW codecs.

Bug: webrtc:8448
Change-Id: I4359b31f84be48eaf99d83525bcce6e593e874f8
Reviewed-on: https://webrtc-review.googlesource.com/47384
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21890}

modules/video_coding/codecs/test/android_codec_factory_helper.cc

@@ -0,0 +1,84 @@
+/*
+ *  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.
+ */
+
+#include <pthread.h>
+
+#include <memory>
+
+#include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/ignore_wundef.h"
+#include "sdk/android/native_api/base/init.h"
+#include "sdk/android/native_api/codecs/wrapper.h"
+#include "sdk/android/native_api/jni/class_loader.h"
+#include "sdk/android/native_api/jni/jvm.h"
+#include "sdk/android/native_api/jni/scoped_java_ref.h"
+
+// Note: this dependency is dangerous since it reaches into Chromium's base.
+// There's a risk of e.g. macro clashes. This file may only be used in tests.
+// Since we use Chrome's build system for creating the gtest binary, this should
+// be fine.
+RTC_PUSH_IGNORING_WUNDEF()
+#include "base/android/jni_android.h"
+RTC_POP_IGNORING_WUNDEF()
+
+namespace webrtc {
+namespace test {
+
+namespace {
+
+static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
+
+// There can only be one JNI_OnLoad in each binary. So since this is a GTEST
+// C++ runner binary, we want to initialize the same global objects we normally
+// do if this had been a Java binary.
+void EnsureInitializedOnce() {
+  RTC_CHECK(::base::android::IsVMInitialized());
+  JNIEnv* env = ::base::android::AttachCurrentThread();
+  JavaVM* jvm = nullptr;
+  RTC_CHECK_EQ(0, env->GetJavaVM(&jvm));
+
+  InitAndroid(jvm);
+}
+
+}  // namespace
+
+void InitializeAndroidObjects() {
+  RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
+}
+
+std::unique_ptr<VideoEncoderFactory> CreateAndroidEncoderFactory() {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  ScopedJavaLocalRef<jclass> factory_class =
+      GetClass(env, "org/webrtc/HardwareVideoEncoderFactory");
+  jmethodID factory_constructor = env->GetMethodID(
+      factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;ZZ)V");
+  ScopedJavaLocalRef<jobject> factory_object(
+      env, env->NewObject(factory_class.obj(), factory_constructor,
+                          nullptr /* shared_context */,
+                          false /* enable_intel_vp8_encoder */,
+                          true /* enable_h264_high_profile */));
+  return JavaToNativeVideoEncoderFactory(env, factory_object.obj());
+}
+
+std::unique_ptr<VideoDecoderFactory> CreateAndroidDecoderFactory() {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  ScopedJavaLocalRef<jclass> factory_class =
+      GetClass(env, "org/webrtc/HardwareVideoDecoderFactory");
+  jmethodID factory_constructor = env->GetMethodID(
+      factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;)V");
+  ScopedJavaLocalRef<jobject> factory_object(
+      env, env->NewObject(factory_class.obj(), factory_constructor,
+                          nullptr /* shared_context */));
+  return JavaToNativeVideoDecoderFactory(env, factory_object.obj());
+}
+
+}  // namespace test
+}  // namespace webrtc

modules/video_coding/codecs/test/android_codec_factory_helper.h

@@ -0,0 +1,30 @@
+/*
+ *  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.
+ */
+
+#ifndef MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_CODEC_FACTORY_HELPER_H_
+#define MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_CODEC_FACTORY_HELPER_H_
+
+#include <memory>
+
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
+
+namespace webrtc {
+namespace test {
+
+void InitializeAndroidObjects();
+
+std::unique_ptr<VideoEncoderFactory> CreateAndroidEncoderFactory();
+std::unique_ptr<VideoDecoderFactory> CreateAndroidDecoderFactory();
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_CODEC_FACTORY_HELPER_H_

modules/video_coding/codecs/test/android_test_initializer.cc

@@ -1,51 +0,0 @@
-/*
- *  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.
- */
-
-#include <pthread.h>
-
-#include "modules/video_coding/codecs/test/android_test_initializer.h"
-#include "rtc_base/ignore_wundef.h"
-#include "sdk/android/native_api/base/init.h"
-
-// Note: this dependency is dangerous since it reaches into Chromium's base.
-// There's a risk of e.g. macro clashes. This file may only be used in tests.
-// Since we use Chrome's build system for creating the gtest binary, this should
-// be fine.
-RTC_PUSH_IGNORING_WUNDEF()
-#include "base/android/jni_android.h"
-RTC_POP_IGNORING_WUNDEF()
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-
-static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
-
-// There can only be one JNI_OnLoad in each binary. So since this is a GTEST
-// C++ runner binary, we want to initialize the same global objects we normally
-// do if this had been a Java binary.
-void EnsureInitializedOnce() {
-  RTC_CHECK(::base::android::IsVMInitialized());
-  JNIEnv* jni = ::base::android::AttachCurrentThread();
-  JavaVM* jvm = NULL;
-  RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
-
-  InitAndroid(jvm);
-}
-
-}  // namespace
-
-void InitializeAndroidObjects() {
-  RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
-}
-
-}  // namespace webrtc

modules/video_coding/codecs/test/android_test_initializer.h

@@ -1,20 +0,0 @@
-/*
- *  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.
- */
-
-#ifndef MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_
-#define MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_
-
-namespace webrtc {
-
-void InitializeAndroidObjects();
-
-}  // namespace webrtc
-
-#endif  // MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_

modules/video_coding/codecs/test/objc_codec_factory_helper.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
-#define MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
+#ifndef MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_FACTORY_HELPER_H_
+#define MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_FACTORY_HELPER_H_
 
 #include <memory>
 
@@ -17,10 +17,12 @@
 #include "api/video_codecs/video_encoder_factory.h"
 
 namespace webrtc {
+namespace test {
 
 std::unique_ptr<VideoEncoderFactory> CreateObjCEncoderFactory();
 std::unique_ptr<VideoDecoderFactory> CreateObjCDecoderFactory();
 
+}  // namespace test
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
+#endif  // MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_FACTORY_HELPER_H_

modules/video_coding/codecs/test/objc_codec_factory_helper.mm

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/codecs/test/objc_codec_h264_test.h"
+#include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
 
 #import "WebRTC/RTCVideoCodecH264.h"
 #include "sdk/objc/Framework/Native/api/video_decoder_factory.h"
 #include "sdk/objc/Framework/Native/api/video_encoder_factory.h"
 
 namespace webrtc {
+namespace test {
 
 std::unique_ptr<VideoEncoderFactory> CreateObjCEncoderFactory() {
   return ObjCToNativeVideoEncoderFactory([[RTCVideoEncoderFactoryH264 alloc] init]);
@@ -24,4 +25,5 @@ std::unique_ptr<VideoDecoderFactory> CreateObjCDecoderFactory() {
   return ObjCToNativeVideoDecoderFactory([[RTCVideoDecoderFactoryH264 alloc] init]);
 }
 
+}  // namespace test
 }  // namespace webrtc

modules/video_coding/codecs/test/videoprocessor_integrationtest.cc

@@ -11,16 +11,13 @@
 #include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h"
 
 #include <algorithm>
+#include <memory>
 #include <utility>
 
 #if defined(WEBRTC_ANDROID)
-#include "modules/video_coding/codecs/test/android_test_initializer.h"
-#include "sdk/android/native_api/codecs/wrapper.h"
-#include "sdk/android/native_api/jni/class_loader.h"
-#include "sdk/android/native_api/jni/jvm.h"
-#include "sdk/android/native_api/jni/scoped_java_ref.h"
+#include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
 #elif defined(WEBRTC_IOS)
-#include "modules/video_coding/codecs/test/objc_codec_h264_test.h"
+#include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
 #endif
 
 #include "common_types.h"  // NOLINT(build/include)
@@ -371,18 +368,7 @@ void VideoProcessorIntegrationTest::CreateEncoderAndDecoder() {
   std::unique_ptr<VideoEncoderFactory> encoder_factory;
   if (config_.hw_encoder) {
 #if defined(WEBRTC_ANDROID)
-    JNIEnv* env = AttachCurrentThreadIfNeeded();
-    ScopedJavaLocalRef<jclass> factory_class =
-        GetClass(env, "org/webrtc/HardwareVideoEncoderFactory");
-    jmethodID factory_constructor = env->GetMethodID(
-        factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;ZZ)V");
-    ScopedJavaLocalRef<jobject> factory_object(
-        env, env->NewObject(factory_class.obj(), factory_constructor,
-                            nullptr /* shared_context */,
-                            false /* enable_intel_vp8_encoder */,
-                            true /* enable_h264_high_profile */));
-    encoder_factory =
-        JavaToNativeVideoEncoderFactory(env, factory_object.obj());
+    encoder_factory = CreateAndroidEncoderFactory();
 #elif defined(WEBRTC_IOS)
     EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType)
         << "iOS HW codecs only support H264.";
@@ -397,16 +383,7 @@ void VideoProcessorIntegrationTest::CreateEncoderAndDecoder() {
   std::unique_ptr<VideoDecoderFactory> decoder_factory;
   if (config_.hw_decoder) {
 #if defined(WEBRTC_ANDROID)
-    JNIEnv* env = AttachCurrentThreadIfNeeded();
-    ScopedJavaLocalRef<jclass> factory_class =
-        GetClass(env, "org/webrtc/HardwareVideoDecoderFactory");
-    jmethodID factory_constructor = env->GetMethodID(
-        factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;)V");
-    ScopedJavaLocalRef<jobject> factory_object(
-        env, env->NewObject(factory_class.obj(), factory_constructor,
-                            nullptr /* shared_context */));
-    decoder_factory =
-        JavaToNativeVideoDecoderFactory(env, factory_object.obj());
+    decoder_factory = CreateAndroidDecoderFactory();
 #elif defined(WEBRTC_IOS)
     EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType)
         << "iOS HW codecs only support H264.";

modules/video_coding/codecs/test/videoprocessor_integrationtest.h

@@ -19,8 +19,6 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
 #include "modules/video_coding/codecs/test/stats.h"
 #include "modules/video_coding/codecs/test/test_config.h"
 #include "modules/video_coding/codecs/test/videoprocessor.h"

modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc

@@ -19,8 +19,6 @@
 namespace webrtc {
 namespace test {
 
-#if defined(WEBRTC_ANDROID)
-
 namespace {
 const int kForemanNumFrames = 300;
 const std::nullptr_t kNoVisualizationParams = nullptr;
@@ -105,7 +103,5 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec,
                               kNoVisualizationParams);
 }
 
-#endif  // defined(WEBRTC_ANDROID)
-
 }  // namespace test
 }  // namespace webrtc

modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc

@@ -18,8 +18,6 @@
 namespace webrtc {
 namespace test {
 
-#if defined(WEBRTC_IOS)
-
 namespace {
 const int kForemanNumFrames = 300;
 const std::nullptr_t kNoVisualizationParams = nullptr;
@@ -80,7 +78,5 @@ TEST_F(VideoProcessorIntegrationTestVideoToolbox,
                               kNoVisualizationParams);
 }
 
-#endif  // defined(WEBRTC_IOS)
-
 }  // namespace test
 }  // namespace webrtc