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 #include <memory> |
16 | 16 |
| 17 #include "webrtc/base/buffer.h" |
17 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" | 18 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" |
18 #include "webrtc/modules/include/module_common_types.h" | 19 #include "webrtc/modules/include/module_common_types.h" |
19 #include "webrtc/typedefs.h" | 20 #include "webrtc/typedefs.h" |
20 | 21 |
21 namespace webrtc { | 22 namespace webrtc { |
22 | 23 |
23 // Struct for holding RTP packets. | 24 // Struct for holding RTP packets. |
24 struct Packet { | 25 struct Packet { |
25 RTPHeader header; | 26 RTPHeader header; |
26 // Datagram excluding RTP header and header extension. | 27 // Datagram excluding RTP header and header extension. |
27 uint8_t* payload = nullptr; | 28 rtc::Buffer payload; |
28 size_t payload_length = 0; | |
29 bool primary = true; // Primary, i.e., not redundant payload. | 29 bool primary = true; // Primary, i.e., not redundant payload. |
30 bool sync_packet = false; | 30 bool sync_packet = false; |
31 std::unique_ptr<TickTimer::Stopwatch> waiting_time; | 31 std::unique_ptr<TickTimer::Stopwatch> waiting_time; |
32 | 32 |
33 Packet(); | 33 Packet(); |
34 ~Packet(); | 34 ~Packet(); |
35 | 35 |
36 // Comparison operators. Establish a packet ordering based on (1) timestamp, | 36 // Comparison operators. Establish a packet ordering based on (1) timestamp, |
37 // (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. |
38 // Timestamp and sequence numbers are compared taking wrap-around into | 38 // Timestamp and sequence numbers are compared taking wrap-around into |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } | 76 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } |
77 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } | 77 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } |
78 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } | 78 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } |
79 }; | 79 }; |
80 | 80 |
81 // A list of packets. | 81 // A list of packets. |
82 typedef std::list<Packet*> PacketList; | 82 typedef std::list<Packet*> PacketList; |
83 | 83 |
84 } // namespace webrtc | 84 } // namespace webrtc |
85 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ | 85 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ |
OLD | NEW |