a70695a3e1
The biggest change to NetEq is the move from a primary flag, to a Priority with two separate levels: one set by RED splitting and one set by the codec itself. This allows us to unambigously prioritize "fallback" packets from these two sources. I've chosen what I believe is the sensible ordering: packets that the codec prioritizes are chosen first, regardless of if they are secondary RED packets or not. So if we were to use Opus w/ FEC in RED, we'd only do Opus FEC decoding if there was no RED packet that could cover the time slot. With this change, PayloadSplitter now only deals with RED packets. Maybe it should be renamed RedPayloadSplitter? BUG=webrtc:5805 Review-Url: https://codereview.webrtc.org/2342443005 Cr-Commit-Position: refs/heads/master@{#14347}
115 lines
4.2 KiB
C++
115 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
|
|
|
|
#include <list>
|
|
#include <memory>
|
|
|
|
#include "webrtc/base/buffer.h"
|
|
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
|
|
#include "webrtc/modules/audio_coding/neteq/tick_timer.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Struct for holding RTP packets.
|
|
struct Packet {
|
|
struct Priority {
|
|
Priority() : codec_level(0), red_level(0) {}
|
|
Priority(int codec_level, int red_level)
|
|
: codec_level(codec_level), red_level(red_level) {
|
|
CheckInvariant();
|
|
}
|
|
|
|
int codec_level;
|
|
int red_level;
|
|
|
|
// Priorities are sorted low-to-high, first on the level the codec
|
|
// prioritizes it, then on the level of RED packet it is; i.e. if it is a
|
|
// primary or secondary payload of a RED packet. For example: with Opus, an
|
|
// Fec packet (which the decoder prioritizes lower than a regular packet)
|
|
// will not be used if there is _any_ RED payload for the same
|
|
// timeframe. The highest priority packet will have levels {0, 0}. Negative
|
|
// priorities are not allowed.
|
|
bool operator<(const Priority& b) const {
|
|
CheckInvariant();
|
|
b.CheckInvariant();
|
|
if (codec_level == b.codec_level)
|
|
return red_level < b.red_level;
|
|
|
|
return codec_level < b.codec_level;
|
|
}
|
|
bool operator==(const Priority& b) const {
|
|
CheckInvariant();
|
|
b.CheckInvariant();
|
|
return codec_level == b.codec_level && red_level == b.red_level;
|
|
}
|
|
bool operator!=(const Priority& b) const { return !(*this == b); }
|
|
bool operator>(const Priority& b) const { return b < *this; }
|
|
bool operator<=(const Priority& b) const { return !(b > *this); }
|
|
bool operator>=(const Priority& b) const { return !(b < *this); }
|
|
|
|
private:
|
|
void CheckInvariant() const {
|
|
RTC_DCHECK_GE(codec_level, 0);
|
|
RTC_DCHECK_GE(red_level, 0);
|
|
}
|
|
};
|
|
|
|
RTPHeader header;
|
|
// Datagram excluding RTP header and header extension.
|
|
rtc::Buffer payload;
|
|
Priority priority;
|
|
std::unique_ptr<TickTimer::Stopwatch> waiting_time;
|
|
std::unique_ptr<AudioDecoder::EncodedAudioFrame> frame;
|
|
|
|
Packet();
|
|
~Packet();
|
|
|
|
// Comparison operators. Establish a packet ordering based on (1) timestamp,
|
|
// (2) sequence number and (3) redundancy.
|
|
// Timestamp and sequence numbers are compared taking wrap-around into
|
|
// 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->priority == rhs.priority);
|
|
}
|
|
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 - deem the left hand
|
|
// side to be "smaller" (i.e., "earlier") if it has higher priority.
|
|
return this->priority < rhs.priority;
|
|
}
|
|
return (static_cast<uint16_t>(rhs.header.sequenceNumber
|
|
- this->header.sequenceNumber) < 0xFFFF / 2);
|
|
}
|
|
return (static_cast<uint32_t>(rhs.header.timestamp
|
|
- this->header.timestamp) < 0xFFFFFFFF / 2);
|
|
}
|
|
bool operator>(const Packet& rhs) const { return rhs.operator<(*this); }
|
|
bool operator<=(const Packet& rhs) const { return !operator>(rhs); }
|
|
bool operator>=(const Packet& rhs) const { return !operator<(rhs); }
|
|
|
|
bool empty() const { return !frame && payload.empty(); }
|
|
};
|
|
|
|
// A list of packets.
|
|
typedef std::list<Packet*> PacketList;
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
|