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

Reland: Add in missing protobuf code.

Browse Source 
Turns out the import of histogram_pb2 failed not on the stub itself
(which I thought for a long, long time), but because of the protobuf
support code it includes in turn. This is a drawback of catching
the ImportError in histogram_proto.py.

This has a decent chance of fixing the problem.

Tbr: mbonadei@webrtc.org
Bug: chromium:1029452
Change-Id: If7ae2439b01ad1b3129d8cc8b158385101082e6f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171867
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30917}
This commit is contained in:
Patrik Höglund
2020-03-27 09:11:30 +01:00
committed by Commit Bot
parent ef60c2b0ad
commit e4ae1ced9d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/BUILD.gn
View File

@ -215,16 +215,18 @@ if (rtc_include_tests) {
group("low_bandwidth_audio_perf_test") {
testonly = true
deps = [ ":low_bandwidth_audio_test" ]
deps = [
":low_bandwidth_audio_test",
"//third_party/catapult/tracing/tracing/proto:histogram_proto",
"//third_party/protobuf:py_proto_runtime",
]
data = [
"test/low_bandwidth_audio_test.py",
"../resources/voice_engine/audio_tiny16.wav",
"../resources/voice_engine/audio_tiny48.wav",
"${root_out_dir}/pyproto/tracing/tracing/proto/histogram_pb2.py",
]
deps += [ "//third_party/catapult/tracing/tracing/proto:histogram_proto" ]
data +=
[ "${root_out_dir}/pyproto/tracing/tracing/proto/histogram_pb2.py" ]
# TODO(http://crbug.com/1029452): Create a cleaner target with just the
# tracing python code. We don't need Polymer for instance.

7
audio/test/low_bandwidth_audio_test.py
View File

@ -234,8 +234,10 @@ def _ConfigurePythonPath(args):
sys.path.insert(0, histogram_proto_path)
# Fail early in case the proto hasn't been built.
from tracing.proto import histogram_proto
if not histogram_proto.HAS_PROTO:
try:
import histogram_pb2
except ImportError as e:
logging.exception(e)
raise ImportError('Could not find histogram_pb2. You need to build the '
'low_bandwidth_audio_perf_test target before invoking '
'this script. Expected to find '
@ -245,6 +247,7 @@ def _ConfigurePythonPath(args):
def main():
# pylint: disable=W0101
logging.basicConfig(level=logging.INFO)
logging.info('Invoked with %s', str(sys.argv))
args = _ParseArgs()