diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 16717b4f42..0dcb40e60a 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -450,16 +450,37 @@ rtc_static_library("webrtc_vp9") { } if (rtc_include_tests) { - if (is_ios || is_mac) { - rtc_static_library("codec_test_objc") { + if (is_android) { + rtc_static_library("android_codec_factory_helper") { sources = [ - "codecs/test/objc_codec_h264_test.h", - "codecs/test/objc_codec_h264_test.mm", + "codecs/test/android_codec_factory_helper.cc", + "codecs/test/android_codec_factory_helper.h", ] + + deps = [ + "../../api/video_codecs:video_codecs_api", + "../../rtc_base:checks", + "../../rtc_base:rtc_base_approved", + "../../sdk/android:native_api_base", + "../../sdk/android:native_api_codecs", + "../../sdk/android:native_api_jni", + "//base", + ] + } + } + + if (is_ios || is_mac) { + rtc_static_library("objc_codec_factory_helper") { + sources = [ + "codecs/test/objc_codec_factory_helper.h", + "codecs/test/objc_codec_factory_helper.mm", + ] + deps = [ "../../api:video_frame_api", "../../api/video_codecs:video_codecs_api", "../../media:rtc_audio_video", + "../../media:rtc_media_base", "../../modules:module_api", "../../rtc_base:rtc_base_approved", "../../sdk:common_objc", @@ -614,18 +635,9 @@ if (rtc_include_tests) { data = video_coding_modules_tests_resources if (is_android) { - sources += [ - "codecs/test/android_test_initializer.cc", - "codecs/test/android_test_initializer.h", - "codecs/test/videoprocessor_integrationtest_mediacodec.cc", - ] + sources += [ "codecs/test/videoprocessor_integrationtest_mediacodec.cc" ] - deps += [ - "../../sdk/android:native_api_base", - "../../sdk/android:native_api_codecs", - "../../sdk/android:native_api_jni", - "//base", - ] + deps += [ ":android_codec_factory_helper" ] } if (is_ios || is_mac) { @@ -633,10 +645,8 @@ if (rtc_include_tests) { [ "codecs/test/videoprocessor_integrationtest_videotoolbox.cc" ] deps += [ - ":codec_test_objc", + ":objc_codec_factory_helper", ":video_coding_modules_tests_resources_bundle_data", - "../../media:rtc_media_base", - "../../sdk:videotoolbox_objc", ] } diff --git a/modules/video_coding/DEPS b/modules/video_coding/DEPS index 55a28a2ee8..b9c8dac321 100644 --- a/modules/video_coding/DEPS +++ b/modules/video_coding/DEPS @@ -2,20 +2,18 @@ include_rules = [ "+vpx", "+call", "+common_video", - "+experiments", + "+sdk", "+system_wrappers", "+rtc_tools", "+third_party/libyuv", ] specific_include_rules = { - "android_test_initializer\.cc": [ + "android_codec_factory_helper\.cc": [ "+base/android", - "+sdk", ], - "(.*test\.cc|.*test\.h|.*test\.mm|test_config.cc)": [ + "test_config.cc": [ "+media/base", "+media/engine", - "+sdk", ], } diff --git a/modules/video_coding/codecs/test/android_codec_factory_helper.cc b/modules/video_coding/codecs/test/android_codec_factory_helper.cc new file mode 100644 index 0000000000..3ebc6b7ca4 --- /dev/null +++ b/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 + +#include + +#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 CreateAndroidEncoderFactory() { + JNIEnv* env = AttachCurrentThreadIfNeeded(); + ScopedJavaLocalRef factory_class = + GetClass(env, "org/webrtc/HardwareVideoEncoderFactory"); + jmethodID factory_constructor = env->GetMethodID( + factory_class.obj(), "", "(Lorg/webrtc/EglBase$Context;ZZ)V"); + ScopedJavaLocalRef 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 CreateAndroidDecoderFactory() { + JNIEnv* env = AttachCurrentThreadIfNeeded(); + ScopedJavaLocalRef factory_class = + GetClass(env, "org/webrtc/HardwareVideoDecoderFactory"); + jmethodID factory_constructor = env->GetMethodID( + factory_class.obj(), "", "(Lorg/webrtc/EglBase$Context;)V"); + ScopedJavaLocalRef factory_object( + env, env->NewObject(factory_class.obj(), factory_constructor, + nullptr /* shared_context */)); + return JavaToNativeVideoDecoderFactory(env, factory_object.obj()); +} + +} // namespace test +} // namespace webrtc diff --git a/modules/video_coding/codecs/test/android_codec_factory_helper.h b/modules/video_coding/codecs/test/android_codec_factory_helper.h new file mode 100644 index 0000000000..ad9cf35162 --- /dev/null +++ b/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 + +#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 CreateAndroidEncoderFactory(); +std::unique_ptr CreateAndroidDecoderFactory(); + +} // namespace test +} // namespace webrtc + +#endif // MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_CODEC_FACTORY_HELPER_H_ diff --git a/modules/video_coding/codecs/test/android_test_initializer.cc b/modules/video_coding/codecs/test/android_test_initializer.cc deleted file mode 100644 index 04a5f54395..0000000000 --- a/modules/video_coding/codecs/test/android_test_initializer.cc +++ /dev/null @@ -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 - -#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 diff --git a/modules/video_coding/codecs/test/android_test_initializer.h b/modules/video_coding/codecs/test/android_test_initializer.h deleted file mode 100644 index 2094b2d47f..0000000000 --- a/modules/video_coding/codecs/test/android_test_initializer.h +++ /dev/null @@ -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_ diff --git a/modules/video_coding/codecs/test/objc_codec_h264_test.h b/modules/video_coding/codecs/test/objc_codec_factory_helper.h similarity index 73% rename from modules/video_coding/codecs/test/objc_codec_h264_test.h rename to modules/video_coding/codecs/test/objc_codec_factory_helper.h index 0b18f8eb93..475d0fdd08 100644 --- a/modules/video_coding/codecs/test/objc_codec_h264_test.h +++ b/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 @@ -17,10 +17,12 @@ #include "api/video_codecs/video_encoder_factory.h" namespace webrtc { +namespace test { std::unique_ptr CreateObjCEncoderFactory(); std::unique_ptr 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_ diff --git a/modules/video_coding/codecs/test/objc_codec_h264_test.mm b/modules/video_coding/codecs/test/objc_codec_factory_helper.mm similarity index 89% rename from modules/video_coding/codecs/test/objc_codec_h264_test.mm rename to modules/video_coding/codecs/test/objc_codec_factory_helper.mm index ed3fb4d1c9..6fb14f346e 100644 --- a/modules/video_coding/codecs/test/objc_codec_h264_test.mm +++ b/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 CreateObjCEncoderFactory() { return ObjCToNativeVideoEncoderFactory([[RTCVideoEncoderFactoryH264 alloc] init]); @@ -24,4 +25,5 @@ std::unique_ptr CreateObjCDecoderFactory() { return ObjCToNativeVideoDecoderFactory([[RTCVideoDecoderFactoryH264 alloc] init]); } +} // namespace test } // namespace webrtc diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index ad59913165..2a62deeb71 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -11,16 +11,13 @@ #include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" #include +#include #include #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 encoder_factory; if (config_.hw_encoder) { #if defined(WEBRTC_ANDROID) - JNIEnv* env = AttachCurrentThreadIfNeeded(); - ScopedJavaLocalRef factory_class = - GetClass(env, "org/webrtc/HardwareVideoEncoderFactory"); - jmethodID factory_constructor = env->GetMethodID( - factory_class.obj(), "", "(Lorg/webrtc/EglBase$Context;ZZ)V"); - ScopedJavaLocalRef 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 decoder_factory; if (config_.hw_decoder) { #if defined(WEBRTC_ANDROID) - JNIEnv* env = AttachCurrentThreadIfNeeded(); - ScopedJavaLocalRef factory_class = - GetClass(env, "org/webrtc/HardwareVideoDecoderFactory"); - jmethodID factory_constructor = env->GetMethodID( - factory_class.obj(), "", "(Lorg/webrtc/EglBase$Context;)V"); - ScopedJavaLocalRef 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."; diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/modules/video_coding/codecs/test/videoprocessor_integrationtest.h index ef87b28121..24bc69582a 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.h +++ b/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" diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc index 5b3fe90fca..44cf1dc749 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc +++ b/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 diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc index 98f30a3f4f..3b94386ea8 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc +++ b/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