Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc

Issue 2633923003: Add rtcp::TransportFeedback::GetReceivedPackets() (Closed)
Patch Set: . Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
index 42c0cc63ecf900efb82806cf4835ac521ca40648..78407e5a74169e7dd76197f87a2d46a4d0028e86 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
@@ -366,6 +366,11 @@ bool TransportFeedback::AddReceivedPacket(uint16_t sequence_number,
return true;
}
+const std::vector<TransportFeedback::ReceivedPacket>&
+TransportFeedback::GetReceivedPackets() const {
+ return packets_;
+}
+
uint16_t TransportFeedback::GetBaseSequence() const {
return base_seq_no_;
}
@@ -375,9 +380,9 @@ TransportFeedback::GetStatusVector() const {
std::vector<TransportFeedback::StatusSymbol> symbols;
uint16_t seq_no = GetBaseSequence();
for (const auto& packet : packets_) {
- for (; seq_no != packet.sequence_number; ++seq_no)
+ for (; seq_no != packet.sequence_number(); ++seq_no)
symbols.push_back(StatusSymbol::kNotReceived);
- if (packet.delta_ticks >= 0x00 && packet.delta_ticks <= 0xff) {
+ if (packet.delta_ticks() >= 0x00 && packet.delta_ticks() <= 0xff) {
symbols.push_back(StatusSymbol::kReceivedSmallDelta);
} else {
symbols.push_back(StatusSymbol::kReceivedLargeDelta);
@@ -390,7 +395,7 @@ TransportFeedback::GetStatusVector() const {
std::vector<int16_t> TransportFeedback::GetReceiveDeltas() const {
std::vector<int16_t> deltas;
for (const auto& packet : packets_)
- deltas.push_back(packet.delta_ticks);
+ deltas.push_back(packet.delta_ticks());
return deltas;
}
@@ -401,7 +406,7 @@ int64_t TransportFeedback::GetBaseTimeUs() const {
std::vector<int64_t> TransportFeedback::GetReceiveDeltasUs() const {
std::vector<int64_t> us_deltas;
for (const auto& packet : packets_)
- us_deltas.push_back(packet.delta_ticks * kDeltaScaleFactor);
+ us_deltas.push_back(packet.delta_us());
return us_deltas;
}
@@ -534,18 +539,18 @@ bool TransportFeedback::IsConsistent() const {
LOG(LS_ERROR) << "Failed to find delta for seq_no " << seq_no;
return false;
}
- if (packet_it->sequence_number != seq_no) {
+ if (packet_it->sequence_number() != seq_no) {
LOG(LS_ERROR) << "Expected to find delta for seq_no " << seq_no
- << ". Next delta is for " << packet_it->sequence_number;
+ << ". Next delta is for " << packet_it->sequence_number();
return false;
}
if (delta_size == 1 &&
- (packet_it->delta_ticks < 0 || packet_it->delta_ticks > 0xff)) {
- LOG(LS_ERROR) << "Delta " << packet_it->delta_ticks << " for seq_no "
+ (packet_it->delta_ticks() < 0 || packet_it->delta_ticks() > 0xff)) {
+ LOG(LS_ERROR) << "Delta " << packet_it->delta_ticks() << " for seq_no "
<< seq_no << " doesn't fit into one byte";
return false;
}
- timestamp_us += packet_it->delta_ticks * kDeltaScaleFactor;
+ timestamp_us += packet_it->delta_us();
++packet_it;
}
packet_size += delta_size;
@@ -553,7 +558,7 @@ bool TransportFeedback::IsConsistent() const {
}
if (packet_it != packets_.end()) {
LOG(LS_ERROR) << "Unencoded delta for seq_no "
- << packet_it->sequence_number;
+ << packet_it->sequence_number();
return false;
}
if (timestamp_us != last_timestamp_us_) {
@@ -610,7 +615,7 @@ bool TransportFeedback::Create(uint8_t* packet,
}
for (const auto& received_packet : packets_) {
- int16_t delta = received_packet.delta_ticks;
+ int16_t delta = received_packet.delta_ticks();
if (delta >= 0 && delta <= 0xFF) {
packet[(*position)++] = delta;
} else {

Powered by Google App Engine
This is Rietveld 408576698