Add VideoProcessorIntegrationTest for MediaCodec implementations.

webrtc/modules/video_coding/BUILD.gn

Index: webrtc/modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 3bf221be17009d5bebdd3cf9d47dbffbe4e6acb3..e39beadffce86145e6ae185c4d25b2aa7b242988 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -366,56 +366,21 @@ if (rtc_include_tests) {
     ]
   }
 
-  rtc_source_set("video_coding_videoprocessor_integration_test") {
-    testonly = true
-
-    sources = [
-      "codecs/test/videoprocessor_integrationtest.cc",
-      "codecs/test/videoprocessor_integrationtest.h",
-    ]
-
-    deps = [
-      ":video_codecs_test_framework",
-      ":video_coding",
-      ":video_coding_utility",
-      ":webrtc_h264",
-      ":webrtc_vp8",
-      ":webrtc_vp9",
-      "../..:webrtc_common",
-      "../../media:rtc_media",
-      "../../rtc_base:rtc_base_approved",
-      "../../rtc_base:rtc_task_queue",
-      "../../system_wrappers:system_wrappers",
-      "../../test:test_support",
-      "../../test:video_test_common",
-      "../../test:video_test_support",
-    ]
-
-    if (is_android) {
-      sources += [
-        "codecs/test/android_test_initializer.cc",
-        "codecs/test/android_test_initializer.h",
-      ]
-
-      deps += [
-        "../../rtc_base:rtc_base_approved",
-        "../../sdk/android:libjingle_peerconnection_jni",
-        "//base",
-      ]
-    }
+  video_coding_modules_tests_resources = [
+    "../../../resources/foreman_128x96.yuv",
+    "../../../resources/foreman_160x120.yuv",
+    "../../../resources/foreman_176x144.yuv",
+    "../../../resources/foreman_320x240.yuv",
+  ]
 
-    if (is_ios || is_mac) {
-      deps += [
-        ":codec_test_objc",
-        "../../media:rtc_media_base",
-        "../../sdk:videotoolbox_objc",
+  if (is_ios || is_mac) {
+    bundle_data("video_coding_modules_tests_resources_bundle_data") {
+      testonly = true
+      sources = video_coding_modules_tests_resources
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
       ]
     }
-
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
   }
 
   rtc_source_set("video_coding_modules_tests") {
@@ -429,105 +394,63 @@ if (rtc_include_tests) {
     }
     sources = [
       "codecs/h264/test/h264_impl_unittest.cc",
+      "codecs/test/videoprocessor_integrationtest.cc",
+      "codecs/test/videoprocessor_integrationtest.h",
       "codecs/test/videoprocessor_integrationtest_libvpx.cc",
       "codecs/test/videoprocessor_integrationtest_openh264.cc",
+      "codecs/test/videoprocessor_integrationtest_parameterized.cc",
       "codecs/vp8/test/vp8_impl_unittest.cc",
       "codecs/vp9/test/vp9_impl_unittest.cc",
     ]
 
     deps = [
       ":video_codecs_test_framework",
-      ":video_coding_videoprocessor_integration_test",
+      ":video_coding",
+      ":video_coding_utility",
       ":webrtc_h264",
       ":webrtc_vp8",
       ":webrtc_vp9",
+      "../..:webrtc_common",
       "../../api:optional",
       "../../api:video_frame_api",
       "../../common_video:common_video",
+      "../../media:rtc_audio_video",
       "../../rtc_base:rtc_base_approved",
+      "../../system_wrappers:system_wrappers",

[mbonadei, 2017/09/07 07:57:25]

This should be "../../system_wrappers" since it will implicitly pick
"../../system_wrappers:system_wrappers" (the same for
"../../common_video:common_video", it should be "../../common_video").

[brandtr, 2017/09/07 13:56:13]

Done.

       "../../test:field_trial",
       "../../test:test_support",
       "../../test:video_test_common",
+      "../../test:video_test_support",
       "../video_capture",
     ]
 
-    if (is_ios || is_mac) {
-      deps += [ ":codec_test_objc" ]
-    }
-
-    if (rtc_use_h264) {
-      defines = [ "WEBRTC_USE_H264" ]
-    }
+    data = video_coding_modules_tests_resources
 
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
-  }
-
-  plot_videoprocessor_integrationtest_resources = [
-    "../../../resources/foreman_128x96.yuv",
-    "../../../resources/foreman_160x120.yuv",
-    "../../../resources/foreman_176x144.yuv",
-    "../../../resources/foreman_320x240.yuv",
-    "../../../resources/foreman_cif.yuv",
-  ]
-
-  if (is_ios || is_mac) {
-    bundle_data("plot_videoprocessor_integrationtest_bundle_data") {
-      testonly = true
-      sources = plot_videoprocessor_integrationtest_resources
-      outputs = [
-        "{{bundle_resources_dir}}/{{source_file_part}}",
+    if (is_android) {
+      sources += [
+        "codecs/test/android_test_initializer.cc",
+        "codecs/test/android_test_initializer.h",
+        "codecs/test/videoprocessor_integrationtest_mediacodec.cc",
       ]
-    }
-  }
-
-  # This executable is meant for local codec perf testing and should not be run
-  # on the trybots/buildbots, hence the existence of this special build target.
-  rtc_test("plot_videoprocessor_integrationtest") {
-    testonly = true
-
-    sources = [
-      "codecs/test/plot_videoprocessor_integrationtest.cc",
-    ]
-
-    deps = [
-      ":video_coding_videoprocessor_integration_test",
-      "../../test:test_main",
-      "../../test:video_test_common",
-      "../video_capture",
-    ]
 
-    data = plot_videoprocessor_integrationtest_resources
-
-    if (is_android) {
       deps += [
-        "../../rtc_base:rtc_base_approved",
-
-        # TODO(brandtr): Figure out if the java dep below could be moved into
-        # :video_coding_videoprocessor_integration_test, where it belongs.
-        # When that is done, support for Android HW codecs can be added to the
-        # modules_tests target as well.
-        "../../sdk/android:libjingle_peerconnection_java",
         "../../sdk/android:libjingle_peerconnection_jni",
         "//base",
-        "//testing/android/native_test:native_test_support",
       ]
-
-      shard_timeout = 900
     }
 
     if (is_ios || is_mac) {
       deps += [
         ":codec_test_objc",
-        ":plot_videoprocessor_integrationtest_bundle_data",
+        ":video_coding_modules_tests_resources_bundle_data",
+        "../../media:rtc_media_base",
+        "../../sdk:videotoolbox_objc",
       ]
     }
 
-    # TODO(brandtr): Remove this define when the modules_tests target properly
-    # loads the Java classes mentioned above.
-    defines = [ "WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED" ]
+    if (rtc_use_h264) {
+      defines = [ "WEBRTC_USE_H264" ]
+    }
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).