diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index 18d1bdcf07..203871b319 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -423,17 +423,6 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface { // using FIR, https://tools.ietf.org/html/rfc5104#section-4.3.1.2 void SendFullIntraRequest() { SendRTCP(kRtcpFir); } - // Set method for requestion a new key frame. - // Returns -1 on failure else 0. - RTC_DEPRECATED - virtual int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) = 0; - - // Sends a request for a keyframe. - // Returns -1 on failure else 0. - // Use above SendPictureLossIndication and SendFullIntraRequest instead. - RTC_DEPRECATED - virtual int32_t RequestKeyFrame() = 0; - // Sends a LossNotification RTCP message. // Returns -1 on failure else 0. virtual int32_t SendLossNotification(uint16_t last_decoded_seq_num, diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index dc8cc673f8..5d906126f9 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -98,10 +98,6 @@ enum RTCPPacketType : uint32_t { kRtcpXrTargetBitrate = 0x200000 }; -enum KeyFrameRequestMethod { kKeyFrameReqPliRtcp, kKeyFrameReqFirRtcp }; - -enum RtpRtcpPacketType { kPacketRtp = 0 }; - enum RtxMode { kRtxOff = 0x0, kRtxRetransmitted = 0x1, // Only send retransmissions over RTX. diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index e11632508e..0514507dbc 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -147,8 +147,6 @@ class MockRtpRtcp : public RtpRtcp { MOCK_METHOD1(SetReportBlockDataObserver, void(ReportBlockDataObserver*)); MOCK_METHOD1(SendFeedbackPacket, bool(const rtcp::TransportFeedback& packet)); MOCK_METHOD1(SetTargetSendBitrate, void(uint32_t bitrate_bps)); - MOCK_METHOD1(SetKeyFrameRequestMethod, int32_t(KeyFrameRequestMethod method)); - MOCK_METHOD0(RequestKeyFrame, int32_t()); MOCK_METHOD4(SendLossNotification, int32_t(uint16_t last_decoded_seq_num, uint16_t last_received_seq_num, diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 1d4861b87c..09e8c523c4 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -90,7 +90,6 @@ ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) packet_overhead_(28), // IPV4 UDP. nack_last_time_sent_full_ms_(0), nack_last_seq_number_sent_(0), - key_frame_req_method_(kKeyFrameReqPliRtcp), remote_bitrate_(configuration.remote_bitrate_estimator), ack_observer_(configuration.ack_observer), rtt_stats_(configuration.rtt_stats), @@ -708,24 +707,6 @@ bool ModuleRtpRtcpImpl::SendFeedbackPacket( return rtcp_sender_.SendFeedbackPacket(packet); } -int32_t ModuleRtpRtcpImpl::SetKeyFrameRequestMethod( - const KeyFrameRequestMethod method) { - key_frame_req_method_ = method; - return 0; -} - -int32_t ModuleRtpRtcpImpl::RequestKeyFrame() { - switch (key_frame_req_method_) { - case kKeyFrameReqPliRtcp: - SendPictureLossIndication(); - break; - case kKeyFrameReqFirRtcp: - SendFullIntraRequest(); - break; - } - return 0; -} - int32_t ModuleRtpRtcpImpl::SendLossNotification(uint16_t last_decoded_seq_num, uint16_t last_received_seq_num, bool decodability_flag, diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 09ca17fa25..817ec7ae14 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -248,13 +248,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { bool RtcpXrRrtrStatus() const override; // Video part. - - // Set method for requesting a new key frame. - int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) override; - - // Send a request for a keyframe. - int32_t RequestKeyFrame() override; - int32_t SendLossNotification(uint16_t last_decoded_seq_num, uint16_t last_received_seq_num, bool decodability_flag, @@ -327,8 +320,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { int64_t nack_last_time_sent_full_ms_; uint16_t nack_last_seq_number_sent_; - KeyFrameRequestMethod key_frame_req_method_; - RemoteBitrateEstimator* const remote_bitrate_; RtcpAckObserver* const ack_observer_;