| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ |
| 13 | 13 |
| 14 #include <list> | 14 #include <list> |
| 15 #include <memory> |
| 15 | 16 |
| 17 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" |
| 16 #include "webrtc/modules/include/module_common_types.h" | 18 #include "webrtc/modules/include/module_common_types.h" |
| 17 #include "webrtc/typedefs.h" | 19 #include "webrtc/typedefs.h" |
| 18 | 20 |
| 19 namespace webrtc { | 21 namespace webrtc { |
| 20 | 22 |
| 21 // Struct for holding RTP packets. | 23 // Struct for holding RTP packets. |
| 22 struct Packet { | 24 struct Packet { |
| 23 RTPHeader header; | 25 RTPHeader header; |
| 24 uint8_t* payload; // Datagram excluding RTP header and header extension. | 26 // Datagram excluding RTP header and header extension. |
| 25 size_t payload_length; | 27 uint8_t* payload = nullptr; |
| 26 bool primary; // Primary, i.e., not redundant payload. | 28 size_t payload_length = 0; |
| 27 int waiting_time; | 29 bool primary = true; // Primary, i.e., not redundant payload. |
| 28 bool sync_packet; | 30 bool sync_packet = false; |
| 31 std::unique_ptr<TickTimer::Stopwatch> waiting_time; |
| 29 | 32 |
| 30 // Constructor. | 33 Packet(); |
| 31 Packet() | 34 ~Packet(); |
| 32 : payload(NULL), | |
| 33 payload_length(0), | |
| 34 primary(true), | |
| 35 waiting_time(0), | |
| 36 sync_packet(false) { | |
| 37 } | |
| 38 | 35 |
| 39 // Comparison operators. Establish a packet ordering based on (1) timestamp, | 36 // Comparison operators. Establish a packet ordering based on (1) timestamp, |
| 40 // (2) sequence number, (3) regular packet vs sync-packet and (4) redundancy. | 37 // (2) sequence number, (3) regular packet vs sync-packet and (4) redundancy. |
| 41 // Timestamp and sequence numbers are compared taking wrap-around into | 38 // Timestamp and sequence numbers are compared taking wrap-around into |
| 42 // account. If both timestamp and sequence numbers are identical and one of | 39 // account. If both timestamp and sequence numbers are identical and one of |
| 43 // the packets is sync-packet, the regular packet is considered earlier. For | 40 // the packets is sync-packet, the regular packet is considered earlier. For |
| 44 // two regular packets with the same sequence number and timestamp a primary | 41 // two regular packets with the same sequence number and timestamp a primary |
| 45 // payload is considered "smaller" than a secondary. | 42 // payload is considered "smaller" than a secondary. |
| 46 bool operator==(const Packet& rhs) const { | 43 bool operator==(const Packet& rhs) const { |
| 47 return (this->header.timestamp == rhs.header.timestamp && | 44 return (this->header.timestamp == rhs.header.timestamp && |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } | 76 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } |
| 80 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } | 77 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } |
| 81 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } | 78 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } |
| 82 }; | 79 }; |
| 83 | 80 |
| 84 // A list of packets. | 81 // A list of packets. |
| 85 typedef std::list<Packet*> PacketList; | 82 typedef std::list<Packet*> PacketList; |
| 86 | 83 |
| 87 } // namespace webrtc | 84 } // namespace webrtc |
| 88 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ | 85 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ |
| OLD | NEW |