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

test: fix usage of legacy media_type

Browse Source 
since the check is done for the more modern "kind" attribute

BUG=None

Change-Id: I520b62f312348b006d8147ce7b2b483c78657b98
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266141
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37258}
This commit is contained in:
Philipp Hancke
2022-06-17 11:20:39 +02:00
committed by WebRTC LUCI CQ
parent 93f9db7e8a
commit a116da5d03
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pc/rtc_stats_integrationtest.cc
View File

@ -794,15 +794,14 @@ class RTCStatsReportVerifier {
bool VerifyRTCInboundRTPStreamStats(
const RTCInboundRTPStreamStats& inbound_stream) {
RTCStatsVerifier verifier(report_.get(), &inbound_stream);
VerifyRTCReceivedRtpStreamStats(inbound_stream, verifier,
inbound_stream.kind.is_defined() &&
*inbound_stream.media_type == "audio");
VerifyRTCReceivedRtpStreamStats(
inbound_stream, verifier,
inbound_stream.kind.is_defined() && *inbound_stream.kind == "audio");
verifier.TestMemberIsOptionalIDReference(
inbound_stream.remote_id, RTCRemoteOutboundRtpStreamStats::kType);
verifier.TestMemberIsDefined(inbound_stream.mid);
verifier.TestMemberIsDefined(inbound_stream.track_identifier);
if (inbound_stream.kind.is_defined() &&
*inbound_stream.media_type == "video") {
if (inbound_stream.kind.is_defined() && *inbound_stream.kind == "video") {
verifier.TestMemberIsNonNegative<uint64_t>(inbound_stream.qp_sum);
verifier.TestMemberIsDefined(inbound_stream.decoder_implementation);
} else {
@ -810,8 +809,7 @@ class RTCStatsReportVerifier {
verifier.TestMemberIsUndefined(inbound_stream.decoder_implementation);
}
verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.packets_received);
if (inbound_stream.kind.is_defined() &&
*inbound_stream.media_type == "audio") {
if (inbound_stream.kind.is_defined() && *inbound_stream.kind == "audio") {
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.fec_packets_received);
verifier.TestMemberIsNonNegative<uint64_t>(
@ -841,8 +839,7 @@ class RTCStatsReportVerifier {
inbound_stream.jitter_buffer_delay);
verifier.TestMemberIsNonNegative<uint64_t>(
inbound_stream.jitter_buffer_emitted_count);
if (inbound_stream.kind.is_defined() &&
*inbound_stream.media_type == "video") {
if (inbound_stream.kind.is_defined() && *inbound_stream.kind == "video") {
verifier.TestMemberIsUndefined(inbound_stream.total_samples_received);
verifier.TestMemberIsUndefined(inbound_stream.concealed_samples);
verifier.TestMemberIsUndefined(inbound_stream.silent_concealed_samples);
@ -883,8 +880,7 @@ class RTCStatsReportVerifier {
// Test runtime too short to get an estimate (at least two RTCP sender
// reports need to be received).
verifier.MarkMemberTested(inbound_stream.estimated_playout_timestamp, true);
if (inbound_stream.kind.is_defined() &&
*inbound_stream.media_type == "video") {
if (inbound_stream.kind.is_defined() && *inbound_stream.kind == "video") {
verifier.TestMemberIsDefined(inbound_stream.frames_decoded);
verifier.TestMemberIsDefined(inbound_stream.key_frames_decoded);
verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.frames_dropped);
@ -928,8 +924,7 @@ class RTCStatsReportVerifier {
RTCStatsVerifier verifier(report_.get(), &outbound_stream);
VerifyRTCRTPStreamStats(outbound_stream, verifier);
verifier.TestMemberIsDefined(outbound_stream.mid);
if (outbound_stream.kind.is_defined() &&
*outbound_stream.media_type == "video") {
if (outbound_stream.kind.is_defined() && *outbound_stream.kind == "video") {
verifier.TestMemberIsIDReference(outbound_stream.media_source_id,
RTCVideoSourceStats::kType);
verifier.TestMemberIsNonNegative<uint32_t>(outbound_stream.fir_count);
@ -957,8 +952,7 @@ class RTCStatsReportVerifier {
outbound_stream.header_bytes_sent);
verifier.TestMemberIsNonNegative<uint64_t>(
outbound_stream.retransmitted_bytes_sent);
if (outbound_stream.kind.is_defined() &&
*outbound_stream.media_type == "video") {
if (outbound_stream.kind.is_defined() && *outbound_stream.kind == "video") {
verifier.TestMemberIsDefined(outbound_stream.frames_encoded);
verifier.TestMemberIsDefined(outbound_stream.key_frames_encoded);
verifier.TestMemberIsNonNegative<double>(