| Index: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| index ec767d8336dfb7337a77776f93161f9f999cb3d3..7f615c933d76d8292bfa51682ec6d4057925c255 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| @@ -669,6 +669,22 @@ int32_t ModuleRtpRtcpImpl::DeregisterSendRtpHeaderExtension(
|
| return rtp_sender_.DeregisterRtpHeaderExtension(type);
|
| }
|
|
|
| +// TODO(danilchap): Remove default fallback to older version in 3 months.
|
| +bool RtpRtcp::RegisterRtpHeaderExtension(const std::string& type,
|
| + MediaType /* media */,
|
| + uint8_t id) {
|
| + RTPExtensionType enum_type = StringToRtpExtensionType(type);
|
| + if (enum_type == kRtpExtensionNone)
|
| + return false;
|
| + return RegisterSendRtpHeaderExtension(enum_type, id);
|
| +}
|
| +
|
| +bool ModuleRtpRtcpImpl::RegisterRtpHeaderExtension(const std::string& type,
|
| + MediaType media,
|
| + uint8_t id) {
|
| + return rtp_sender_.RegisterRtpHeaderExtension(type, media, id);
|
| +}
|
| +
|
| // (TMMBR) Temporary Max Media Bit Rate.
|
| bool ModuleRtpRtcpImpl::TMMBR() const {
|
| return rtcp_sender_.TMMBR();
|
| @@ -759,13 +775,9 @@ bool ModuleRtpRtcpImpl::TimeToSendFullNackList(int64_t now) const {
|
| }
|
|
|
| // Store the sent packets, needed to answer to Negative acknowledgment requests.
|
| -void ModuleRtpRtcpImpl::SetStorePacketsStatus(const bool enable,
|
| - const uint16_t number_to_store) {
|
| - rtp_sender_.SetStorePacketsStatus(enable, number_to_store);
|
| -}
|
| -
|
| -bool ModuleRtpRtcpImpl::StorePackets() const {
|
| - return rtp_sender_.StorePackets();
|
| +void ModuleRtpRtcpImpl::SetStorePacketsStatus(bool enable,
|
| + uint16_t number_to_store) {
|
| + rtp_sender_.SetStorePacketsSize(enable ? number_to_store : 0);
|
| }
|
|
|
| void ModuleRtpRtcpImpl::RegisterRtcpStatisticsCallback(
|
| @@ -907,8 +919,7 @@ void ModuleRtpRtcpImpl::OnReceivedNACK(
|
| for (uint16_t nack_sequence_number : nack_sequence_numbers) {
|
| send_loss_stats_.AddLostPacket(nack_sequence_number);
|
| }
|
| - if (!rtp_sender_.StorePackets() ||
|
| - nack_sequence_numbers.size() == 0) {
|
| + if (nack_sequence_numbers.size() == 0) {
|
| return;
|
| }
|
| // Use RTT from RtcpRttStats class if provided.
|
|
|