Add RTCP packet types to packet builder:
REMB, TMMBR, TMMBN and extended reports: RRTR, DLRR, VoIP metric. BUG=2450 R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/9299005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6537 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
asapersson@webrtc.org
@ -378,6 +378,254 @@ class NackItem : public PacketType {
|
||||
std::vector<uint16_t> last_nack_list_;
|
||||
};
|
||||
|
||||
class PsfbApp : public PacketType {
|
||||
public:
|
||||
PsfbApp() {}
|
||||
virtual ~PsfbApp() {}
|
||||
|
||||
uint32_t Ssrc() const { return psfb_app_.SenderSSRC; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketPSFBAPP& psfb_app) {
|
||||
psfb_app_ = psfb_app;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketPSFBAPP psfb_app_;
|
||||
};
|
||||
|
||||
class RembItem : public PacketType {
|
||||
public:
|
||||
RembItem() : last_bitrate_bps_(0) {}
|
||||
virtual ~RembItem() {}
|
||||
|
||||
int last_bitrate_bps() const { return last_bitrate_bps_; }
|
||||
std::vector<uint32_t> last_ssrc_list() {
|
||||
return last_ssrc_list_;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketPSFBREMBItem& remb_item) {
|
||||
last_bitrate_bps_ = remb_item.BitRate;
|
||||
last_ssrc_list_.clear();
|
||||
last_ssrc_list_.insert(
|
||||
last_ssrc_list_.end(),
|
||||
remb_item.SSRCs,
|
||||
remb_item.SSRCs + remb_item.NumberOfSSRCs);
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
uint32_t last_bitrate_bps_;
|
||||
std::vector<uint32_t> last_ssrc_list_;
|
||||
};
|
||||
|
||||
class Tmmbr : public PacketType {
|
||||
public:
|
||||
Tmmbr() {}
|
||||
virtual ~Tmmbr() {}
|
||||
|
||||
uint32_t Ssrc() const { return tmmbr_.SenderSSRC; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketRTPFBTMMBR& tmmbr) {
|
||||
tmmbr_ = tmmbr;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketRTPFBTMMBR tmmbr_;
|
||||
};
|
||||
|
||||
class TmmbrItem : public PacketType {
|
||||
public:
|
||||
TmmbrItem() {}
|
||||
virtual ~TmmbrItem() {}
|
||||
|
||||
uint32_t Ssrc() const { return tmmbr_item_.SSRC; }
|
||||
uint32_t BitrateKbps() const { return tmmbr_item_.MaxTotalMediaBitRate; }
|
||||
uint32_t Overhead() const { return tmmbr_item_.MeasuredOverhead; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketRTPFBTMMBRItem& tmmbr_item) {
|
||||
tmmbr_item_ = tmmbr_item;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketRTPFBTMMBRItem tmmbr_item_;
|
||||
};
|
||||
|
||||
|
||||
class Tmmbn : public PacketType {
|
||||
public:
|
||||
Tmmbn() {}
|
||||
virtual ~Tmmbn() {}
|
||||
|
||||
uint32_t Ssrc() const { return tmmbn_.SenderSSRC; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketRTPFBTMMBN& tmmbn) {
|
||||
tmmbn_ = tmmbn;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketRTPFBTMMBN tmmbn_;
|
||||
};
|
||||
|
||||
class TmmbnItems : public PacketType {
|
||||
public:
|
||||
TmmbnItems() {}
|
||||
virtual ~TmmbnItems() {}
|
||||
|
||||
uint32_t Ssrc(uint8_t num) const {
|
||||
assert(num < tmmbns_.size());
|
||||
return tmmbns_[num].SSRC;
|
||||
}
|
||||
uint32_t BitrateKbps(uint8_t num) const {
|
||||
assert(num < tmmbns_.size());
|
||||
return tmmbns_[num].MaxTotalMediaBitRate;
|
||||
}
|
||||
uint32_t Overhead(uint8_t num) const {
|
||||
assert(num < tmmbns_.size());
|
||||
return tmmbns_[num].MeasuredOverhead;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketRTPFBTMMBNItem& tmmbn_item) {
|
||||
tmmbns_.push_back(tmmbn_item);
|
||||
++num_packets_;
|
||||
}
|
||||
void Clear() { tmmbns_.clear(); }
|
||||
|
||||
std::vector<RTCPUtility::RTCPPacketRTPFBTMMBNItem> tmmbns_;
|
||||
};
|
||||
|
||||
class XrHeader : public PacketType {
|
||||
public:
|
||||
XrHeader() {}
|
||||
virtual ~XrHeader() {}
|
||||
|
||||
uint32_t Ssrc() const { return xr_header_.OriginatorSSRC; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketXR& xr_header) {
|
||||
xr_header_ = xr_header;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketXR xr_header_;
|
||||
};
|
||||
|
||||
class Rrtr : public PacketType {
|
||||
public:
|
||||
Rrtr() {}
|
||||
virtual ~Rrtr() {}
|
||||
|
||||
uint32_t NtpSec() const { return rrtr_.NTPMostSignificant; }
|
||||
uint32_t NtpFrac() const { return rrtr_.NTPLeastSignificant; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketXRReceiverReferenceTimeItem& rrtr) {
|
||||
rrtr_ = rrtr;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketXRReceiverReferenceTimeItem rrtr_;
|
||||
};
|
||||
|
||||
class Dlrr : public PacketType {
|
||||
public:
|
||||
Dlrr() {}
|
||||
virtual ~Dlrr() {}
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set() { ++num_packets_; }
|
||||
};
|
||||
|
||||
class DlrrItems : public PacketType {
|
||||
public:
|
||||
DlrrItems() {}
|
||||
virtual ~DlrrItems() {}
|
||||
|
||||
uint32_t Ssrc(uint8_t num) const {
|
||||
assert(num < dlrrs_.size());
|
||||
return dlrrs_[num].SSRC;
|
||||
}
|
||||
uint32_t LastRr(uint8_t num) const {
|
||||
assert(num < dlrrs_.size());
|
||||
return dlrrs_[num].LastRR;
|
||||
}
|
||||
uint32_t DelayLastRr(uint8_t num) const {
|
||||
assert(num < dlrrs_.size());
|
||||
return dlrrs_[num].DelayLastRR;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketXRDLRRReportBlockItem& dlrr) {
|
||||
dlrrs_.push_back(dlrr);
|
||||
++num_packets_;
|
||||
}
|
||||
void Clear() { dlrrs_.clear(); }
|
||||
|
||||
std::vector<RTCPUtility::RTCPPacketXRDLRRReportBlockItem> dlrrs_;
|
||||
};
|
||||
|
||||
class VoipMetric : public PacketType {
|
||||
public:
|
||||
VoipMetric() {}
|
||||
virtual ~VoipMetric() {}
|
||||
|
||||
uint32_t Ssrc() const { return voip_metric_.SSRC; }
|
||||
uint8_t LossRate() { return voip_metric_.lossRate; }
|
||||
uint8_t DiscardRate() { return voip_metric_.discardRate; }
|
||||
uint8_t BurstDensity() { return voip_metric_.burstDensity; }
|
||||
uint8_t GapDensity() { return voip_metric_.gapDensity; }
|
||||
uint16_t BurstDuration() { return voip_metric_.burstDuration; }
|
||||
uint16_t GapDuration() { return voip_metric_.gapDuration; }
|
||||
uint16_t RoundTripDelay() { return voip_metric_.roundTripDelay; }
|
||||
uint16_t EndSystemDelay() { return voip_metric_.endSystemDelay; }
|
||||
uint8_t SignalLevel() { return voip_metric_.signalLevel; }
|
||||
uint8_t NoiseLevel() { return voip_metric_.noiseLevel; }
|
||||
uint8_t Rerl() { return voip_metric_.RERL; }
|
||||
uint8_t Gmin() { return voip_metric_.Gmin; }
|
||||
uint8_t Rfactor() { return voip_metric_.Rfactor; }
|
||||
uint8_t ExtRfactor() { return voip_metric_.extRfactor; }
|
||||
uint8_t MosLq() { return voip_metric_.MOSLQ; }
|
||||
uint8_t MosCq() { return voip_metric_.MOSCQ; }
|
||||
uint8_t RxConfig() { return voip_metric_.RXconfig; }
|
||||
uint16_t JbNominal() { return voip_metric_.JBnominal; }
|
||||
uint16_t JbMax() { return voip_metric_.JBmax; }
|
||||
uint16_t JbAbsMax() { return voip_metric_.JBabsMax; }
|
||||
|
||||
private:
|
||||
friend class RtcpPacketParser;
|
||||
|
||||
void Set(const RTCPUtility::RTCPPacketXRVOIPMetricItem& voip_metric) {
|
||||
voip_metric_ = voip_metric;
|
||||
++num_packets_;
|
||||
}
|
||||
|
||||
RTCPUtility::RTCPPacketXRVOIPMetricItem voip_metric_;
|
||||
};
|
||||
|
||||
class RtcpPacketParser {
|
||||
public:
|
||||
RtcpPacketParser();
|
||||
@ -403,6 +651,17 @@ class RtcpPacketParser {
|
||||
FirItem* fir_item() { return &fir_item_; }
|
||||
Nack* nack() { return &nack_; }
|
||||
NackItem* nack_item() { return &nack_item_; }
|
||||
PsfbApp* psfb_app() { return &psfb_app_; }
|
||||
RembItem* remb_item() { return &remb_item_; }
|
||||
Tmmbr* tmmbr() { return &tmmbr_; }
|
||||
TmmbrItem* tmmbr_item() { return &tmmbr_item_; }
|
||||
Tmmbn* tmmbn() { return &tmmbn_; }
|
||||
TmmbnItems* tmmbn_items() { return &tmmbn_items_; }
|
||||
XrHeader* xr_header() { return &xr_header_; }
|
||||
Rrtr* rrtr() { return &rrtr_; }
|
||||
Dlrr* dlrr() { return &dlrr_; }
|
||||
DlrrItems* dlrr_items() { return &dlrr_items_; }
|
||||
VoipMetric* voip_metric() { return &voip_metric_; }
|
||||
|
||||
int report_blocks_per_ssrc(uint32_t ssrc) {
|
||||
return report_blocks_per_ssrc_[ssrc];
|
||||
@ -427,6 +686,17 @@ class RtcpPacketParser {
|
||||
FirItem fir_item_;
|
||||
Nack nack_;
|
||||
NackItem nack_item_;
|
||||
PsfbApp psfb_app_;
|
||||
RembItem remb_item_;
|
||||
Tmmbr tmmbr_;
|
||||
TmmbrItem tmmbr_item_;
|
||||
Tmmbn tmmbn_;
|
||||
TmmbnItems tmmbn_items_;
|
||||
XrHeader xr_header_;
|
||||
Rrtr rrtr_;
|
||||
Dlrr dlrr_;
|
||||
DlrrItems dlrr_items_;
|
||||
VoipMetric voip_metric_;
|
||||
|
||||
std::map<uint32_t, int> report_blocks_per_ssrc_;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user