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/base/buffer.h" |
18 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" | 18 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" |
19 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" | 19 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" |
20 #include "webrtc/modules/include/module_common_types.h" | 20 #include "webrtc/modules/include/module_common_types.h" |
21 #include "webrtc/typedefs.h" | 21 #include "webrtc/typedefs.h" |
22 | 22 |
23 namespace webrtc { | 23 namespace webrtc { |
24 | 24 |
25 // Struct for holding RTP packets. | 25 // Struct for holding RTP packets. |
26 struct Packet { | 26 struct Packet { |
27 struct Priority { | |
28 Priority() : codec_level(0), red_level(0) {} | |
29 Priority(int codec_level, int red_level) | |
30 : codec_level(codec_level), red_level(red_level) { | |
31 RTC_DCHECK_GE(codec_level, 0); | |
32 RTC_DCHECK_GE(red_level, 0); | |
33 } | |
34 | |
35 int codec_level; | |
36 int red_level; | |
37 | |
38 // Priorities are sorted low-to-high, first on the level the codec | |
39 // prioritizes it, then on the level of RED packet it is; i.e. if it is a | |
40 // primary or secondary payload of a RED packet. For example: with Opus, an | |
41 // Fec packet (which the decoder prioritizes lower than a regular packet) | |
42 // will not be used if there is _any_ RED payload for the same | |
43 // timeframe. The highest priority packet will have levels {0, 0}. Negative | |
44 // priorities are not allowed. | |
45 bool operator<(const Priority& b) const { | |
46 RTC_DCHECK_GE(codec_level, 0); | |
47 RTC_DCHECK_GE(red_level, 0); | |
kwiberg-webrtc
2016/09/20 14:56:23
It's probably just as important to check the level
ossu
2016/09/20 15:45:21
Alright!
ossu
2016/09/21 10:23:12
Called it CheckInvariant to mimic ArrayView. Maybe
kwiberg-webrtc
2016/09/21 10:59:13
Yes. Although if intended to be generic, it should
| |
48 if (codec_level == b.codec_level) | |
49 return red_level < b.red_level; | |
50 | |
51 return codec_level < b.codec_level; | |
52 } | |
53 bool operator==(const Priority& b) const { | |
54 RTC_DCHECK_GE(codec_level, 0); | |
55 RTC_DCHECK_GE(red_level, 0); | |
56 return codec_level == b.codec_level && red_level == b.red_level; | |
57 } | |
58 bool operator!=(const Priority& b) const { return !(*this == b); } | |
59 bool operator>(const Priority& b) const { return b < *this; } | |
60 bool operator<=(const Priority& b) const { return !(b > *this); } | |
61 bool operator>=(const Priority& b) const { return !(b < *this); } | |
62 }; | |
63 | |
27 RTPHeader header; | 64 RTPHeader header; |
28 // Datagram excluding RTP header and header extension. | 65 // Datagram excluding RTP header and header extension. |
29 rtc::Buffer payload; | 66 rtc::Buffer payload; |
30 bool primary = true; // Primary, i.e., not redundant payload. | 67 Priority priority; |
31 std::unique_ptr<TickTimer::Stopwatch> waiting_time; | 68 std::unique_ptr<TickTimer::Stopwatch> waiting_time; |
32 std::unique_ptr<AudioDecoder::EncodedAudioFrame> frame; | 69 std::unique_ptr<AudioDecoder::EncodedAudioFrame> frame; |
33 | 70 |
34 Packet(); | 71 Packet(); |
35 ~Packet(); | 72 ~Packet(); |
36 | 73 |
37 // Comparison operators. Establish a packet ordering based on (1) timestamp, | 74 // Comparison operators. Establish a packet ordering based on (1) timestamp, |
38 // (2) sequence number and (3) redundancy. | 75 // (2) sequence number and (3) redundancy. |
39 // Timestamp and sequence numbers are compared taking wrap-around into | 76 // Timestamp and sequence numbers are compared taking wrap-around into |
40 // account. For two packets with the same sequence number and timestamp a | 77 // account. For two packets with the same sequence number and timestamp a |
41 // primary payload is considered "smaller" than a secondary. | 78 // primary payload is considered "smaller" than a secondary. |
42 bool operator==(const Packet& rhs) const { | 79 bool operator==(const Packet& rhs) const { |
43 return (this->header.timestamp == rhs.header.timestamp && | 80 return (this->header.timestamp == rhs.header.timestamp && |
44 this->header.sequenceNumber == rhs.header.sequenceNumber && | 81 this->header.sequenceNumber == rhs.header.sequenceNumber && |
45 this->primary == rhs.primary); | 82 this->priority == rhs.priority); |
46 } | 83 } |
47 bool operator!=(const Packet& rhs) const { return !operator==(rhs); } | 84 bool operator!=(const Packet& rhs) const { return !operator==(rhs); } |
48 bool operator<(const Packet& rhs) const { | 85 bool operator<(const Packet& rhs) const { |
49 if (this->header.timestamp == rhs.header.timestamp) { | 86 if (this->header.timestamp == rhs.header.timestamp) { |
50 if (this->header.sequenceNumber == rhs.header.sequenceNumber) { | 87 if (this->header.sequenceNumber == rhs.header.sequenceNumber) { |
51 // Timestamp and sequence numbers are identical - deem the left | 88 // Timestamp and sequence numbers are identical - deem the left hand |
52 // hand side to be "smaller" (i.e., "earlier") if it is primary, and | 89 // side to be "smaller" (i.e., "earlier") if it has higher priority. |
53 // right hand side is not. | 90 return this->priority < rhs.priority; |
54 return (this->primary && !rhs.primary); | |
55 } | 91 } |
56 return (static_cast<uint16_t>(rhs.header.sequenceNumber | 92 return (static_cast<uint16_t>(rhs.header.sequenceNumber |
57 - this->header.sequenceNumber) < 0xFFFF / 2); | 93 - this->header.sequenceNumber) < 0xFFFF / 2); |
58 } | 94 } |
59 return (static_cast<uint32_t>(rhs.header.timestamp | 95 return (static_cast<uint32_t>(rhs.header.timestamp |
60 - this->header.timestamp) < 0xFFFFFFFF / 2); | 96 - this->header.timestamp) < 0xFFFFFFFF / 2); |
61 } | 97 } |
62 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } | 98 bool operator>(const Packet& rhs) const { return rhs.operator<(*this); } |
63 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } | 99 bool operator<=(const Packet& rhs) const { return !operator>(rhs); } |
64 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } | 100 bool operator>=(const Packet& rhs) const { return !operator<(rhs); } |
65 | 101 |
66 bool empty() const { return !frame && payload.empty(); } | 102 bool empty() const { return !frame && payload.empty(); } |
67 }; | 103 }; |
68 | 104 |
69 // A list of packets. | 105 // A list of packets. |
70 typedef std::list<Packet*> PacketList; | 106 typedef std::list<Packet*> PacketList; |
71 | 107 |
72 } // namespace webrtc | 108 } // namespace webrtc |
73 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ | 109 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ |
OLD | NEW |