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

Delete RtpRtcp methods SetKeyFrameRequestMethod and RequestKeyFrame

Browse Source 
These are replaced with the methods SendPictureLossIndication and
SendFullIntraRequest, added in cl
https://webrtc-review.googlesource.com/c/src/+/140043.

Also delete the corresponding state variable
RtpRtcpImpl::key_frame_req_method_, the enum KeyFrameRequestMethod,
and the nearby unused enum RtpRtcpPacketType.

Bug: None
Change-Id: I1ac2e4ce6dbe20d1d1cbb3d5b2256ea55b341a57
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141403
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28221}
This commit is contained in:
Niels Möller
2019-06-11 10:38:01 +02:00
committed by Commit Bot
parent 1a5fc9035b
commit ab6fc1154f
5 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -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,

4
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -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.

2
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -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,

19
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -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,

9
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -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_;