2013-01-29 12:09:21 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// Unit tests for PayloadSplitter class.
|
|
|
|
|
|
2014-06-09 08:10:28 +00:00
|
|
|
#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
2016-02-14 09:28:33 -08:00
|
|
|
#include <memory>
|
2013-01-29 12:09:21 +00:00
|
|
|
#include <utility> // pair
|
|
|
|
|
|
2014-09-04 09:55:40 +00:00
|
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
2016-05-03 01:39:01 -07:00
|
|
|
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
|
2014-06-09 08:10:28 +00:00
|
|
|
#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/packet.h"
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
using ::testing::Return;
|
|
|
|
|
using ::testing::ReturnNull;
|
|
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
static const int kRedPayloadType = 100;
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
static const size_t kPayloadLength = 10;
|
|
|
|
|
static const size_t kRedHeaderLength = 4; // 4 bytes RED header.
|
2013-01-29 12:09:21 +00:00
|
|
|
static const uint16_t kSequenceNumber = 0;
|
|
|
|
|
static const uint32_t kBaseTimestamp = 0x12345678;
|
|
|
|
|
|
2015-02-13 14:01:54 +00:00
|
|
|
// A possible Opus packet that contains FEC is the following.
|
|
|
|
|
// The frame is 20 ms in duration.
|
|
|
|
|
//
|
|
|
|
|
// 0 1 2 3
|
|
|
|
|
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
|
// |0|0|0|0|1|0|0|0|x|1|x|x|x|x|x|x|x| |
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
|
|
|
|
|
// | Compressed frame 1 (N-2 bytes)... :
|
|
|
|
|
// : |
|
|
|
|
|
// | |
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
|
void CreateOpusFecPayload(uint8_t* payload, size_t payload_length,
|
|
|
|
|
uint8_t payload_value) {
|
|
|
|
|
if (payload_length < 2) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
payload[0] = 0x08;
|
|
|
|
|
payload[1] = 0x40;
|
|
|
|
|
memset(&payload[2], payload_value, payload_length - 2);
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-29 12:09:21 +00:00
|
|
|
// RED headers (according to RFC 2198):
|
|
|
|
|
//
|
|
|
|
|
// 0 1 2 3
|
|
|
|
|
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
|
// |F| block PT | timestamp offset | block length |
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
|
//
|
|
|
|
|
// Last RED header:
|
|
|
|
|
// 0 1 2 3 4 5 6 7
|
|
|
|
|
// +-+-+-+-+-+-+-+-+
|
|
|
|
|
// |0| Block PT |
|
|
|
|
|
// +-+-+-+-+-+-+-+-+
|
|
|
|
|
|
|
|
|
|
// Creates a RED packet, with |num_payloads| payloads, with payload types given
|
|
|
|
|
// by the values in array |payload_types| (which must be of length
|
|
|
|
|
// |num_payloads|). Each redundant payload is |timestamp_offset| samples
|
|
|
|
|
// "behind" the the previous payload.
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
Packet* CreateRedPayload(size_t num_payloads,
|
2013-01-29 12:09:21 +00:00
|
|
|
uint8_t* payload_types,
|
2015-02-13 14:01:54 +00:00
|
|
|
int timestamp_offset,
|
|
|
|
|
bool embed_opus_fec = false) {
|
2013-01-29 12:09:21 +00:00
|
|
|
Packet* packet = new Packet;
|
|
|
|
|
packet->header.payloadType = kRedPayloadType;
|
|
|
|
|
packet->header.timestamp = kBaseTimestamp;
|
|
|
|
|
packet->header.sequenceNumber = kSequenceNumber;
|
2016-08-31 08:51:13 -07:00
|
|
|
packet->payload.SetSize((kPayloadLength + 1) +
|
|
|
|
|
(num_payloads - 1) *
|
|
|
|
|
(kPayloadLength + kRedHeaderLength));
|
|
|
|
|
uint8_t* payload_ptr = packet->payload.data();
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
for (size_t i = 0; i < num_payloads; ++i) {
|
2013-01-29 12:09:21 +00:00
|
|
|
// Write the RED headers.
|
|
|
|
|
if (i == num_payloads - 1) {
|
|
|
|
|
// Special case for last payload.
|
|
|
|
|
*payload_ptr = payload_types[i] & 0x7F; // F = 0;
|
|
|
|
|
++payload_ptr;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
*payload_ptr = payload_types[i] & 0x7F;
|
|
|
|
|
// Not the last block; set F = 1.
|
|
|
|
|
*payload_ptr |= 0x80;
|
|
|
|
|
++payload_ptr;
|
|
|
|
|
int this_offset = (num_payloads - i - 1) * timestamp_offset;
|
|
|
|
|
*payload_ptr = this_offset >> 6;
|
|
|
|
|
++payload_ptr;
|
|
|
|
|
assert(kPayloadLength <= 1023); // Max length described by 10 bits.
|
|
|
|
|
*payload_ptr = ((this_offset & 0x3F) << 2) | (kPayloadLength >> 8);
|
|
|
|
|
++payload_ptr;
|
|
|
|
|
*payload_ptr = kPayloadLength & 0xFF;
|
|
|
|
|
++payload_ptr;
|
|
|
|
|
}
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
for (size_t i = 0; i < num_payloads; ++i) {
|
2013-01-29 12:09:21 +00:00
|
|
|
// Write |i| to all bytes in each payload.
|
2015-02-13 14:01:54 +00:00
|
|
|
if (embed_opus_fec) {
|
|
|
|
|
CreateOpusFecPayload(payload_ptr, kPayloadLength,
|
|
|
|
|
static_cast<uint8_t>(i));
|
|
|
|
|
} else {
|
|
|
|
|
memset(payload_ptr, static_cast<int>(i), kPayloadLength);
|
|
|
|
|
}
|
2013-01-29 12:09:21 +00:00
|
|
|
payload_ptr += kPayloadLength;
|
|
|
|
|
}
|
|
|
|
|
return packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create a packet with all payload bytes set to |payload_value|.
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
Packet* CreatePacket(uint8_t payload_type, size_t payload_length,
|
2015-02-13 14:01:54 +00:00
|
|
|
uint8_t payload_value, bool opus_fec = false) {
|
2013-01-29 12:09:21 +00:00
|
|
|
Packet* packet = new Packet;
|
|
|
|
|
packet->header.payloadType = payload_type;
|
|
|
|
|
packet->header.timestamp = kBaseTimestamp;
|
|
|
|
|
packet->header.sequenceNumber = kSequenceNumber;
|
2016-08-31 08:51:13 -07:00
|
|
|
packet->payload.SetSize(payload_length);
|
2015-02-13 14:01:54 +00:00
|
|
|
if (opus_fec) {
|
2016-08-31 08:51:13 -07:00
|
|
|
CreateOpusFecPayload(packet->payload.data(), packet->payload.size(),
|
2015-02-13 14:01:54 +00:00
|
|
|
payload_value);
|
|
|
|
|
} else {
|
2016-08-31 08:51:13 -07:00
|
|
|
memset(packet->payload.data(), payload_value, packet->payload.size());
|
2015-02-13 14:01:54 +00:00
|
|
|
}
|
2013-01-29 12:09:21 +00:00
|
|
|
return packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Checks that |packet| has the attributes given in the remaining parameters.
|
|
|
|
|
void VerifyPacket(const Packet* packet,
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t payload_length,
|
2013-01-29 12:09:21 +00:00
|
|
|
uint8_t payload_type,
|
|
|
|
|
uint16_t sequence_number,
|
|
|
|
|
uint32_t timestamp,
|
|
|
|
|
uint8_t payload_value,
|
|
|
|
|
bool primary = true) {
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(payload_length, packet->payload.size());
|
2013-01-29 12:09:21 +00:00
|
|
|
EXPECT_EQ(payload_type, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(sequence_number, packet->header.sequenceNumber);
|
|
|
|
|
EXPECT_EQ(timestamp, packet->header.timestamp);
|
|
|
|
|
EXPECT_EQ(primary, packet->primary);
|
2016-08-31 08:51:13 -07:00
|
|
|
ASSERT_FALSE(packet->payload.empty());
|
|
|
|
|
for (size_t i = 0; i < packet->payload.size(); ++i) {
|
2016-09-21 01:57:31 -07:00
|
|
|
ASSERT_EQ(payload_value, packet->payload.data()[i]);
|
2013-01-29 12:09:21 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Start of test definitions.
|
|
|
|
|
|
|
|
|
|
TEST(PayloadSplitter, CreateAndDestroy) {
|
|
|
|
|
PayloadSplitter* splitter = new PayloadSplitter;
|
|
|
|
|
delete splitter;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Packet A is split into A1 and A2.
|
|
|
|
|
TEST(RedPayloadSplitter, OnePacketTwoPayloads) {
|
|
|
|
|
uint8_t payload_types[] = {0, 0};
|
|
|
|
|
const int kTimestampOffset = 160;
|
|
|
|
|
Packet* packet = CreateRedPayload(2, payload_types, kTimestampOffset);
|
|
|
|
|
PacketList packet_list;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK, splitter.SplitRed(&packet_list));
|
|
|
|
|
ASSERT_EQ(2u, packet_list.size());
|
|
|
|
|
// Check first packet. The first in list should always be the primary payload.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[1], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp, 1, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check second packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp - kTimestampOffset, 0, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Packets A and B are not split at all. Only the RED header in each packet is
|
|
|
|
|
// removed.
|
|
|
|
|
TEST(RedPayloadSplitter, TwoPacketsOnePayload) {
|
|
|
|
|
uint8_t payload_types[] = {0};
|
|
|
|
|
const int kTimestampOffset = 160;
|
|
|
|
|
// Create first packet, with a single RED payload.
|
|
|
|
|
Packet* packet = CreateRedPayload(1, payload_types, kTimestampOffset);
|
|
|
|
|
PacketList packet_list;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
// Create second packet, with a single RED payload.
|
|
|
|
|
packet = CreateRedPayload(1, payload_types, kTimestampOffset);
|
|
|
|
|
// Manually change timestamp and sequence number of second packet.
|
|
|
|
|
packet->header.timestamp += kTimestampOffset;
|
|
|
|
|
packet->header.sequenceNumber++;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK, splitter.SplitRed(&packet_list));
|
|
|
|
|
ASSERT_EQ(2u, packet_list.size());
|
|
|
|
|
// Check first packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp, 0, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check second packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber + 1,
|
|
|
|
|
kBaseTimestamp + kTimestampOffset, 0, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Packets A and B are split into packets A1, A2, A3, B1, B2, B3, with
|
|
|
|
|
// attributes as follows:
|
|
|
|
|
//
|
|
|
|
|
// A1* A2 A3 B1* B2 B3
|
|
|
|
|
// Payload type 0 1 2 0 1 2
|
|
|
|
|
// Timestamp b b-o b-2o b+o b b-o
|
|
|
|
|
// Sequence number 0 0 0 1 1 1
|
|
|
|
|
//
|
|
|
|
|
// b = kBaseTimestamp, o = kTimestampOffset, * = primary.
|
|
|
|
|
TEST(RedPayloadSplitter, TwoPacketsThreePayloads) {
|
|
|
|
|
uint8_t payload_types[] = {2, 1, 0}; // Primary is the last one.
|
|
|
|
|
const int kTimestampOffset = 160;
|
|
|
|
|
// Create first packet, with 3 RED payloads.
|
|
|
|
|
Packet* packet = CreateRedPayload(3, payload_types, kTimestampOffset);
|
|
|
|
|
PacketList packet_list;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
// Create first packet, with 3 RED payloads.
|
|
|
|
|
packet = CreateRedPayload(3, payload_types, kTimestampOffset);
|
|
|
|
|
// Manually change timestamp and sequence number of second packet.
|
|
|
|
|
packet->header.timestamp += kTimestampOffset;
|
|
|
|
|
packet->header.sequenceNumber++;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK, splitter.SplitRed(&packet_list));
|
|
|
|
|
ASSERT_EQ(6u, packet_list.size());
|
|
|
|
|
// Check first packet, A1.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[2], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp, 2, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check second packet, A2.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[1], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp - kTimestampOffset, 1, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check third packet, A3.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp - 2 * kTimestampOffset, 0, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check fourth packet, B1.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[2], kSequenceNumber + 1,
|
|
|
|
|
kBaseTimestamp + kTimestampOffset, 2, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check fifth packet, B2.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[1], kSequenceNumber + 1,
|
|
|
|
|
kBaseTimestamp, 1, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
// Check sixth packet, B3.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber + 1,
|
|
|
|
|
kBaseTimestamp - kTimestampOffset, 0, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Creates a list with 4 packets with these payload types:
|
|
|
|
|
// 0 = CNGnb
|
|
|
|
|
// 1 = PCMu
|
|
|
|
|
// 2 = DTMF (AVT)
|
|
|
|
|
// 3 = iLBC
|
|
|
|
|
// We expect the method CheckRedPayloads to discard the iLBC packet, since it
|
|
|
|
|
// is a non-CNG, non-DTMF payload of another type than the first speech payload
|
|
|
|
|
// found in the list (which is PCMu).
|
|
|
|
|
TEST(RedPayloadSplitter, CheckRedPayloads) {
|
|
|
|
|
PacketList packet_list;
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
for (uint8_t i = 0; i <= 3; ++i) {
|
2013-01-29 12:09:21 +00:00
|
|
|
// Create packet with payload type |i|, payload length 10 bytes, all 0.
|
|
|
|
|
Packet* packet = CreatePacket(i, 10, 0);
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Use a real DecoderDatabase object here instead of a mock, since it is
|
|
|
|
|
// easier to just register the payload types and let the actual implementation
|
|
|
|
|
// do its job.
|
2016-05-19 10:48:04 -07:00
|
|
|
DecoderDatabase decoder_database(
|
|
|
|
|
new rtc::RefCountedObject<MockAudioDecoderFactory>);
|
2015-12-09 06:20:58 -08:00
|
|
|
decoder_database.RegisterPayload(0, NetEqDecoder::kDecoderCNGnb, "cng-nb");
|
|
|
|
|
decoder_database.RegisterPayload(1, NetEqDecoder::kDecoderPCMu, "pcmu");
|
|
|
|
|
decoder_database.RegisterPayload(2, NetEqDecoder::kDecoderAVT, "avt");
|
|
|
|
|
decoder_database.RegisterPayload(3, NetEqDecoder::kDecoderILBC, "ilbc");
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
splitter.CheckRedPayloads(&packet_list, decoder_database);
|
|
|
|
|
|
|
|
|
|
ASSERT_EQ(3u, packet_list.size()); // Should have dropped the last packet.
|
|
|
|
|
// Verify packets. The loop verifies that payload types 0, 1, and 2 are in the
|
|
|
|
|
// list.
|
|
|
|
|
for (int i = 0; i <= 2; ++i) {
|
|
|
|
|
Packet* packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, 10, i, kSequenceNumber, kBaseTimestamp, 0, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
}
|
|
|
|
|
EXPECT_TRUE(packet_list.empty());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Packet A is split into A1, A2 and A3. But the length parameter is off, so
|
|
|
|
|
// the last payloads should be discarded.
|
|
|
|
|
TEST(RedPayloadSplitter, WrongPayloadLength) {
|
|
|
|
|
uint8_t payload_types[] = {0, 0, 0};
|
|
|
|
|
const int kTimestampOffset = 160;
|
|
|
|
|
Packet* packet = CreateRedPayload(3, payload_types, kTimestampOffset);
|
|
|
|
|
// Manually tamper with the payload length of the packet.
|
|
|
|
|
// This is one byte too short for the second payload (out of three).
|
|
|
|
|
// We expect only the first payload to be returned.
|
2016-08-31 08:51:13 -07:00
|
|
|
packet->payload.SetSize(packet->payload.size() - (kPayloadLength + 1));
|
2013-01-29 12:09:21 +00:00
|
|
|
PacketList packet_list;
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kRedLengthMismatch,
|
|
|
|
|
splitter.SplitRed(&packet_list));
|
|
|
|
|
ASSERT_EQ(1u, packet_list.size());
|
|
|
|
|
// Check first packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
|
|
|
|
|
kBaseTimestamp - 2 * kTimestampOffset, 0, false);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-21 12:07:40 +00:00
|
|
|
TEST(FecPayloadSplitter, MixedPayload) {
|
|
|
|
|
PacketList packet_list;
|
2016-05-03 01:39:01 -07:00
|
|
|
DecoderDatabase decoder_database(CreateBuiltinAudioDecoderFactory());
|
2014-03-21 12:07:40 +00:00
|
|
|
|
2015-12-09 06:20:58 -08:00
|
|
|
decoder_database.RegisterPayload(0, NetEqDecoder::kDecoderOpus, "opus");
|
|
|
|
|
decoder_database.RegisterPayload(1, NetEqDecoder::kDecoderPCMu, "pcmu");
|
2014-03-21 12:07:40 +00:00
|
|
|
|
2015-02-13 14:01:54 +00:00
|
|
|
Packet* packet = CreatePacket(0, 10, 0xFF, true);
|
2014-03-21 12:07:40 +00:00
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
|
|
|
|
|
packet = CreatePacket(0, 10, 0); // Non-FEC Opus payload.
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
|
|
|
|
|
packet = CreatePacket(1, 10, 0); // Non-Opus payload.
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK,
|
|
|
|
|
splitter.SplitFec(&packet_list, &decoder_database));
|
|
|
|
|
EXPECT_EQ(4u, packet_list.size());
|
|
|
|
|
|
|
|
|
|
// Check first packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
2014-07-18 21:11:27 +00:00
|
|
|
EXPECT_EQ(kBaseTimestamp - 20 * 48, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(10U, packet->payload.size());
|
2014-03-21 12:07:40 +00:00
|
|
|
EXPECT_FALSE(packet->primary);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check second packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(kBaseTimestamp, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(10U, packet->payload.size());
|
2014-03-21 12:07:40 +00:00
|
|
|
EXPECT_TRUE(packet->primary);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check third packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, 10, 0, kSequenceNumber, kBaseTimestamp, 0, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check fourth packet.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
VerifyPacket(packet, 10, 1, kSequenceNumber, kBaseTimestamp, 0, true);
|
|
|
|
|
delete packet;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:01:54 +00:00
|
|
|
TEST(FecPayloadSplitter, EmbedFecInRed) {
|
|
|
|
|
PacketList packet_list;
|
2016-05-03 01:39:01 -07:00
|
|
|
DecoderDatabase decoder_database(CreateBuiltinAudioDecoderFactory());
|
2015-02-13 14:01:54 +00:00
|
|
|
|
|
|
|
|
const int kTimestampOffset = 20 * 48; // 20 ms * 48 kHz.
|
|
|
|
|
uint8_t payload_types[] = {0, 0};
|
2015-12-09 06:20:58 -08:00
|
|
|
decoder_database.RegisterPayload(0, NetEqDecoder::kDecoderOpus, "opus");
|
2015-02-13 14:01:54 +00:00
|
|
|
Packet* packet = CreateRedPayload(2, payload_types, kTimestampOffset, true);
|
|
|
|
|
packet_list.push_back(packet);
|
|
|
|
|
|
|
|
|
|
PayloadSplitter splitter;
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK,
|
|
|
|
|
splitter.SplitRed(&packet_list));
|
|
|
|
|
EXPECT_EQ(PayloadSplitter::kOK,
|
|
|
|
|
splitter.SplitFec(&packet_list, &decoder_database));
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(4u, packet_list.size());
|
|
|
|
|
|
|
|
|
|
// Check first packet. FEC packet copied from primary payload in RED.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(kBaseTimestamp - kTimestampOffset, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(kPayloadLength, packet->payload.size());
|
2015-02-13 14:01:54 +00:00
|
|
|
EXPECT_FALSE(packet->primary);
|
|
|
|
|
EXPECT_EQ(packet->payload[3], 1);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check second packet. Normal packet copied from primary payload in RED.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(kBaseTimestamp, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(kPayloadLength, packet->payload.size());
|
2015-02-13 14:01:54 +00:00
|
|
|
EXPECT_TRUE(packet->primary);
|
|
|
|
|
EXPECT_EQ(packet->payload[3], 1);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check third packet. FEC packet copied from secondary payload in RED.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(kBaseTimestamp - 2 * kTimestampOffset, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(kPayloadLength, packet->payload.size());
|
2015-02-13 14:01:54 +00:00
|
|
|
EXPECT_FALSE(packet->primary);
|
|
|
|
|
EXPECT_EQ(packet->payload[3], 0);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
|
|
|
|
|
// Check fourth packet. Normal packet copied from primary payload in RED.
|
|
|
|
|
packet = packet_list.front();
|
|
|
|
|
EXPECT_EQ(0, packet->header.payloadType);
|
|
|
|
|
EXPECT_EQ(kBaseTimestamp - kTimestampOffset, packet->header.timestamp);
|
2016-08-31 08:51:13 -07:00
|
|
|
EXPECT_EQ(kPayloadLength, packet->payload.size());
|
2015-02-13 14:01:54 +00:00
|
|
|
EXPECT_TRUE(packet->primary);
|
|
|
|
|
EXPECT_EQ(packet->payload[3], 0);
|
|
|
|
|
delete packet;
|
|
|
|
|
packet_list.pop_front();
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-29 12:09:21 +00:00
|
|
|
} // namespace webrtc
|