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

Revert "Fix collection of audio metrics from PC test framework for audio test"

Browse Source 
This reverts commit 2d0880b56954f57548deea51dfa678b80dbf618f.

Reason for revert: Breaks perf tests (e.g. https://ci.chromium.org/p/webrtc/builders/perf/Perf%20Android32%20(L%20Nexus4)/1470).

Original change's description:
> Fix collection of audio metrics from PC test framework for audio test
> 
> Bug: webrtc:10138
> Change-Id: I18a8509a0cdc4ed1db6894c7540d5c0a155d6233
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144784
> Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
> Commit-Queue: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28514}

TBR=oprypin@webrtc.org,ossu@webrtc.org,titovartem@webrtc.org

Change-Id: Id45abfbb0de47d95fe6cb396b1c29efb97a43797
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10138
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144883
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28519}
This commit is contained in:
Mirko Bonadei
2019-07-09 20:08:55 +00:00
committed by Commit Bot
parent 49fa4ea0e7
commit 4876cb21c8
5 changed files with 39 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
audio/test/low_bandwidth_audio_test.py
View File

@ -23,7 +23,6 @@ import re
import shutil
import subprocess
import sys
import tempfile
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@ -207,20 +206,7 @@ def _AddChart(charts, metric, test_name, value, units):
}
def _AddRunPerfResults(charts, run_perf_results_file):
with open(run_perf_results_file, 'rb') as f:
per_run_perf_results = json.load(f)
if 'charts' not in per_run_perf_results:
return
for metric, cases in per_run_perf_results['charts'].items():
chart = charts.setdefault(metric, {})
for case_name, case_value in cases.items():
if case_name in chart:
logging.error('Overriding results for %s/%s', metric, case_name)
chart[case_name] = case_value
Analyzer = collections.namedtuple('Analyzer', ['name', 'func', 'executable',
Analyzer = collections.namedtuple('Analyzer', ['func', 'executable',
'sample_rate_hz'])
@ -242,55 +228,47 @@ def main():
else:
test_command = [os.path.join(args.build_dir, 'low_bandwidth_audio_test')]
analyzers = [Analyzer('pesq', _RunPesq, pesq_path, 16000)]
analyzers = [Analyzer(_RunPesq, pesq_path, 16000)]
# Check if POLQA can run at all, or skip the 48 kHz tests entirely.
example_path = os.path.join(SRC_DIR, 'resources',
'voice_engine', 'audio_tiny48.wav')
if polqa_path and _RunPolqa(polqa_path, example_path, example_path):
analyzers.append(Analyzer('polqa', _RunPolqa, polqa_path, 48000))
analyzers.append(Analyzer(_RunPolqa, polqa_path, 48000))
charts = {}
for analyzer in analyzers:
f, cur_perf_results = tempfile.mkstemp(prefix='audio_perf', suffix=".json")
# Start the test executable that produces audio files.
test_process = subprocess.Popen(
_LogCommand(test_command + ['--sample_rate_hz=%d' %
analyzer.sample_rate_hz]),
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
try:
# Start the test executable that produces audio files.
test_process = subprocess.Popen(
_LogCommand(test_command + [
'--sample_rate_hz=%d' % analyzer.sample_rate_hz,
'--test_case_prefix=%s' % analyzer.name,
'--isolated_script_test_perf_output=%s' % cur_perf_results,
]),
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
try:
lines = iter(test_process.stdout.readline, '')
for result in ExtractTestRuns(lines, echo=True):
(android_device, test_name, reference_file, degraded_file) = result
lines = iter(test_process.stdout.readline, '')
for result in ExtractTestRuns(lines, echo=True):
(android_device, test_name, reference_file, degraded_file) = result
adb_prefix = (args.adb_path,)
if android_device:
adb_prefix += ('-s', android_device)
adb_prefix = (args.adb_path,)
if android_device:
adb_prefix += ('-s', android_device)
reference_file = _GetFile(reference_file, out_dir,
android=args.android, adb_prefix=adb_prefix)
degraded_file = _GetFile(degraded_file, out_dir, move=True,
android=args.android, adb_prefix=adb_prefix)
reference_file = _GetFile(reference_file, out_dir,
android=args.android, adb_prefix=adb_prefix)
degraded_file = _GetFile(degraded_file, out_dir, move=True,
android=args.android, adb_prefix=adb_prefix)
analyzer_results = analyzer.func(analyzer.executable,
reference_file, degraded_file)
for metric, (value, units) in analyzer_results.items():
# Output a result for the perf dashboard.
print 'RESULT %s: %s= %s %s' % (metric, test_name, value, units)
_AddChart(charts, metric, test_name, value, units)
analyzer_results = analyzer.func(analyzer.executable,
reference_file, degraded_file)
for metric, (value, units) in analyzer_results.items():
# Output a result for the perf dashboard.
print 'RESULT %s: %s= %s %s' % (metric, test_name, value, units)
_AddChart(charts, metric, test_name, value, units)
if args.remove:
os.remove(reference_file)
os.remove(degraded_file)
finally:
test_process.terminate()
_AddRunPerfResults(charts, cur_perf_results)
if args.remove:
os.remove(reference_file)
os.remove(degraded_file)
finally:
os.remove(cur_perf_results)
test_process.terminate()
if args.isolated_script_test_perf_output:
with open(args.isolated_script_test_perf_output, 'w') as f: