Index: webrtc/modules/audio_coding/neteq/payload_splitter.cc |
diff --git a/webrtc/modules/audio_coding/neteq/payload_splitter.cc b/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
index 28e561a65f259fb2de9af916db056a498cc23c80..4131c42d4a3b4b4d166b135cc0d59c75c3a31d29 100644 |
--- a/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
@@ -26,6 +26,12 @@ namespace webrtc { |
// {A1, A2, ..., B, C, ...}. The method then continues with B, and C, until all |
// the original packets have been replaced by their split payloads. |
int PayloadSplitter::SplitRed(PacketList* packet_list) { |
+ // This could be as high as 256 (to match the number of priority levels) but |
+ // very high values here probably indicate some sort of problem. Having a max |
+ // value here makes the implementation easier, since we don't need to deal |
+ // with the (very unexpected) case of more blocks than there are priority |
+ // levels. |
+ const size_t kMaxRedBlocks = 32; |
int ret = kOK; |
PacketList::iterator it = packet_list->begin(); |
while (it != packet_list->end()) { |
@@ -50,7 +56,6 @@ int PayloadSplitter::SplitRed(PacketList* packet_list) { |
uint8_t payload_type; |
uint32_t timestamp; |
size_t payload_length; |
- bool primary; |
}; |
std::vector<RedHeader> new_headers; |
@@ -67,7 +72,6 @@ int PayloadSplitter::SplitRed(PacketList* packet_list) { |
++sum_length; // Account for RED header size of 1 byte. |
new_header.timestamp = red_packet->header.timestamp; |
new_header.payload_length = red_packet->payload.size() - sum_length; |
- new_header.primary = true; // Last block is always primary. |
payload_ptr += 1; // Advance to first payload byte. |
} else { |
// Bits 8 through 21 are timestamp offset. |
@@ -77,7 +81,6 @@ int PayloadSplitter::SplitRed(PacketList* packet_list) { |
// Bits 22 through 31 are payload length. |
new_header.payload_length = |
((payload_ptr[2] & 0x03) << 8) + payload_ptr[3]; |
- new_header.primary = false; |
payload_ptr += 4; // Advance to next RED header. |
} |
sum_length += new_header.payload_length; |
@@ -86,33 +89,41 @@ int PayloadSplitter::SplitRed(PacketList* packet_list) { |
new_headers.push_back(new_header); |
} |
- // Populate the new packets with payload data. |
- // |payload_ptr| now points at the first payload byte. |
- PacketList new_packets; // An empty list to store the split packets in. |
- for (const auto& new_header : new_headers) { |
- size_t payload_length = new_header.payload_length; |
- if (payload_ptr + payload_length > |
- red_packet->payload.data() + red_packet->payload.size()) { |
- // The block lengths in the RED headers do not match the overall packet |
- // length. Something is corrupt. Discard this and the remaining |
- // payloads from this packet. |
- LOG(LS_WARNING) << "SplitRed length mismatch"; |
- ret = kRedLengthMismatch; |
- break; |
+ if (new_headers.size() <= kMaxRedBlocks) { |
+ // Populate the new packets with payload data. |
+ // |payload_ptr| now points at the first payload byte. |
+ PacketList new_packets; // An empty list to store the split packets in. |
+ for (size_t i = 0; i != new_headers.size(); ++i) { |
+ const auto& new_header = new_headers[i]; |
+ size_t payload_length = new_header.payload_length; |
+ if (payload_ptr + payload_length > |
+ red_packet->payload.data() + red_packet->payload.size()) { |
+ // The block lengths in the RED headers do not match the overall |
+ // packet length. Something is corrupt. Discard this and the remaining |
+ // payloads from this packet. |
+ LOG(LS_WARNING) << "SplitRed length mismatch"; |
+ ret = kRedLengthMismatch; |
+ break; |
+ } |
+ |
+ Packet* new_packet = new Packet; |
+ new_packet->header = red_packet->header; |
+ new_packet->header.timestamp = new_header.timestamp; |
+ new_packet->header.payloadType = new_header.payload_type; |
+ new_packet->priority.red_level = |
+ static_cast<uint8_t>((new_headers.size() - 1) - i); |
+ new_packet->payload.SetData(payload_ptr, payload_length); |
+ new_packets.push_front(new_packet); |
+ payload_ptr += payload_length; |
} |
- Packet* new_packet = new Packet; |
- new_packet->header = red_packet->header; |
- new_packet->header.timestamp = new_header.timestamp; |
- new_packet->header.payloadType = new_header.payload_type; |
- new_packet->primary = new_header.primary; |
- new_packet->payload.SetData(payload_ptr, payload_length); |
- new_packets.push_front(new_packet); |
- payload_ptr += payload_length; |
+ // Insert new packets into original list, before the element pointed to by |
+ // iterator |it|. |
+ packet_list->splice(it, new_packets, new_packets.begin(), |
+ new_packets.end()); |
+ } else { |
+ LOG(LS_WARNING) << "SplitRed too many blocks: " << new_headers.size(); |
+ ret = kRedLengthMismatch; |
} |
- // Insert new packets into original list, before the element pointed to by |
- // iterator |it|. |
- packet_list->splice(it, new_packets, new_packets.begin(), |
- new_packets.end()); |
// Delete old packet payload. |
delete (*it); |
// Remove |it| from the packet list. This operation effectively moves the |
@@ -123,64 +134,6 @@ int PayloadSplitter::SplitRed(PacketList* packet_list) { |
return ret; |
} |
-int PayloadSplitter::SplitFec(PacketList* packet_list, |
- DecoderDatabase* decoder_database) { |
- PacketList::iterator it = packet_list->begin(); |
- // Iterate through all packets in |packet_list|. |
- while (it != packet_list->end()) { |
- Packet* packet = (*it); // Just to make the notation more intuitive. |
- // Get codec type for this payload. |
- uint8_t payload_type = packet->header.payloadType; |
- const DecoderDatabase::DecoderInfo* info = |
- decoder_database->GetDecoderInfo(payload_type); |
- if (!info) { |
- LOG(LS_WARNING) << "SplitFec unknown payload type"; |
- return kUnknownPayloadType; |
- } |
- |
- // Not an FEC packet. |
- AudioDecoder* decoder = decoder_database->GetDecoder(payload_type); |
- // decoder should not return NULL, except for comfort noise payloads which |
- // are handled separately. |
- assert(decoder != NULL || decoder_database->IsComfortNoise(payload_type)); |
- if (!decoder || |
- !decoder->PacketHasFec(packet->payload.data(), |
- packet->payload.size())) { |
- ++it; |
- continue; |
- } |
- |
- switch (info->codec_type) { |
- case NetEqDecoder::kDecoderOpus: |
- case NetEqDecoder::kDecoderOpus_2ch: { |
- // The main payload of this packet should be decoded as a primary |
- // payload, even if it comes as a secondary payload in a RED packet. |
- packet->primary = true; |
- |
- Packet* new_packet = new Packet; |
- new_packet->header = packet->header; |
- int duration = decoder->PacketDurationRedundant(packet->payload.data(), |
- packet->payload.size()); |
- new_packet->header.timestamp -= duration; |
- new_packet->payload.SetData(packet->payload); |
- new_packet->primary = false; |
- // Waiting time should not be set here. |
- RTC_DCHECK(!packet->waiting_time); |
- |
- packet_list->insert(it, new_packet); |
- break; |
- } |
- default: { |
- LOG(LS_WARNING) << "SplitFec wrong payload type"; |
- return kFecSplitError; |
- } |
- } |
- |
- ++it; |
- } |
- return kOK; |
-} |
- |
int PayloadSplitter::CheckRedPayloads(PacketList* packet_list, |
const DecoderDatabase& decoder_database) { |
PacketList::iterator it = packet_list->begin(); |