admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds support for abs send time extension in scenario tests.

Browse Source 
Bug: webrtc:10742
Change-Id: I2fba97b23691b27c05dce17ca17c5cd13076616b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141871
Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28291}
This commit is contained in:
Sebastian Jansson 2019-06-13 17:36:01 +02:00 committed by Commit Bot
parent 3d61ab12e6
commit e112bb84ef
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/scenario/audio_stream.cc
View File

@ -26,6 +26,11 @@ RTC_POP_IGNORING_WUNDEF()
namespace webrtc {
namespace test {
namespace {
enum : int { // The first valid value is 1.
kTransportSequenceNumberExtensionId = 1,
kAbsSendTimeExtensionId
};
absl::optional<std::string> CreateAdaptationString(
AudioStreamConfig::NetworkAdaptation config) {
#if WEBRTC_ENABLE_PROTOBUF
@ -115,8 +120,12 @@ SendAudioStream::SendAudioStream(
if (config.stream.in_bandwidth_estimation) {
send_config.send_codec_spec->transport_cc_enabled = true;
send_config.rtp.extensions = {
{RtpExtension::kTransportSequenceNumberUri, 8}};
send_config.rtp.extensions = {{RtpExtension::kTransportSequenceNumberUri,
kTransportSequenceNumberExtensionId}};
}
if (config.stream.abs_send_time) {
send_config.rtp.extensions.push_back(
{RtpExtension::kAbsSendTimeUri, kAbsSendTimeExtensionId});
}
if (config.encoder.priority_rate) {

2
test/scenario/scenario_config.h
View File

@ -156,6 +156,7 @@ struct VideoStreamConfig {
Stream();
Stream(const Stream&);
~Stream();
bool abs_send_time = false;
bool packet_feedback = true;
bool use_rtx = true;
DataRate pad_to_rate = DataRate::Zero();
@ -208,6 +209,7 @@ struct AudioStreamConfig {
Stream();
Stream(const Stream&);
~Stream();
bool abs_send_time = false;
bool in_bandwidth_estimation = false;
} stream;
struct Rendering {

5
test/scenario/video_stream.cc
View File

@ -29,6 +29,7 @@ namespace test {
namespace {
enum : int { // The first valid value is 1.
kTransportSequenceNumberExtensionId = 1,
kAbsSendTimeExtensionId,
kVideoContentTypeExtensionId,
kVideoRotationRtpExtensionId,
};
@ -97,6 +98,10 @@ std::vector<RtpExtension> GetVideoRtpExtensions(
res.push_back(RtpExtension(RtpExtension::kTransportSequenceNumberUri,
kTransportSequenceNumberExtensionId));
}
if (config.stream.abs_send_time) {
res.push_back(
RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeExtensionId));
}
return res;
}