diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index 15b015801f..966c586369 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -368,9 +368,6 @@ class RTC_EXPORT RTCRtpStreamStats : public RTCStats { RTCStatsMember transport_id; RTCStatsMember codec_id; - // Obsolete - RTCStatsMember media_type; // renamed to kind. - protected: RTCRtpStreamStats(std::string id, Timestamp timestamp); }; diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index e09b495f74..4cb196b4f9 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -463,7 +463,6 @@ std::unique_ptr CreateInboundAudioStreamStats( inbound_audio.get()); inbound_audio->transport_id = transport_id; inbound_audio->mid = mid; - inbound_audio->media_type = "audio"; inbound_audio->kind = "audio"; if (voice_receiver_info.codec_payload_type.has_value()) { auto codec_param_it = voice_media_info.receive_codecs.find( @@ -609,7 +608,6 @@ CreateInboundRTPStreamStatsFromVideoReceiverInfo( inbound_video.get()); inbound_video->transport_id = transport_id; inbound_video->mid = mid; - inbound_video->media_type = "video"; inbound_video->kind = "video"; if (video_receiver_info.codec_payload_type.has_value()) { auto codec_param_it = video_media_info.receive_codecs.find( @@ -737,7 +735,6 @@ CreateOutboundRTPStreamStatsFromVoiceSenderInfo( outbound_audio.get()); outbound_audio->transport_id = transport_id; outbound_audio->mid = mid; - outbound_audio->media_type = "audio"; outbound_audio->kind = "audio"; if (voice_sender_info.target_bitrate.has_value() && *voice_sender_info.target_bitrate > 0) { @@ -774,7 +771,6 @@ CreateOutboundRTPStreamStatsFromVideoSenderInfo( outbound_video.get()); outbound_video->transport_id = transport_id; outbound_video->mid = mid; - outbound_video->media_type = "video"; outbound_video->kind = "video"; if (video_sender_info.codec_payload_type.has_value()) { auto codec_param_it = video_media_info.send_codecs.find( diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc index 2358e3bae3..fff0ed8cda 100644 --- a/pc/rtc_stats_collector_unittest.cc +++ b/pc/rtc_stats_collector_unittest.cc @@ -2530,7 +2530,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRtpStreamStats_Audio) { RTCInboundRtpStreamStats expected_audio("ITTransportName1A1", report->timestamp()); expected_audio.ssrc = 1; - expected_audio.media_type = "audio"; expected_audio.kind = "audio"; expected_audio.track_identifier = "RemoteAudioTrackID"; expected_audio.mid = "AudioMid"; @@ -2701,7 +2700,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRtpStreamStats_Video) { RTCInboundRtpStreamStats expected_video("ITTransportName1V1", report->timestamp()); expected_video.ssrc = 1; - expected_video.media_type = "video"; expected_video.kind = "video"; expected_video.track_identifier = "RemoteVideoTrackID"; expected_video.mid = "VideoMid"; @@ -2877,7 +2875,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRtpStreamStats_Audio) { // `expected_audio.remote_id` should be undefined. expected_audio.mid = "AudioMid"; expected_audio.ssrc = 1; - expected_audio.media_type = "audio"; expected_audio.kind = "audio"; expected_audio.track_id = IdForType(report.get()); @@ -2973,7 +2970,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRtpStreamStats_Video) { // `expected_video.remote_id` should be undefined. expected_video.mid = "VideoMid"; expected_video.ssrc = 1; - expected_video.media_type = "video"; expected_video.kind = "video"; expected_video.track_id = stats_of_track_type[0]->id(); expected_video.transport_id = "TTransportName1"; @@ -3319,7 +3315,6 @@ TEST_F(RTCStatsCollectorTest, CollectNoStreamRTCOutboundRtpStreamStats_Audio) { expected_audio.media_source_id = "SA50"; expected_audio.mid = "AudioMid"; expected_audio.ssrc = 1; - expected_audio.media_type = "audio"; expected_audio.kind = "audio"; expected_audio.track_id = IdForType(report.get()); diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc index 3f6704293a..82b6a746bf 100644 --- a/pc/rtc_stats_integrationtest.cc +++ b/pc/rtc_stats_integrationtest.cc @@ -723,11 +723,9 @@ class RTCStatsReportVerifier { // hierarcy. if (stream.type() == RTCInboundRtpStreamStats::kType || stream.type() == RTCOutboundRtpStreamStats::kType) { - verifier.TestMemberIsDefined(stream.media_type); verifier.TestMemberIsIDReference( stream.track_id, DEPRECATED_RTCMediaStreamTrackStats::kType); } else { - verifier.TestMemberIsUndefined(stream.media_type); verifier.TestMemberIsUndefined(stream.track_id); } verifier.TestMemberIsIDReference(stream.transport_id, diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 5aef7f985a..52aaf92256 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -401,8 +401,7 @@ WEBRTC_RTCSTATS_IMPL(RTCRtpStreamStats, RTCStats, "rtp", &kind, &track_id, &transport_id, - &codec_id, - &media_type) + &codec_id) // clang-format on RTCRtpStreamStats::RTCRtpStreamStats(std::string id, Timestamp timestamp) @@ -411,8 +410,7 @@ RTCRtpStreamStats::RTCRtpStreamStats(std::string id, Timestamp timestamp) kind("kind"), track_id("trackId"), transport_id("transportId"), - codec_id("codecId"), - media_type("mediaType") {} + codec_id("codecId") {} RTCRtpStreamStats::RTCRtpStreamStats(const RTCRtpStreamStats& other) = default;