Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
index 986d51acd40702c9c25ced0786ca38b60c44c375..87f8ffdee3a038ab0a91a82d1456c5a2e4469b6f 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
@@ -30,10 +30,8 @@ |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" |
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" |
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" |
@@ -190,8 +188,6 @@ RTCPSender::RTCPSender( |
builders_[kRtcpSdes] = &RTCPSender::BuildSDES; |
builders_[kRtcpPli] = &RTCPSender::BuildPLI; |
builders_[kRtcpFir] = &RTCPSender::BuildFIR; |
- builders_[kRtcpSli] = &RTCPSender::BuildSLI; |
- builders_[kRtcpRpsi] = &RTCPSender::BuildRPSI; |
builders_[kRtcpRemb] = &RTCPSender::BuildREMB; |
builders_[kRtcpBye] = &RTCPSender::BuildBYE; |
builders_[kRtcpApp] = &RTCPSender::BuildAPP; |
@@ -516,49 +512,6 @@ std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildFIR(const RtcpContext& ctx) { |
return std::unique_ptr<rtcp::RtcpPacket>(fir); |
} |
-/* |
- 0 1 2 3 |
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- | First | Number | PictureID | |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-*/ |
-std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildSLI(const RtcpContext& ctx) { |
- rtcp::Sli* sli = new rtcp::Sli(); |
- sli->SetSenderSsrc(ssrc_); |
- sli->SetMediaSsrc(remote_ssrc_); |
- // Crop picture id to 6 least significant bits. |
- sli->AddPictureId(ctx.picture_id_ & 0x3F); |
- |
- return std::unique_ptr<rtcp::RtcpPacket>(sli); |
-} |
- |
-/* |
- 0 1 2 3 |
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- | PB |0| Payload Type| Native RPSI bit string | |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- | defined per codec ... | Padding (0) | |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-*/ |
-/* |
-* Note: not generic made for VP8 |
-*/ |
-std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildRPSI( |
- const RtcpContext& ctx) { |
- if (ctx.feedback_state_.send_payload_type == 0xFF) |
- return nullptr; |
- |
- rtcp::Rpsi* rpsi = new rtcp::Rpsi(); |
- rpsi->SetSenderSsrc(ssrc_); |
- rpsi->SetMediaSsrc(remote_ssrc_); |
- rpsi->SetPayloadType(ctx.feedback_state_.send_payload_type); |
- rpsi->SetPictureId(ctx.picture_id_); |
- |
- return std::unique_ptr<rtcp::RtcpPacket>(rpsi); |
-} |
- |
std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildREMB( |
const RtcpContext& ctx) { |
rtcp::Remb* remb = new rtcp::Remb(); |