zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile frame_analyzer instead of using a prebuilt version.

Browse Source 
Bug: webrtc:9665
Change-Id: I589128d3f18a68a42094dacd910cd614a075a460
Reviewed-on: https://webrtc-review.googlesource.com/99823
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24717}
This commit is contained in:
Mirko Bonadei
2018-09-12 13:42:32 +02:00
committed by Commit Bot
parent f141470d38
commit abac56b866
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -55,7 +55,6 @@
/tools_webrtc/audio_quality/win/*.exe /tools_webrtc/audio_quality/win/*.exe
/tools_webrtc/audio_quality/win/*.dll /tools_webrtc/audio_quality/win/*.dll
/tools_webrtc/video_quality_toolchain/linux/ffmpeg /tools_webrtc/video_quality_toolchain/linux/ffmpeg
/tools_webrtc/video_quality_toolchain/linux/frame_analyzer
/tools_webrtc/video_quality_toolchain/linux/zxing /tools_webrtc/video_quality_toolchain/linux/zxing
/tools_webrtc/video_quality_toolchain/mac/ffmpeg /tools_webrtc/video_quality_toolchain/mac/ffmpeg
/tools_webrtc/video_quality_toolchain/mac/zxing /tools_webrtc/video_quality_toolchain/mac/zxing

3
examples/BUILD.gn
View File

@ -164,6 +164,7 @@ if (is_android) {
deps = [ deps = [
":AppRTCMobile_javalib", ":AppRTCMobile_javalib",
"../rtc_tools:frame_analyzer",
"../sdk/android:libjingle_peerconnection_java", "../sdk/android:libjingle_peerconnection_java",
"//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java", "//third_party/android_support_test_runner:runner_java",
@ -184,8 +185,8 @@ if (is_android) {
"../rtc_tools/testing/build_apprtc.py", "../rtc_tools/testing/build_apprtc.py",
"../rtc_tools/testing/utils.py", "../rtc_tools/testing/utils.py",
"../tools_webrtc/video_quality_toolchain/linux/ffmpeg", "../tools_webrtc/video_quality_toolchain/linux/ffmpeg",
"../tools_webrtc/video_quality_toolchain/linux/frame_analyzer",
"../tools_webrtc/video_quality_toolchain/linux/zxing", "../tools_webrtc/video_quality_toolchain/linux/zxing",
"${root_out_dir}/frame_analyzer",
] ]
} }
} }

3
examples/androidtests/video_quality_loopback_test.py
View File

@ -192,7 +192,7 @@ def RunTest(android_device, adb_path, build_dir, temp_dir, num_retries,
# Run comparison script. # Run comparison script.
compare_script = os.path.join(SRC_DIR, 'rtc_tools', 'compare_videos.py') compare_script = os.path.join(SRC_DIR, 'rtc_tools', 'compare_videos.py')
frame_analyzer = os.path.join(TOOLCHAIN_DIR, 'frame_analyzer') frame_analyzer = os.path.join(build_dir, 'frame_analyzer')
zxing_path = os.path.join(TOOLCHAIN_DIR, 'zxing') zxing_path = os.path.join(TOOLCHAIN_DIR, 'zxing')
stats_file_ref = os.path.join(temp_dir, 'stats_ref.txt') stats_file_ref = os.path.join(temp_dir, 'stats_ref.txt')
stats_file_test = os.path.join(temp_dir, 'stats_test.txt') stats_file_test = os.path.join(temp_dir, 'stats_test.txt')
@ -241,4 +241,3 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())

1
tools_webrtc/video_quality_toolchain/linux/frame_analyzer.sha1
View File

@ -1 +0,0 @@
fe3e1e5253a1a49277e3ec9c0699ccf059cd8601