2017-09-15 09:56:08 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2017 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.
|
|
|
|
|
*/
|
|
|
|
|
|
Reland "Delete test/constants.h"
This reverts commit 4f36b7a478c2763463c7a9ea970548ec68bc3ea6.
Reason for revert: Failing tests fixed.
Original change's description:
> Revert "Delete test/constants.h"
>
> This reverts commit 389b1672a32f2dd49af6c6ed40e8ddf394b986de.
>
> Reason for revert: Causes failure (and empty result list) in CallPerfTest.PadsToMinTransmitBitrate
>
> Original change's description:
> > Delete test/constants.h
> >
> > It's not possible to use constants.h for all RTP extensions
> > after the number of extensions exceeds 14, which is the maximum
> > number of one-byte RTP extensions. This is because some extensions
> > would have to be assigned a number greater than 14, even if the
> > test only involves 14 extensions or less.
> >
> > For uniformity's sake, this CL also edits some files to use an
> > enum as the files involved in this CL, rather than free-floating
> > const-ints.
> >
> > Bug: webrtc:10288
> > Change-Id: Ib5e58ad72c4d3756f4c4f6521f140ec59617f3f5
> > Reviewed-on: https://webrtc-review.googlesource.com/c/123048
> > Commit-Queue: Elad Alon <eladalon@webrtc.org>
> > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#26728}
>
> TBR=danilchap@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
>
> Bug: webrtc:10288, chromium:933127
> Change-Id: If1de0bd8992137c52bf0b877b3cb0a2bafc809d4
> Reviewed-on: https://webrtc-review.googlesource.com/c/123381
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26744}
TBR=danilchap@webrtc.org,oprypin@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
Change-Id: I65e391325d3a6df6db3c0739185e2002e70fb954
Bug: webrtc:10288, chromium:933127
Reviewed-on: https://webrtc-review.googlesource.com/c/123384
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26750}
2019-02-18 23:45:57 +01:00
|
|
|
#include <string>
|
|
|
|
|
#include <utility>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
2019-12-06 12:34:57 +01:00
|
|
|
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
|
|
|
|
|
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
|
|
|
|
|
#include "modules/rtp_rtcp/source/rtp_packet.h"
|
2017-09-15 09:56:08 -07:00
|
|
|
#include "test/call_test.h"
|
2019-02-15 10:54:55 +01:00
|
|
|
#include "test/field_trial.h"
|
2017-09-15 09:56:08 -07:00
|
|
|
#include "test/gtest.h"
|
|
|
|
|
#include "test/rtcp_packet_parser.h"
|
|
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
namespace test {
|
|
|
|
|
namespace {
|
|
|
|
|
|
Reland "Delete test/constants.h"
This reverts commit 4f36b7a478c2763463c7a9ea970548ec68bc3ea6.
Reason for revert: Failing tests fixed.
Original change's description:
> Revert "Delete test/constants.h"
>
> This reverts commit 389b1672a32f2dd49af6c6ed40e8ddf394b986de.
>
> Reason for revert: Causes failure (and empty result list) in CallPerfTest.PadsToMinTransmitBitrate
>
> Original change's description:
> > Delete test/constants.h
> >
> > It's not possible to use constants.h for all RTP extensions
> > after the number of extensions exceeds 14, which is the maximum
> > number of one-byte RTP extensions. This is because some extensions
> > would have to be assigned a number greater than 14, even if the
> > test only involves 14 extensions or less.
> >
> > For uniformity's sake, this CL also edits some files to use an
> > enum as the files involved in this CL, rather than free-floating
> > const-ints.
> >
> > Bug: webrtc:10288
> > Change-Id: Ib5e58ad72c4d3756f4c4f6521f140ec59617f3f5
> > Reviewed-on: https://webrtc-review.googlesource.com/c/123048
> > Commit-Queue: Elad Alon <eladalon@webrtc.org>
> > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#26728}
>
> TBR=danilchap@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
>
> Bug: webrtc:10288, chromium:933127
> Change-Id: If1de0bd8992137c52bf0b877b3cb0a2bafc809d4
> Reviewed-on: https://webrtc-review.googlesource.com/c/123381
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26744}
TBR=danilchap@webrtc.org,oprypin@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
Change-Id: I65e391325d3a6df6db3c0739185e2002e70fb954
Bug: webrtc:10288, chromium:933127
Reviewed-on: https://webrtc-review.googlesource.com/c/123384
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26750}
2019-02-18 23:45:57 +01:00
|
|
|
enum : int { // The first valid value is 1.
|
|
|
|
|
kAudioLevelExtensionId = 1,
|
|
|
|
|
kTransportSequenceNumberExtensionId,
|
|
|
|
|
};
|
|
|
|
|
|
2017-09-15 09:56:08 -07:00
|
|
|
class AudioSendTest : public SendTest {
|
|
|
|
|
public:
|
2022-08-16 11:02:45 +00:00
|
|
|
AudioSendTest() : SendTest(CallTest::kDefaultTimeout) {}
|
2017-09-15 09:56:08 -07:00
|
|
|
|
|
|
|
|
size_t GetNumVideoStreams() const override { return 0; }
|
|
|
|
|
size_t GetNumAudioStreams() const override { return 1; }
|
|
|
|
|
size_t GetNumFlexfecStreams() const override { return 0; }
|
|
|
|
|
};
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
|
|
using AudioSendStreamCallTest = CallTest;
|
|
|
|
|
|
|
|
|
|
TEST_F(AudioSendStreamCallTest, SupportsCName) {
|
|
|
|
|
static std::string kCName = "PjqatC14dGfbVwGPUOA9IH7RlsFDbWl4AhXEiDsBizo=";
|
|
|
|
|
class CNameObserver : public AudioSendTest {
|
|
|
|
|
public:
|
|
|
|
|
CNameObserver() = default;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
Action OnSendRtcp(const uint8_t* packet, size_t length) override {
|
|
|
|
|
RtcpPacketParser parser;
|
|
|
|
|
EXPECT_TRUE(parser.Parse(packet, length));
|
|
|
|
|
if (parser.sdes()->num_packets() > 0) {
|
|
|
|
|
EXPECT_EQ(1u, parser.sdes()->chunks().size());
|
|
|
|
|
EXPECT_EQ(kCName, parser.sdes()->chunks()[0].cname);
|
|
|
|
|
|
|
|
|
|
observation_complete_.Set();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return SEND_PACKET;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-22 20:47:28 +02:00
|
|
|
void ModifyAudioConfigs(AudioSendStream::Config* send_config,
|
|
|
|
|
std::vector<AudioReceiveStreamInterface::Config>*
|
|
|
|
|
receive_configs) override {
|
2017-09-15 09:56:08 -07:00
|
|
|
send_config->rtp.c_name = kCName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PerformTest() override {
|
|
|
|
|
EXPECT_TRUE(Wait()) << "Timed out while waiting for RTCP with CNAME.";
|
|
|
|
|
}
|
|
|
|
|
} test;
|
|
|
|
|
|
|
|
|
|
RunBaseTest(&test);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(AudioSendStreamCallTest, NoExtensionsByDefault) {
|
|
|
|
|
class NoExtensionsObserver : public AudioSendTest {
|
|
|
|
|
public:
|
|
|
|
|
NoExtensionsObserver() = default;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
Action OnSendRtp(const uint8_t* packet, size_t length) override {
|
2019-12-06 12:34:57 +01:00
|
|
|
RtpPacket rtp_packet;
|
|
|
|
|
EXPECT_TRUE(rtp_packet.Parse(packet, length)); // rtp packet is valid.
|
|
|
|
|
EXPECT_EQ(packet[0] & 0b0001'0000, 0); // extension bit not set.
|
2017-09-15 09:56:08 -07:00
|
|
|
|
2019-12-06 12:34:57 +01:00
|
|
|
observation_complete_.Set();
|
2017-09-15 09:56:08 -07:00
|
|
|
return SEND_PACKET;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-22 20:47:28 +02:00
|
|
|
void ModifyAudioConfigs(AudioSendStream::Config* send_config,
|
|
|
|
|
std::vector<AudioReceiveStreamInterface::Config>*
|
|
|
|
|
receive_configs) override {
|
2017-09-15 09:56:08 -07:00
|
|
|
send_config->rtp.extensions.clear();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PerformTest() override {
|
|
|
|
|
EXPECT_TRUE(Wait()) << "Timed out while waiting for a single RTP packet.";
|
|
|
|
|
}
|
|
|
|
|
} test;
|
|
|
|
|
|
|
|
|
|
RunBaseTest(&test);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(AudioSendStreamCallTest, SupportsAudioLevel) {
|
|
|
|
|
class AudioLevelObserver : public AudioSendTest {
|
|
|
|
|
public:
|
|
|
|
|
AudioLevelObserver() : AudioSendTest() {
|
2019-12-06 12:34:57 +01:00
|
|
|
extensions_.Register<AudioLevel>(kAudioLevelExtensionId);
|
2017-09-15 09:56:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Action OnSendRtp(const uint8_t* packet, size_t length) override {
|
2019-12-06 12:34:57 +01:00
|
|
|
RtpPacket rtp_packet(&extensions_);
|
|
|
|
|
EXPECT_TRUE(rtp_packet.Parse(packet, length));
|
2017-09-15 09:56:08 -07:00
|
|
|
|
2019-12-06 12:34:57 +01:00
|
|
|
uint8_t audio_level = 0;
|
|
|
|
|
bool voice = false;
|
|
|
|
|
EXPECT_TRUE(rtp_packet.GetExtension<AudioLevel>(&voice, &audio_level));
|
|
|
|
|
if (audio_level != 0) {
|
2017-09-15 09:56:08 -07:00
|
|
|
// Wait for at least one packet with a non-zero level.
|
|
|
|
|
observation_complete_.Set();
|
|
|
|
|
} else {
|
2017-11-09 11:09:25 +01:00
|
|
|
RTC_LOG(LS_WARNING) << "Got a packet with zero audioLevel - waiting"
|
|
|
|
|
" for another packet...";
|
2017-09-15 09:56:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return SEND_PACKET;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-22 20:47:28 +02:00
|
|
|
void ModifyAudioConfigs(AudioSendStream::Config* send_config,
|
|
|
|
|
std::vector<AudioReceiveStreamInterface::Config>*
|
|
|
|
|
receive_configs) override {
|
2017-09-15 09:56:08 -07:00
|
|
|
send_config->rtp.extensions.clear();
|
Reland "Delete test/constants.h"
This reverts commit 4f36b7a478c2763463c7a9ea970548ec68bc3ea6.
Reason for revert: Failing tests fixed.
Original change's description:
> Revert "Delete test/constants.h"
>
> This reverts commit 389b1672a32f2dd49af6c6ed40e8ddf394b986de.
>
> Reason for revert: Causes failure (and empty result list) in CallPerfTest.PadsToMinTransmitBitrate
>
> Original change's description:
> > Delete test/constants.h
> >
> > It's not possible to use constants.h for all RTP extensions
> > after the number of extensions exceeds 14, which is the maximum
> > number of one-byte RTP extensions. This is because some extensions
> > would have to be assigned a number greater than 14, even if the
> > test only involves 14 extensions or less.
> >
> > For uniformity's sake, this CL also edits some files to use an
> > enum as the files involved in this CL, rather than free-floating
> > const-ints.
> >
> > Bug: webrtc:10288
> > Change-Id: Ib5e58ad72c4d3756f4c4f6521f140ec59617f3f5
> > Reviewed-on: https://webrtc-review.googlesource.com/c/123048
> > Commit-Queue: Elad Alon <eladalon@webrtc.org>
> > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#26728}
>
> TBR=danilchap@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
>
> Bug: webrtc:10288, chromium:933127
> Change-Id: If1de0bd8992137c52bf0b877b3cb0a2bafc809d4
> Reviewed-on: https://webrtc-review.googlesource.com/c/123381
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26744}
TBR=danilchap@webrtc.org,oprypin@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org
Change-Id: I65e391325d3a6df6db3c0739185e2002e70fb954
Bug: webrtc:10288, chromium:933127
Reviewed-on: https://webrtc-review.googlesource.com/c/123384
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26750}
2019-02-18 23:45:57 +01:00
|
|
|
send_config->rtp.extensions.push_back(
|
|
|
|
|
RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelExtensionId));
|
2017-09-15 09:56:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PerformTest() override {
|
|
|
|
|
EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet.";
|
|
|
|
|
}
|
2019-12-06 12:34:57 +01:00
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
RtpHeaderExtensionMap extensions_;
|
2017-09-15 09:56:08 -07:00
|
|
|
} test;
|
|
|
|
|
|
|
|
|
|
RunBaseTest(&test);
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-15 10:54:55 +01:00
|
|
|
class TransportWideSequenceNumberObserver : public AudioSendTest {
|
|
|
|
|
public:
|
|
|
|
|
explicit TransportWideSequenceNumberObserver(bool expect_sequence_number)
|
|
|
|
|
: AudioSendTest(), expect_sequence_number_(expect_sequence_number) {
|
2019-12-06 12:34:57 +01:00
|
|
|
extensions_.Register<TransportSequenceNumber>(
|
|
|
|
|
kTransportSequenceNumberExtensionId);
|
2019-02-15 10:54:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
Action OnSendRtp(const uint8_t* packet, size_t length) override {
|
2019-12-06 12:34:57 +01:00
|
|
|
RtpPacket rtp_packet(&extensions_);
|
|
|
|
|
EXPECT_TRUE(rtp_packet.Parse(packet, length));
|
2019-02-15 10:54:55 +01:00
|
|
|
|
2019-12-06 12:34:57 +01:00
|
|
|
EXPECT_EQ(rtp_packet.HasExtension<TransportSequenceNumber>(),
|
2019-02-15 10:54:55 +01:00
|
|
|
expect_sequence_number_);
|
2019-12-06 12:34:57 +01:00
|
|
|
EXPECT_FALSE(rtp_packet.HasExtension<TransmissionOffset>());
|
|
|
|
|
EXPECT_FALSE(rtp_packet.HasExtension<AbsoluteSendTime>());
|
2019-02-15 10:54:55 +01:00
|
|
|
|
|
|
|
|
observation_complete_.Set();
|
|
|
|
|
|
|
|
|
|
return SEND_PACKET;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-22 20:47:28 +02:00
|
|
|
void ModifyAudioConfigs(AudioSendStream::Config* send_config,
|
|
|
|
|
std::vector<AudioReceiveStreamInterface::Config>*
|
|
|
|
|
receive_configs) override {
|
2019-02-15 10:54:55 +01:00
|
|
|
send_config->rtp.extensions.clear();
|
|
|
|
|
send_config->rtp.extensions.push_back(
|
|
|
|
|
RtpExtension(RtpExtension::kTransportSequenceNumberUri,
|
|
|
|
|
kTransportSequenceNumberExtensionId));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PerformTest() override {
|
|
|
|
|
EXPECT_TRUE(Wait()) << "Timed out while waiting for a single RTP packet.";
|
|
|
|
|
}
|
|
|
|
|
const bool expect_sequence_number_;
|
2019-12-06 12:34:57 +01:00
|
|
|
RtpHeaderExtensionMap extensions_;
|
2019-02-15 10:54:55 +01:00
|
|
|
};
|
2019-02-15 08:53:09 +00:00
|
|
|
|
2019-02-15 10:54:55 +01:00
|
|
|
TEST_F(AudioSendStreamCallTest, SendsTransportWideSequenceNumbersInFieldTrial) {
|
|
|
|
|
TransportWideSequenceNumberObserver test(/*expect_sequence_number=*/true);
|
|
|
|
|
RunBaseTest(&test);
|
|
|
|
|
}
|
2017-09-15 09:56:08 -07:00
|
|
|
|
|
|
|
|
TEST_F(AudioSendStreamCallTest, SendDtmf) {
|
|
|
|
|
static const uint8_t kDtmfPayloadType = 120;
|
|
|
|
|
static const int kDtmfPayloadFrequency = 8000;
|
|
|
|
|
static const int kDtmfEventFirst = 12;
|
|
|
|
|
static const int kDtmfEventLast = 31;
|
|
|
|
|
static const int kDtmfDuration = 50;
|
|
|
|
|
class DtmfObserver : public AudioSendTest {
|
|
|
|
|
public:
|
|
|
|
|
DtmfObserver() = default;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
Action OnSendRtp(const uint8_t* packet, size_t length) override {
|
2019-12-06 12:34:57 +01:00
|
|
|
RtpPacket rtp_packet;
|
|
|
|
|
EXPECT_TRUE(rtp_packet.Parse(packet, length));
|
2017-09-15 09:56:08 -07:00
|
|
|
|
2019-12-06 12:34:57 +01:00
|
|
|
if (rtp_packet.PayloadType() == kDtmfPayloadType) {
|
|
|
|
|
EXPECT_EQ(rtp_packet.headers_size(), 12u);
|
|
|
|
|
EXPECT_EQ(rtp_packet.size(), 16u);
|
|
|
|
|
const int event = rtp_packet.payload()[0];
|
2017-09-15 09:56:08 -07:00
|
|
|
if (event != expected_dtmf_event_) {
|
|
|
|
|
++expected_dtmf_event_;
|
|
|
|
|
EXPECT_EQ(event, expected_dtmf_event_);
|
|
|
|
|
if (expected_dtmf_event_ == kDtmfEventLast) {
|
|
|
|
|
observation_complete_.Set();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return SEND_PACKET;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-22 20:47:28 +02:00
|
|
|
void OnAudioStreamsCreated(AudioSendStream* send_stream,
|
|
|
|
|
const std::vector<AudioReceiveStreamInterface*>&
|
|
|
|
|
receive_streams) override {
|
2017-09-15 09:56:08 -07:00
|
|
|
// Need to start stream here, else DTMF events are dropped.
|
|
|
|
|
send_stream->Start();
|
|
|
|
|
for (int event = kDtmfEventFirst; event <= kDtmfEventLast; ++event) {
|
|
|
|
|
send_stream->SendTelephoneEvent(kDtmfPayloadType, kDtmfPayloadFrequency,
|
|
|
|
|
event, kDtmfDuration);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PerformTest() override {
|
|
|
|
|
EXPECT_TRUE(Wait()) << "Timed out while waiting for DTMF stream.";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int expected_dtmf_event_ = kDtmfEventFirst;
|
|
|
|
|
} test;
|
|
|
|
|
|
|
|
|
|
RunBaseTest(&test);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace test
|
|
|
|
|
} // namespace webrtc
|