822a16f64c
Reason for revert: Fix backward compatibility support Original issue's description: > Revert of Unify rtcp packet setters (patchset #8 id:130001 of https://codereview.webrtc.org/2348623003/ ) > > Reason for revert: > Breaks compilation of internal downstream project. > > Original issue's description: > > Unify rtcp packet setters > > Renamed setters in rtcp classes > > from WithField to SetField > > from WithItem to AddItem or SetItems > > from From to SetSenderSsrc > > from To to SetMediaSsrc > > Some redundant or unsued setters removed. > > Pass-by-const& replaced with pass-by-value when appropriate. > > > > BUG=webrtc:5260 > > > > Committed: https://crrev.com/20e77c7b8a9f19942ef3c3c4f1fa3888b2cd54ea > > Cr-Commit-Position: refs/heads/master@{#14393} > > TBR=sprang@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5260 > > Committed: https://crrev.com/efc6e41866662e0922858fbce1d9ee3bdd0637ed > Cr-Commit-Position: refs/heads/master@{#14400} TBR=sprang@webrtc.org,stefan@webrtc.org,kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5260 Review-Url: https://codereview.webrtc.org/2370313002 Cr-Commit-Position: refs/heads/master@{#14402}
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*
|
|
*/
|
|
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/basictypes.h"
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
|
|
|
namespace webrtc {
|
|
namespace rtcp {
|
|
class CommonHeader;
|
|
|
|
// Slice loss indication (SLI) (RFC 4585).
|
|
class Sli : public Psfb {
|
|
public:
|
|
static constexpr uint8_t kFeedbackMessageType = 2;
|
|
class Macroblocks {
|
|
public:
|
|
static constexpr size_t kLength = 4;
|
|
Macroblocks() : item_(0) {}
|
|
Macroblocks(uint8_t picture_id, uint16_t first, uint16_t number);
|
|
~Macroblocks() {}
|
|
|
|
void Parse(const uint8_t* buffer);
|
|
void Create(uint8_t* buffer) const;
|
|
|
|
uint16_t first() const { return item_ >> 19; }
|
|
uint16_t number() const { return (item_ >> 6) & 0x1fff; }
|
|
uint8_t picture_id() const { return (item_ & 0x3f); }
|
|
|
|
private:
|
|
uint32_t item_;
|
|
};
|
|
|
|
Sli() {}
|
|
~Sli() override {}
|
|
|
|
// Parse assumes header is already parsed and validated.
|
|
bool Parse(const CommonHeader& packet);
|
|
|
|
void AddPictureId(uint8_t picture_id) {
|
|
items_.emplace_back(picture_id, 0, 0x1fff);
|
|
}
|
|
void AddPictureId(uint8_t picture_id,
|
|
uint16_t first_macroblock,
|
|
uint16_t number_macroblocks) {
|
|
items_.emplace_back(picture_id, first_macroblock, number_macroblocks);
|
|
}
|
|
|
|
const std::vector<Macroblocks>& macroblocks() const { return items_; }
|
|
|
|
protected:
|
|
bool Create(uint8_t* packet,
|
|
size_t* index,
|
|
size_t max_length,
|
|
RtcpPacket::PacketReadyCallback* callback) const override;
|
|
|
|
private:
|
|
size_t BlockLength() const override {
|
|
return RtcpPacket::kHeaderLength + Psfb::kCommonFeedbackLength +
|
|
items_.size() * Macroblocks::kLength;
|
|
}
|
|
|
|
std::vector<Macroblocks> items_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(Sli);
|
|
};
|
|
|
|
} // namespace rtcp
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_
|