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 eef29783714ac73cd672e57e9e133aa65820b85a..906255990f8f8b8ab313f5ef3b9ffa8262404704 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc |
@@ -30,8 +30,6 @@ using webrtc::RTCPUtility::PT_XR; |
using webrtc::RTCPUtility::RTCPPacketAPP; |
using webrtc::RTCPUtility::RTCPPacketPSFBAPP; |
-using webrtc::RTCPUtility::RTCPPacketPSFBFIR; |
-using webrtc::RTCPUtility::RTCPPacketPSFBFIRItem; |
using webrtc::RTCPUtility::RTCPPacketPSFBREMBItem; |
using webrtc::RTCPUtility::RTCPPacketPSFBRPSI; |
using webrtc::RTCPUtility::RTCPPacketReportBlockItem; |
@@ -54,10 +52,6 @@ void AssignUWord16(uint8_t* buffer, size_t* offset, uint16_t value) { |
ByteWriter<uint16_t>::WriteBigEndian(buffer + *offset, value); |
*offset += 2; |
} |
-void AssignUWord24(uint8_t* buffer, size_t* offset, uint32_t value) { |
- ByteWriter<uint32_t, 3>::WriteBigEndian(buffer + *offset, value); |
- *offset += 3; |
-} |
void AssignUWord32(uint8_t* buffer, size_t* offset, uint32_t value) { |
ByteWriter<uint32_t>::WriteBigEndian(buffer + *offset, value); |
*offset += 4; |
@@ -207,29 +201,6 @@ void CreateRpsi(const RTCPPacketPSFBRPSI& rpsi, |
*pos += padding_bytes; |
} |
-// Full intra request (FIR) (RFC 5104). |
-// |
-// 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 |
-// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-// | SSRC | |
-// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-// | Seq nr. | Reserved | |
-// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- |
-void CreateFir(const RTCPPacketPSFBFIR& fir, |
- const RTCPPacketPSFBFIRItem& fir_item, |
- uint8_t* buffer, |
- size_t* pos) { |
- AssignUWord32(buffer, pos, fir.SenderSSRC); |
- AssignUWord32(buffer, pos, kUnusedMediaSourceSsrc0); |
- AssignUWord32(buffer, pos, fir_item.SSRC); |
- AssignUWord8(buffer, pos, fir_item.CommandSequenceNumber); |
- AssignUWord24(buffer, pos, 0); |
-} |
- |
// Receiver Estimated Max Bitrate (REMB) (draft-alvestrand-rmcat-remb). |
// |
// 0 1 2 3 |
@@ -499,20 +470,6 @@ void Rpsi::WithPictureId(uint64_t picture_id) { |
} |
} |
-bool Fir::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 = 4; |
- CreateHeader(kFmt, PT_PSFB, HeaderLength(), packet, index); |
- CreateFir(fir_, fir_item_, packet, index); |
- return true; |
-} |
- |
bool Remb::Create(uint8_t* packet, |
size_t* index, |
size_t max_length, |