From 90ea504f1300572404acd1fb2efe1152765872bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 16 Jan 2018 09:43:15 +0100 Subject: [PATCH] Delete Channel::OnRecoveredPacket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This method was unused. When deleted, also configuration of receive-side RTP header extensions in this class becomes unused. Header extensions are parsed in Call. Bug: None Change-Id: Iad76abf72962f3d91e85dde43541c3b6a9522b7e Reviewed-on: https://webrtc-review.googlesource.com/39782 Reviewed-by: Fredrik Solenberg Reviewed-by: Patrik Höglund Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#21636} --- audio/audio_receive_stream.cc | 26 ------------------ audio/audio_receive_stream.h | 9 ------- audio/audio_receive_stream_unittest.cc | 12 --------- test/mock_voe_channel_proxy.h | 2 -- voice_engine/channel.cc | 37 -------------------------- voice_engine/channel.h | 4 --- voice_engine/channel_proxy.cc | 11 -------- voice_engine/channel_proxy.h | 2 -- 8 files changed, 103 deletions(-) diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index bfa125a734..294dad0094 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -345,19 +345,6 @@ internal::AudioState* AudioReceiveStream::audio_state() const { return audio_state; } -AudioReceiveStream::ExtensionIds AudioReceiveStream::FindExtensionIds( - const std::vector& extensions) { - ExtensionIds ids; - for (const auto& extension : extensions) { - if (extension.uri == RtpExtension::kAudioLevelUri) { - ids.audio_level = extension.id; - } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { - ids.transport_sequence_number = extension.id; - } - } - return ids; -} - void AudioReceiveStream::ConfigureStream(AudioReceiveStream* stream, const Config& new_config, bool first_time) { @@ -389,19 +376,6 @@ void AudioReceiveStream::ConfigureStream(AudioReceiveStream* stream, channel_proxy->SetReceiveCodecs(new_config.decoder_map); } - // RTP Header Extensions. - const ExtensionIds old_ids = FindExtensionIds(old_config.rtp.extensions); - const ExtensionIds new_ids = FindExtensionIds(new_config.rtp.extensions); - if (first_time || new_ids.audio_level != old_ids.audio_level) { - channel_proxy->SetReceiveAudioLevelIndicationStatus( - new_ids.audio_level != 0, new_ids.audio_level); - } - if (first_time || new_ids.transport_sequence_number != - old_ids.transport_sequence_number) { - channel_proxy->EnableReceiveTransportSequenceNumber( - new_ids.transport_sequence_number); - } - stream->config_ = new_config; } } // namespace internal diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h index 999039f21a..7d0eed9cb2 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -91,15 +91,6 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream, const AudioSendStream* GetAssociatedSendStreamForTesting() const; private: - // RFC 5285: Each distinct extension MUST have a unique ID. The value 0 is - // reserved for padding and MUST NOT be used as a local identifier. - // So it should be safe to use 0 here to indicate "not configured". - struct ExtensionIds { - int audio_level = 0; - int transport_sequence_number = 0; - }; - static ExtensionIds FindExtensionIds( - const std::vector& extensions); static void ConfigureStream(AudioReceiveStream* stream, const Config& new_config, bool first_time); diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index 062e71faf9..c8318aa967 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -86,12 +86,6 @@ struct ConfigHelper { channel_proxy_ = new testing::StrictMock(); EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kLocalSsrc)).Times(1); EXPECT_CALL(*channel_proxy_, SetNACKStatus(true, 15)).Times(1); - EXPECT_CALL(*channel_proxy_, - SetReceiveAudioLevelIndicationStatus(true, kAudioLevelId)) - .Times(1); - EXPECT_CALL(*channel_proxy_, - EnableReceiveTransportSequenceNumber(kTransportSequenceNumberId)) - .Times(1); EXPECT_CALL(*channel_proxy_, RegisterReceiverCongestionControlObjects(&packet_router_)) .Times(1); @@ -386,12 +380,6 @@ TEST(AudioReceiveStreamTest, ReconfigureWithUpdatedConfig) { EXPECT_CALL(channel_proxy, SetLocalSSRC(kLocalSsrc + 1)).Times(1); EXPECT_CALL(channel_proxy, SetNACKStatus(true, 15 + 1)).Times(1); EXPECT_CALL(channel_proxy, SetReceiveCodecs(new_config.decoder_map)); - EXPECT_CALL(channel_proxy, - SetReceiveAudioLevelIndicationStatus(true, kAudioLevelId + 1)) - .Times(1); - EXPECT_CALL(channel_proxy, - EnableReceiveTransportSequenceNumber(kTransportSequenceNumberId + 1)) - .Times(1); recv_stream->Reconfigure(new_config); } diff --git a/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h index 4b3d30b246..29635bac1c 100644 --- a/test/mock_voe_channel_proxy.h +++ b/test/mock_voe_channel_proxy.h @@ -38,9 +38,7 @@ class MockVoEChannelProxy : public voe::ChannelProxy { MOCK_METHOD1(SetRTCP_CNAME, void(const std::string& c_name)); MOCK_METHOD2(SetNACKStatus, void(bool enable, int max_packets)); MOCK_METHOD2(SetSendAudioLevelIndicationStatus, void(bool enable, int id)); - MOCK_METHOD2(SetReceiveAudioLevelIndicationStatus, void(bool enable, int id)); MOCK_METHOD1(EnableSendTransportSequenceNumber, void(int id)); - MOCK_METHOD1(EnableReceiveTransportSequenceNumber, void(int id)); MOCK_METHOD2(RegisterSenderCongestionControlObjects, void(RtpTransportControllerSendInterface* transport, RtcpBandwidthObserver* bandwidth_observer)); diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index ef076ba4e1..efc76bdcab 100644 --- a/voice_engine/channel.cc +++ b/voice_engine/channel.cc @@ -446,21 +446,6 @@ int32_t Channel::OnReceivedPayloadData(const uint8_t* payloadData, return 0; } -bool Channel::OnRecoveredPacket(const uint8_t* rtp_packet, - size_t rtp_packet_length) { - RTPHeader header; - if (!rtp_header_parser_->Parse(rtp_packet, rtp_packet_length, &header)) { - RTC_LOG(LS_WARNING) << "IncomingPacket invalid RTP header"; - return false; - } - header.payload_type_frequency = - rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType); - if (header.payload_type_frequency < 0) - return false; - // TODO(nisse): Pass RtpPacketReceived with |recovered()| true. - return ReceivePacket(rtp_packet, rtp_packet_length, header); -} - AudioMixer::Source::AudioFrameInfo Channel::GetAudioFrameWithInfo( int sample_rate_hz, AudioFrame* audio_frame) { @@ -593,7 +578,6 @@ Channel::Channel(ProcessThread* module_process_thread, rtc::scoped_refptr decoder_factory) : event_log_proxy_(new RtcEventLogProxy()), rtcp_rtt_stats_proxy_(new RtcpRttStatsProxy()), - rtp_header_parser_(RtpHeaderParser::Create()), rtp_payload_registry_(new RTPPayloadRegistry()), rtp_receive_statistics_( ReceiveStatistics::Create(Clock::GetRealTimeClock())), @@ -1118,33 +1102,12 @@ int Channel::SetSendAudioLevelIndicationStatus(bool enable, unsigned char id) { return SetSendRtpHeaderExtension(enable, kRtpExtensionAudioLevel, id); } -int Channel::SetReceiveAudioLevelIndicationStatus(bool enable, - unsigned char id) { - rtp_header_parser_->DeregisterRtpHeaderExtension(kRtpExtensionAudioLevel); - if (enable && - !rtp_header_parser_->RegisterRtpHeaderExtension(kRtpExtensionAudioLevel, - id)) { - return -1; - } - return 0; -} - void Channel::EnableSendTransportSequenceNumber(int id) { int ret = SetSendRtpHeaderExtension(true, kRtpExtensionTransportSequenceNumber, id); RTC_DCHECK_EQ(0, ret); } -void Channel::EnableReceiveTransportSequenceNumber(int id) { - rtp_header_parser_->DeregisterRtpHeaderExtension( - kRtpExtensionTransportSequenceNumber); - if (id != 0) { - bool ret = rtp_header_parser_->RegisterRtpHeaderExtension( - kRtpExtensionTransportSequenceNumber, id); - RTC_DCHECK(ret); - } -} - void Channel::RegisterSenderCongestionControlObjects( RtpTransportControllerSendInterface* transport, RtcpBandwidthObserver* bandwidth_observer) { diff --git a/voice_engine/channel.h b/voice_engine/channel.h index e501c6d4d6..3d6dd8f226 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -212,9 +212,7 @@ class Channel // RTP+RTCP int SetLocalSSRC(unsigned int ssrc); int SetSendAudioLevelIndicationStatus(bool enable, unsigned char id); - int SetReceiveAudioLevelIndicationStatus(bool enable, unsigned char id); void EnableSendTransportSequenceNumber(int id); - void EnableReceiveTransportSequenceNumber(int id); void RegisterSenderCongestionControlObjects( RtpTransportControllerSendInterface* transport, @@ -311,7 +309,6 @@ class Channel int GetRemoteSSRC(unsigned int& ssrc); void OnUplinkPacketLossRate(float packet_loss_rate); bool InputMute() const; - bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length); bool ReceivePacket(const uint8_t* packet, size_t packet_length, @@ -343,7 +340,6 @@ class Channel std::unique_ptr event_log_proxy_; std::unique_ptr rtcp_rtt_stats_proxy_; - std::unique_ptr rtp_header_parser_; std::unique_ptr rtp_payload_registry_; std::unique_ptr rtp_receive_statistics_; std::unique_ptr rtp_receiver_; diff --git a/voice_engine/channel_proxy.cc b/voice_engine/channel_proxy.cc index 6442f2b1cf..70564d4c91 100644 --- a/voice_engine/channel_proxy.cc +++ b/voice_engine/channel_proxy.cc @@ -72,22 +72,11 @@ void ChannelProxy::SetSendAudioLevelIndicationStatus(bool enable, int id) { RTC_DCHECK_EQ(0, error); } -void ChannelProxy::SetReceiveAudioLevelIndicationStatus(bool enable, int id) { - RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); - int error = channel_->SetReceiveAudioLevelIndicationStatus(enable, id); - RTC_DCHECK_EQ(0, error); -} - void ChannelProxy::EnableSendTransportSequenceNumber(int id) { RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); channel_->EnableSendTransportSequenceNumber(id); } -void ChannelProxy::EnableReceiveTransportSequenceNumber(int id) { - RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); - channel_->EnableReceiveTransportSequenceNumber(id); -} - void ChannelProxy::RegisterSenderCongestionControlObjects( RtpTransportControllerSendInterface* transport, RtcpBandwidthObserver* bandwidth_observer) { diff --git a/voice_engine/channel_proxy.h b/voice_engine/channel_proxy.h index 1d2c8ce043..ef81174c0e 100644 --- a/voice_engine/channel_proxy.h +++ b/voice_engine/channel_proxy.h @@ -64,9 +64,7 @@ class ChannelProxy : public RtpPacketSinkInterface { virtual void SetRTCP_CNAME(const std::string& c_name); virtual void SetNACKStatus(bool enable, int max_packets); virtual void SetSendAudioLevelIndicationStatus(bool enable, int id); - virtual void SetReceiveAudioLevelIndicationStatus(bool enable, int id); virtual void EnableSendTransportSequenceNumber(int id); - virtual void EnableReceiveTransportSequenceNumber(int id); virtual void RegisterSenderCongestionControlObjects( RtpTransportControllerSendInterface* transport, RtcpBandwidthObserver* bandwidth_observer);