| Index: webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
|
| index 7a9fb9b5fd177b32dead9718dce5e4cdff1b6a3b..94001dbb27cc2546fe40405da5dc75322ac284ec 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
|
| @@ -34,8 +34,6 @@ using webrtc::RTCPUtility::RTCPPacketPSFBFIR;
|
| using webrtc::RTCPUtility::RTCPPacketPSFBFIRItem;
|
| using webrtc::RTCPUtility::RTCPPacketPSFBREMBItem;
|
| using webrtc::RTCPUtility::RTCPPacketPSFBRPSI;
|
| -using webrtc::RTCPUtility::RTCPPacketPSFBSLI;
|
| -using webrtc::RTCPUtility::RTCPPacketPSFBSLIItem;
|
| using webrtc::RTCPUtility::RTCPPacketReportBlockItem;
|
| using webrtc::RTCPUtility::RTCPPacketRTPFBNACK;
|
| using webrtc::RTCPUtility::RTCPPacketRTPFBNACKItem;
|
| @@ -185,30 +183,6 @@ void CreateSdes(const std::vector<Sdes::Chunk>& chunks,
|
| }
|
| }
|
|
|
| -// Slice loss indication (SLI) (RFC 4585).
|
| -//
|
| -// FCI:
|
| -//
|
| -// 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 |
|
| -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
| -
|
| -void CreateSli(const RTCPPacketPSFBSLI& sli,
|
| - const RTCPPacketPSFBSLIItem& sli_item,
|
| - uint8_t* buffer,
|
| - size_t* pos) {
|
| - AssignUWord32(buffer, pos, sli.SenderSSRC);
|
| - AssignUWord32(buffer, pos, sli.MediaSSRC);
|
| -
|
| - AssignUWord8(buffer, pos, sli_item.FirstMB >> 5);
|
| - AssignUWord8(buffer, pos, (sli_item.FirstMB << 3) +
|
| - ((sli_item.NumberOfMB >> 10) & 0x07));
|
| - AssignUWord8(buffer, pos, sli_item.NumberOfMB >> 2);
|
| - AssignUWord8(buffer, pos, (sli_item.NumberOfMB << 6) + sli_item.PictureId);
|
| -}
|
| -
|
| // Reference picture selection indication (RPSI) (RFC 4585).
|
| //
|
| // FCI:
|
| @@ -558,20 +532,6 @@ size_t Sdes::BlockLength() const {
|
| return length;
|
| }
|
|
|
| -bool Sli::Create(uint8_t* packet,
|
| - size_t* index,
|
| - size_t max_length,
|
| - RtcpPacket::PacketReadyCallback* callback) const {
|
| - while (*index + BlockLength() > max_length) {
|
| - if (!OnBufferFull(packet, index, callback))
|
| - return false;
|
| - }
|
| - const uint8_t kFmt = 2;
|
| - CreateHeader(kFmt, PT_PSFB, HeaderLength(), packet, index);
|
| - CreateSli(sli_, sli_item_, packet, index);
|
| - return true;
|
| -}
|
| -
|
| bool Rpsi::Create(uint8_t* packet,
|
| size_t* index,
|
| size_t max_length,
|
|
|