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

Unified Diff: webrtc/modules/audio_coding/neteq/packet.h

Issue 2309303002: Removed sync packet support from NetEq. (Closed)
Patch Set: Created 4 years, 3 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/audio_coding/neteq/packet.h
diff --git a/webrtc/modules/audio_coding/neteq/packet.h b/webrtc/modules/audio_coding/neteq/packet.h
index 273c2d21c03a3666fee77e00d1b8201b7a64075f..7119c80237969d9314edba23ed2d113dd27df860 100644
--- a/webrtc/modules/audio_coding/neteq/packet.h
+++ b/webrtc/modules/audio_coding/neteq/packet.h
@@ -27,44 +27,28 @@ struct Packet {
// Datagram excluding RTP header and header extension.
rtc::Buffer payload;
bool primary = true; // Primary, i.e., not redundant payload.
- bool sync_packet = false;
std::unique_ptr<TickTimer::Stopwatch> waiting_time;
Packet();
~Packet();
// Comparison operators. Establish a packet ordering based on (1) timestamp,
- // (2) sequence number, (3) regular packet vs sync-packet and (4) redundancy.
+ // (2) sequence number and (3) redundancy.
// Timestamp and sequence numbers are compared taking wrap-around into
- // account. If both timestamp and sequence numbers are identical and one of
- // the packets is sync-packet, the regular packet is considered earlier. For
- // two regular packets with the same sequence number and timestamp a primary
- // payload is considered "smaller" than a secondary.
+ // account. For two packets with the same sequence number and timestamp a
+ // primary payload is considered "smaller" than a secondary.
bool operator==(const Packet& rhs) const {
return (this->header.timestamp == rhs.header.timestamp &&
this->header.sequenceNumber == rhs.header.sequenceNumber &&
- this->primary == rhs.primary &&
- this->sync_packet == rhs.sync_packet);
+ this->primary == rhs.primary);
}
bool operator!=(const Packet& rhs) const { return !operator==(rhs); }
bool operator<(const Packet& rhs) const {
if (this->header.timestamp == rhs.header.timestamp) {
if (this->header.sequenceNumber == rhs.header.sequenceNumber) {
- // Timestamp and sequence numbers are identical. A sync packet should
- // be recognized "larger" (i.e. "later") compared to a "network packet"
- // (regular packet from network not sync-packet). If none of the packets
- // are sync-packets, then deem the left hand side to be "smaller"
- // (i.e., "earlier") if it is primary, and right hand side is not.
- //
- // The condition on sync packets to be larger than "network packets,"
- // given same RTP sequence number and timestamp, guarantees that a
- // "network packet" to be inserted in an earlier position into
- // |packet_buffer_| compared to a sync packet of same timestamp and
- // sequence number.
- if (rhs.sync_packet)
- return true;
- if (this->sync_packet)
- return false;
+ // Timestamp and sequence numbers are identical - deem the left
+ // hand side to be "smaller" (i.e., "earlier") if it is primary, and
+ // right hand side is not.
return (this->primary && !rhs.primary);
}
return (static_cast<uint16_t>(rhs.header.sequenceNumber
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/packet_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698