commit fd20171d2894d354ea49f86134db0b74cbf08564
author Sebastian Jansson <srte@webrtc.org> Mon Nov 12 16:44:16 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 13 09:34:09 2018 +0000
tree 5ae45900d05acb70d1452900efe9f255b7106dca
parent cb7eddb9559e7914cdba0d93b3a87550a476f4bd

Adds setup of RTP Extensions in Scenario tests.

This prevents printing warning messages when the extensions aren't
found. The real parsing is done deeper in the stack and is unaffected.

Bug: webrtc:9510
Change-Id: Idf09f0e69c223bd4217be7044d21d1d0bbbdab92
Reviewed-on: https://webrtc-review.googlesource.com/c/110615
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25612}

test/scenario/audio_stream.cc

diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc
index dc8e02c..076b4ea 100644
--- a/test/scenario/audio_stream.cc
+++ b/test/scenario/audio_stream.cc
@@ -181,6 +181,7 @@
     recv_config.rtp.extensions = {
         {RtpExtension::kTransportSequenceNumberUri, 8}};
   }
+  receiver_->AddExtensions(recv_config.rtp.extensions);
   recv_config.decoder_factory = decoder_factory;
   recv_config.decoder_map = {
       {CallTest::kAudioSendPayloadType, {"opus", 48000, 2}}};

test/scenario/call_client.cc

diff --git a/test/scenario/call_client.cc b/test/scenario/call_client.cc
index 0fbd2bc..86eb4dc 100644
--- a/test/scenario/call_client.cc
+++ b/test/scenario/call_client.cc
@@ -209,6 +209,11 @@
   return kPriorityStreamId;
 }
 
+void CallClient::AddExtensions(std::vector<RtpExtension> extensions) {
+  for (const auto& extension : extensions)
+    header_parser_->RegisterRtpHeaderExtension(extension);
+}
+
 CallClientPair::~CallClientPair() = default;
 
 }  // namespace test

test/scenario/call_client.h

diff --git a/test/scenario/call_client.h b/test/scenario/call_client.h
index fe39bd8..a12e06a 100644
--- a/test/scenario/call_client.h
+++ b/test/scenario/call_client.h
@@ -85,6 +85,7 @@
   uint32_t GetNextAudioSsrc();
   uint32_t GetNextRtxSsrc();
   std::string GetNextPriorityId();
+  void AddExtensions(std::vector<RtpExtension> extensions);
 
   Clock* clock_;
   LoggingNetworkControllerFactory network_controller_factory_;

test/scenario/video_stream.cc

diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc
index 9a5d461..528a9cc2 100644
--- a/test/scenario/video_stream.cc
+++ b/test/scenario/video_stream.cc
@@ -319,6 +319,7 @@
   recv_config.rtp.transport_cc = config.stream.packet_feedback;
   recv_config.rtp.local_ssrc = CallTest::kReceiverLocalVideoSsrc;
   recv_config.rtp.extensions = GetVideoRtpExtensions(config);
+  receiver_->AddExtensions(recv_config.rtp.extensions);
   RTC_DCHECK(!config.stream.use_rtx ||
              config.stream.nack_history_time > TimeDelta::Zero());
   recv_config.rtp.nack.rtp_history_ms = config.stream.nack_history_time.ms();