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

Revert "Complete migration from "track" to "inbound-rtp" stats"

Browse Source 
This reverts commit 94fe0d3de5e8162d1a105fd1a3ec4bd2da97f43b.

Reason for revert:
Causes an assert in this line during a call:
https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/sdk/objc/api/peerconnection/RTCStatisticsReport.mm;drc=87a6e5ab4d8f0baf4e2a9b7752b43d825f9c0ce1;l=122?originalUrl=https:%2F%2Fcs.chromium.org%2F

where frameWidth appears more than once

Original change's description:
> Complete migration from "track" to "inbound-rtp" stats
> 
> Bug: webrtc:11683
> Change-Id: I4c4a4fa0a7d6a20976922aca41d57540aa27fd1d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178611
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Eldar Rello <elrello@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#31683}

TBR=hbos@webrtc.org,hta@webrtc.org,elrello@microsoft.com

Change-Id: I0ded36a40c8808dac5a777ed41815e52ab9a2573
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11683
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179020
Reviewed-by: Zeke Chin <tkchin@webrtc.org>
Commit-Queue: Zeke Chin <tkchin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31692}
This commit is contained in:
Zeke Chin
2020-07-10 00:05:49 +00:00
committed by Commit Bot
parent 3a034e15b4
commit e6f3897945
5 changed files with 3 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pc/rtc_stats_integrationtest.cc
View File

@ -818,62 +818,13 @@ class RTCStatsReportVerifier {
// this test. See RFC 3550.
verifier.TestMemberIsNonNegative<int32_t>(inbound_stream.packets_lost);
verifier.TestMemberIsDefined(inbound_stream.last_packet_received_timestamp);
if (inbound_stream.frames_received.ValueOrDefault(0) > 0) {
verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.frame_width);
verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.frame_height);
} else {
verifier.TestMemberIsUndefined(inbound_stream.frame_width);
verifier.TestMemberIsUndefined(inbound_stream.frame_height);
}
if (inbound_stream.frames_per_second.is_defined()) {
verifier.TestMemberIsNonNegative<double>(
inbound_stream.frames_per_second);
} else {
verifier.TestMemberIsUndefined(inbound_stream.frames_per_second);
}
verifier.TestMemberIsUndefined(inbound_stream.frame_bit_depth);
if (inbound_stream.media_type.is_defined() &&
*inbound_stream.media_type == "video") {
verifier.TestMemberIsUndefined(inbound_stream.jitter);
verifier.TestMemberIsUndefined(inbound_stream.jitter_buffer_delay);
verifier.TestMemberIsUndefined(
inbound_stream.jitter_buffer_emitted_count);
verifier.TestMemberIsUndefined(inbound_stream.total_samples_received);
verifier.TestMemberIsUndefined(inbound_stream.concealed_samples);
verifier.TestMemberIsUndefined(inbound_stream.silent_concealed_samples);
verifier.TestMemberIsUndefined(inbound_stream.concealment_events);
verifier.TestMemberIsUndefined(
inbound_stream.inserted_samples_for_deceleration);
verifier.TestMemberIsUndefined(
inbound_stream.removed_samples_for_acceleration);
verifier.TestMemberIsUndefined(inbound_stream.audio_level);
verifier.TestMemberIsUndefined(inbound_stream.total_audio_energy);
verifier.TestMemberIsUndefined(inbound_stream.total_samples_duration);
verifier.TestMemberIsNonNegative<int32_t>(inbound_stream.frames_received);
} else {
verifier.TestMemberIsNonNegative<double>(inbound_stream.jitter);
verifier.TestMemberIsNonNegative<double>(
inbound_stream.jitter_buffer_delay);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.jitter_buffer_emitted_count);
verifier.TestMemberIsPositive<uint64_t>(
inbound_stream.total_samples_received);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.concealed_samples);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.silent_concealed_samples);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.concealment_events);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.inserted_samples_for_deceleration);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.removed_samples_for_acceleration);
verifier.TestMemberIsPositive<double>(inbound_stream.audio_level);
verifier.TestMemberIsPositive<double>(inbound_stream.total_audio_energy);
verifier.TestMemberIsPositive<double>(
inbound_stream.total_samples_duration);
verifier.TestMemberIsUndefined(inbound_stream.frames_received);
}
verifier.TestMemberIsUndefined(inbound_stream.round_trip_time);
verifier.TestMemberIsUndefined(inbound_stream.packets_discarded);
verifier.TestMemberIsUndefined(inbound_stream.packets_repaired);
@ -892,7 +843,6 @@ class RTCStatsReportVerifier {
*inbound_stream.media_type == "video") {
verifier.TestMemberIsDefined(inbound_stream.frames_decoded);
verifier.TestMemberIsDefined(inbound_stream.key_frames_decoded);
verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.frames_dropped);
verifier.TestMemberIsNonNegative<double>(
inbound_stream.total_decode_time);
verifier.TestMemberIsNonNegative<double>(
@ -905,7 +855,6 @@ class RTCStatsReportVerifier {
} else {
verifier.TestMemberIsUndefined(inbound_stream.frames_decoded);
verifier.TestMemberIsUndefined(inbound_stream.key_frames_decoded);
verifier.TestMemberIsUndefined(inbound_stream.frames_dropped);
verifier.TestMemberIsUndefined(inbound_stream.total_decode_time);
verifier.TestMemberIsUndefined(inbound_stream.total_inter_frame_delay);
verifier.TestMemberIsUndefined(