Filter overlapping RTP header extensions.

talk/media/webrtc/webrtcvideoengine2_unittest.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1181 matching lines @@
 // Test support for absolute send time header extension.
 TEST_F(WebRtcVideoChannel2Test, SendAbsoluteSendTimeHeaderExtensions) {
   TestSetSendRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension,
                                  webrtc::RtpExtension::kAbsSendTime);
 }
 TEST_F(WebRtcVideoChannel2Test, RecvAbsoluteSendTimeHeaderExtensions) {
   TestSetRecvRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension,
                                  webrtc::RtpExtension::kAbsSendTime);
 }
 
+TEST_F(WebRtcVideoChannel2Test, FiltersOverlappingExtensions) {
+  // Enable three overlapping extensions.
+  cricket::VideoSendParameters parameters = send_parameters_;
+  int id = 1;
+  parameters.extensions.push_back(
+      cricket::RtpHeaderExtension(kRtpAbsoluteSenderTimeHeaderExtension, id++));
+  parameters.extensions.push_back(
+      cricket::RtpHeaderExtension(kRtpTimestampOffsetHeaderExtension, id++));
+  parameters.extensions.push_back(cricket::RtpHeaderExtension(
+      kRtpTransportSequenceNumberHeaderExtension, id));
+  EXPECT_TRUE(channel_->SetSendParameters(parameters));
+  FakeVideoSendStream* send_stream =
+      AddSendStream(cricket::StreamParams::CreateLegacy(123));
+
+  // Verify that only one of them has been set, and that it is the one with
+  // highest priority (transport sequence number).
+  ASSERT_EQ(1u, send_stream->GetConfig().rtp.extensions.size());
+  EXPECT_EQ(id, send_stream->GetConfig().rtp.extensions[0].id);
+  EXPECT_EQ(webrtc::RtpExtension::kTransportSequenceNumber,
+            send_stream->GetConfig().rtp.extensions[0].name);
+}

[pbos-webrtc, 2015/10/29 15:04:01]

Can you add one that picks abssendtime over toffset? I think you can
parameterize this test as: (std::vector<std::string> extensions, std::string
expected_extension)

[stefan-webrtc, 2015/10/29 15:18:18]

Done.

+
 class WebRtcVideoChannel2WithSendSideBweTest : public WebRtcVideoChannel2Test {
  public:
   WebRtcVideoChannel2WithSendSideBweTest()
       : WebRtcVideoChannel2Test("WebRTC-SendSideBwe/Enabled/") {}
 };
 
 // Test support for transport sequence number header extension.
 TEST_F(WebRtcVideoChannel2WithSendSideBweTest,
        SendTransportSequenceNumberHeaderExtensions) {
   TestSetSendRtpHeaderExtensions(
@@ skipping 11 matching lines @@
 TEST_F(WebRtcVideoChannel2Test, SendVideoRotationHeaderExtensions) {
   TestSetSendRtpHeaderExtensions(kRtpVideoRotationHeaderExtension,
                                  webrtc::RtpExtension::kVideoRotation);
 }
 TEST_F(WebRtcVideoChannel2Test, RecvVideoRotationHeaderExtensions) {
   TestSetRecvRtpHeaderExtensions(kRtpVideoRotationHeaderExtension,
                                  webrtc::RtpExtension::kVideoRotation);
 }
 
 TEST_F(WebRtcVideoChannel2Test, IdenticalSendExtensionsDoesntRecreateStream) {
-  const int kTOffsetId = 1;
-  const int kAbsSendTimeId = 2;
-  const int kVideoRotationId = 3;
+  const int kAbsSendTimeId = 1;
+  const int kVideoRotationId = 2;
   send_parameters_.extensions.push_back(cricket::RtpHeaderExtension(
       kRtpAbsoluteSenderTimeHeaderExtension, kAbsSendTimeId));
   send_parameters_.extensions.push_back(cricket::RtpHeaderExtension(
-      kRtpTimestampOffsetHeaderExtension, kTOffsetId));
-  send_parameters_.extensions.push_back(cricket::RtpHeaderExtension(
       kRtpVideoRotationHeaderExtension, kVideoRotationId));
 
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
   FakeVideoSendStream* send_stream =
       AddSendStream(cricket::StreamParams::CreateLegacy(123));
 
   EXPECT_EQ(1, fake_call_->GetNumCreatedSendStreams());
-  ASSERT_EQ(3u, send_stream->GetConfig().rtp.extensions.size());
+  ASSERT_EQ(2u, send_stream->GetConfig().rtp.extensions.size());
 
   // Setting the same extensions (even if in different order) shouldn't
   // reallocate the stream.
   std::reverse(send_parameters_.extensions.begin(),
                send_parameters_.extensions.end());
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
 
   EXPECT_EQ(1, fake_call_->GetNumCreatedSendStreams());
 
   // Setting different extensions should recreate the stream.
@@ skipping 1975 matching lines @@
 // Ensures that the correct settings are applied to the codec when two temporal
 // layer screencasting is enabled, and that the correct simulcast settings are
 // reapplied when disabling screencasting.
 TEST_F(WebRtcVideoChannel2SimulcastTest,
        DISABLED_TwoTemporalLayerScreencastSettings) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
 }  // namespace cricket