Chromium Code Reviews| Index: webrtc/modules/video_coding/BUILD.gn |
| diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn |
| index a3ad4b37c711eb597e06c4633f73bb6a9d026366..9db0d6cb4818ac902eeca20d188d894aa0c8d5e4 100644 |
| --- a/webrtc/modules/video_coding/BUILD.gn |
| +++ b/webrtc/modules/video_coding/BUILD.gn |
| @@ -341,13 +341,13 @@ if (rtc_include_tests) { |
| ] |
| } |
| - rtc_source_set("video_coding_modules_tests") { |
| + rtc_source_set("video_coding_videoprocessor_integration_test") { |
| testonly = true |
| + |
| sources = [ |
| - "codecs/test/videoprocessor_integrationtest.cc", |
| "codecs/test/videoprocessor_integrationtest.h", |
| - "codecs/vp8/test/vp8_impl_unittest.cc", |
| ] |
| + |
| deps = [ |
| ":video_codecs_test_framework", |
| ":video_coding", |
| @@ -355,18 +355,117 @@ if (rtc_include_tests) { |
| ":webrtc_vp8", |
| ":webrtc_vp9", |
| "../..:webrtc_common", |
| + "../../media:rtc_media", |
| + "../../test:test_support", |
| + "../../test:video_test_support", |
| + ] |
| + |
| + if (is_android) { |
| + sources += [ |
| + "codecs/test/android_test_initializer.cc", |
| + "codecs/test/android_test_initializer.h", |
| + ] |
| + |
| + deps += [ |
| + "../../base:rtc_base_approved", |
| + "../../sdk/android:libjingle_peerconnection_jni", |
| + "//base", |
| + ] |
| + } |
| + |
| + if (is_ios) { |
| + deps += [ |
| + "../../media:rtc_media_base", |
| + "../../sdk:webrtc_h264_video_toolbox", |
| + ] |
| + } |
| + } |
| + |
| + rtc_source_set("video_coding_modules_tests") { |
| + testonly = true |
| + |
| + sources = [ |
| + "codecs/test/videoprocessor_integrationtest.cc", |
| + "codecs/vp8/test/vp8_impl_unittest.cc", |
| + ] |
| + |
| + deps = [ |
| + ":video_coding_videoprocessor_integration_test", |
| + ":webrtc_vp8", |
| "../../api:video_frame_api", |
| "../../base:rtc_base_approved", |
| "../../common_video:common_video", |
| - "../../media:rtc_media_base", |
| "../../test:test_support", |
| "../../test:video_test_common", |
| - "../../test:video_test_support", |
| "../video_capture", |
| ] |
| + |
| if (rtc_use_h264) { |
| defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ] |
| } |
| + |
| + 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", |
|
brandtr
2017/02/13 12:40:26
These need to be uploaded to Gstorage.
|
| + "//resources/foreman_160x120.yuv", |
| + "//resources/foreman_176x144.yuv", |
|
kjellander_webrtc
2017/02/13 14:31:07
We already have //resources/paris_qcif.yuv or do w
brandtr
2017/02/13 16:23:02
Will reuse existing one.
kjellander_webrtc
2017/02/14 11:00:14
Were you going to reuse paris_qcif.yuv? It seems y
brandtr
2017/02/14 14:22:37
Oops, I must have confused this comment with the n
|
| + "//resources/foreman_320x240.yuv", |
| + "//resources/foreman_352x288.yuv", |
|
kjellander_webrtc
2017/02/13 14:31:08
352×288 is the size of cif, so this file should be
brandtr
2017/02/13 16:23:02
Thanks for catching this. The same file should be
|
| + "//resources/foreman_cif.yuv", |
| + ] |
| + |
| + if (is_ios) { |
| + bundle_data("plot_videoprocessor_integrationtest_bundle_data") { |
| + testonly = true |
| + sources = plot_videoprocessor_integrationtest_resources |
| + outputs = [ |
| + "{{bundle_resources_dir}}/{{source_file_part}}", |
| + ] |
| + } |
| + } |
| + |
| + # This executable is meant for local codec perf testing and should not be run |
|
kjellander_webrtc
2017/02/13 14:31:07
Interesting. Is the perf testing that is performed
brandtr
2017/02/13 16:23:02
Yes. The idea is that the existing perf tests in v
kjellander_webrtc
2017/02/14 11:00:14
Acknowledged. Thanks for explaining.
|
| + # 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 += [ |
| + "../../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. |
| + "../../sdk/android:libjingle_peerconnection_java", |
|
brandtr
2017/02/13 12:40:26
When I put this dependency in :video_coding_videop
kjellander_webrtc
2017/02/13 14:31:08
Mirko: You can probably explain this better than m
mbonadei
2017/02/13 21:19:10
Unfortunately I came across a similar problem some
brandtr
2017/02/14 08:35:26
Your theory is compatible with my experience: addi
|
| + "../../sdk/android:libjingle_peerconnection_jni", |
| + "//base", |
| + "//testing/android/native_test:native_test_support", |
| + ] |
| + |
| + shard_timeout = 900 |
| + } |
| + |
| + if (is_ios) { |
| + deps += [ ":plot_videoprocessor_integrationtest_bundle_data" ] |
| + } |
| + |
| 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" ] |