Revert "Compile frame_analyzer instead of using a prebuilt version."

This reverts commit abac56b866efbfbdfef50e7a892e8c1c91ad5fbc.

Reason for revert: Breaks perf tests.

Original change's description:
> Compile frame_analyzer instead of using a prebuilt version.
> 
> 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}

TBR=phoglund@webrtc.org,mbonadei@webrtc.org,magjed@webrtc.org,oprypin@webrtc.org,kthelgason@webrtc.org

Change-Id: Ic0aab0a7aea18efbe802b9fca51a2b95533237c3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9665
Reviewed-on: https://webrtc-review.googlesource.com/100105
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24721}
This commit is contained in:
Mirko Bonadei
2018-09-13 10:29:13 +00:00
committed by Commit Bot
parent 8c1bf9595a
commit dc899dce9e
4 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View File

@ -55,6 +55,7 @@
/tools_webrtc/audio_quality/win/*.exe
/tools_webrtc/audio_quality/win/*.dll
/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/mac/ffmpeg
/tools_webrtc/video_quality_toolchain/mac/zxing

View File

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

View File

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

View File

@ -0,0 +1 @@
fe3e1e5253a1a49277e3ec9c0699ccf059cd8601