diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index c093342c3f..8de813ae0e 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -196,7 +196,6 @@ webrtc::AudioReceiveStream::Stats AudioReceiveStream::GetStats() const { call_stats.last_packet_received_timestamp_ms; stats.codec_name = receive_codec->second.name; stats.codec_payload_type = receive_codec->first; - stats.ext_seqnum = call_stats.extendedMax; int clockrate_khz = receive_codec->second.clockrate_hz / 1000; if (clockrate_khz > 0) { stats.jitter_ms = call_stats.jitterSamples / clockrate_khz; diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index 7e1da6deda..d6c6afe022 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -63,7 +63,7 @@ const unsigned int kSpeechOutputLevel = 99; const double kTotalOutputEnergy = 0.25; const double kTotalOutputDuration = 0.5; -const CallReceiveStatistics kCallStats = {678, 901, 234, -12, 567, 890, 123}; +const CallReceiveStatistics kCallStats = {678, 234, -12, 567, 890, 123}; const std::pair kReceiveCodec = { 123, {"codec_name_recv", 96000, 0}}; @@ -271,7 +271,6 @@ TEST(AudioReceiveStreamTest, GetStats) { stats.packets_rcvd); EXPECT_EQ(kCallStats.cumulativeLost, stats.packets_lost); EXPECT_EQ(kReceiveCodec.second.name, stats.codec_name); - EXPECT_EQ(kCallStats.extendedMax, stats.ext_seqnum); EXPECT_EQ( kCallStats.jitterSamples / (kReceiveCodec.second.clockrate_hz / 1000), stats.jitter_ms); diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index 9daefe58b5..8933f2f567 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -444,7 +444,6 @@ webrtc::AudioSendStream::Stats AudioSendStream::GetStats( if (block.source_SSRC == stats.local_ssrc) { stats.packets_lost = block.cumulative_num_packets_lost; stats.fraction_lost = Q8ToFloat(block.fraction_lost); - stats.ext_seqnum = block.extended_highest_sequence_number; // Convert timestamps to milliseconds. if (spec.format.clockrate_hz / 1000 > 0) { stats.jitter_ms = diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index 9f0504c709..31fd7ba68a 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -416,8 +416,6 @@ TEST(AudioSendStreamTest, GetStats) { EXPECT_EQ(kReportBlock.cumulative_num_packets_lost, stats.packets_lost); EXPECT_EQ(Q8ToFloat(kReportBlock.fraction_lost), stats.fraction_lost); EXPECT_EQ(kIsacFormat.name, stats.codec_name); - EXPECT_EQ(static_cast(kReportBlock.extended_highest_sequence_number), - stats.ext_seqnum); EXPECT_EQ(static_cast(kReportBlock.interarrival_jitter / (kIsacFormat.clockrate_hz / 1000)), stats.jitter_ms); diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 3b4e9be404..d2d3188093 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -733,7 +733,6 @@ CallReceiveStatistics ChannelReceive::GetRTCPStatistics() const { } stats.cumulativeLost = statistics.packets_lost; - stats.extendedMax = statistics.extended_highest_sequence_number; stats.jitterSamples = statistics.jitter; // --- RTT diff --git a/audio/channel_receive.h b/audio/channel_receive.h index dadeab316d..6d9c246a3b 100644 --- a/audio/channel_receive.h +++ b/audio/channel_receive.h @@ -52,7 +52,6 @@ class RtpRtcp; struct CallReceiveStatistics { unsigned int cumulativeLost; - unsigned int extendedMax; unsigned int jitterSamples; int64_t rttMs; size_t bytesReceived; diff --git a/audio/test/audio_stats_test.cc b/audio/test/audio_stats_test.cc index c45e3c1484..ec55db317d 100644 --- a/audio/test/audio_stats_test.cc +++ b/audio/test/audio_stats_test.cc @@ -100,7 +100,6 @@ class NoLossTest : public AudioEndToEndTest { // Match these stats between caller and receiver. EXPECT_EQ(send_stats.local_ssrc, recv_stats.remote_ssrc); EXPECT_EQ(*send_stats.codec_payload_type, *recv_stats.codec_payload_type); - EXPECT_TRUE(rtc::SafeEq(send_stats.ext_seqnum, recv_stats.ext_seqnum)); } }; } // namespace diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h index b16a05363c..2bb8be1068 100644 --- a/call/audio_receive_stream.h +++ b/call/audio_receive_stream.h @@ -43,7 +43,6 @@ class AudioReceiveStream { uint32_t packets_lost = 0; std::string codec_name; absl::optional codec_payload_type; - uint32_t ext_seqnum = 0; uint32_t jitter_ms = 0; uint32_t jitter_buffer_ms = 0; uint32_t jitter_buffer_preferred_ms = 0; diff --git a/call/audio_send_stream.h b/call/audio_send_stream.h index f479492b9d..1f3d1d07bb 100644 --- a/call/audio_send_stream.h +++ b/call/audio_send_stream.h @@ -53,7 +53,6 @@ class AudioSendStream { float fraction_lost = -1.0f; std::string codec_name; absl::optional codec_payload_type; - int32_t ext_seqnum = -1; int32_t jitter_ms = -1; int64_t rtt_ms = -1; int16_t audio_level = 0; diff --git a/media/base/media_channel.h b/media/base/media_channel.h index 4b2d39357d..6ebb676520 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -466,7 +466,6 @@ struct MediaReceiverInfo { struct VoiceSenderInfo : public MediaSenderInfo { VoiceSenderInfo(); ~VoiceSenderInfo(); - int ext_seqnum = 0; int jitter_ms = 0; // Current audio level, expressed linearly [0,32767]. int audio_level = 0; @@ -482,7 +481,6 @@ struct VoiceSenderInfo : public MediaSenderInfo { struct VoiceReceiverInfo : public MediaReceiverInfo { VoiceReceiverInfo(); ~VoiceReceiverInfo(); - int ext_seqnum = 0; int jitter_ms = 0; int jitter_buffer_ms = 0; int jitter_buffer_preferred_ms = 0; diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc index 72976bf540..5ac32c44ec 100644 --- a/media/engine/webrtc_voice_engine.cc +++ b/media/engine/webrtc_voice_engine.cc @@ -2169,7 +2169,6 @@ bool WebRtcVoiceMediaChannel::GetStats(VoiceMediaInfo* info) { sinfo.fraction_lost = stats.fraction_lost; sinfo.codec_name = stats.codec_name; sinfo.codec_payload_type = stats.codec_payload_type; - sinfo.ext_seqnum = stats.ext_seqnum; sinfo.jitter_ms = stats.jitter_ms; sinfo.rtt_ms = stats.rtt_ms; sinfo.audio_level = stats.audio_level; @@ -2212,7 +2211,6 @@ bool WebRtcVoiceMediaChannel::GetStats(VoiceMediaInfo* info) { rinfo.packets_lost = stats.packets_lost; rinfo.codec_name = stats.codec_name; rinfo.codec_payload_type = stats.codec_payload_type; - rinfo.ext_seqnum = stats.ext_seqnum; rinfo.jitter_ms = stats.jitter_ms; rinfo.jitter_buffer_ms = stats.jitter_buffer_ms; rinfo.jitter_buffer_preferred_ms = stats.jitter_buffer_preferred_ms; diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc index 9556e5f662..909cdaf974 100644 --- a/media/engine/webrtc_voice_engine_unittest.cc +++ b/media/engine/webrtc_voice_engine_unittest.cc @@ -572,7 +572,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::Test { stats.fraction_lost = 34.56f; stats.codec_name = "codec_name_send"; stats.codec_payload_type = 42; - stats.ext_seqnum = 789; stats.jitter_ms = 12; stats.rtt_ms = 345; stats.audio_level = 678; @@ -607,7 +606,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::Test { EXPECT_EQ(info.fraction_lost, stats.fraction_lost); EXPECT_EQ(info.codec_name, stats.codec_name); EXPECT_EQ(info.codec_payload_type, stats.codec_payload_type); - EXPECT_EQ(info.ext_seqnum, stats.ext_seqnum); EXPECT_EQ(info.jitter_ms, stats.jitter_ms); EXPECT_EQ(info.rtt_ms, stats.rtt_ms); EXPECT_EQ(info.audio_level, stats.audio_level); @@ -649,7 +647,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::Test { stats.packets_lost = 101; stats.codec_name = "codec_name_recv"; stats.codec_payload_type = 42; - stats.ext_seqnum = 678; stats.jitter_ms = 901; stats.jitter_buffer_ms = 234; stats.jitter_buffer_preferred_ms = 567; @@ -692,8 +689,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::Test { stats.packets_lost); EXPECT_EQ(info.codec_name, stats.codec_name); EXPECT_EQ(info.codec_payload_type, stats.codec_payload_type); - EXPECT_EQ(rtc::checked_cast(info.ext_seqnum), - stats.ext_seqnum); EXPECT_EQ(rtc::checked_cast(info.jitter_ms), stats.jitter_ms); EXPECT_EQ(rtc::checked_cast(info.jitter_buffer_ms), stats.jitter_buffer_ms); diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc index 7e717f6210..f2abdd0ff0 100644 --- a/pc/stats_collector_unittest.cc +++ b/pc/stats_collector_unittest.cc @@ -535,7 +535,6 @@ void InitVoiceSenderInfo(cricket::VoiceSenderInfo* voice_sender_info, voice_sender_info->fraction_lost = 103; voice_sender_info->jitter_ms = 104; voice_sender_info->packets_lost = 105; - voice_sender_info->ext_seqnum = 106; voice_sender_info->audio_level = 107; voice_sender_info->apm_statistics.echo_return_loss = 108; voice_sender_info->apm_statistics.echo_return_loss_enhancement = 109; @@ -568,7 +567,6 @@ void InitVoiceReceiverInfo(cricket::VoiceReceiverInfo* voice_receiver_info) { voice_receiver_info->bytes_rcvd = 110; voice_receiver_info->packets_rcvd = 111; voice_receiver_info->packets_lost = 114; - voice_receiver_info->ext_seqnum = 115; voice_receiver_info->jitter_ms = 116; voice_receiver_info->jitter_buffer_ms = 117; voice_receiver_info->jitter_buffer_preferred_ms = 118;