Fixing problems with RTP extension ID conflict resolution

talk/session/media/mediasession_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 129 matching lines @@
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level", 8),
   RtpHeaderExtension("http://google.com/testing/audio_something", 10),
 };
 
 static const RtpHeaderExtension kAudioRtpExtension2[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level", 2),
   RtpHeaderExtension("http://google.com/testing/audio_something_else", 8),
   RtpHeaderExtension("http://google.com/testing/both_audio_and_video", 7),
 };
 
+static const RtpHeaderExtension kAudioRtpExtension3[] = {
+  RtpHeaderExtension("http://google.com/testing/audio_something", 2),
+  RtpHeaderExtension("http://google.com/testing/both_audio_and_video", 3),
+};
+
 static const RtpHeaderExtension kAudioRtpExtensionAnswer[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level", 8),
 };
 
 static const RtpHeaderExtension kVideoRtpExtension1[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:toffset", 14),
   RtpHeaderExtension("http://google.com/testing/video_something", 13),
 };
 
 static const RtpHeaderExtension kVideoRtpExtension2[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:toffset", 2),
   RtpHeaderExtension("http://google.com/testing/video_something_else", 14),
   RtpHeaderExtension("http://google.com/testing/both_audio_and_video", 7),
 };
 
+static const RtpHeaderExtension kVideoRtpExtension3[] = {
+  RtpHeaderExtension("http://google.com/testing/video_something", 4),
+  RtpHeaderExtension("http://google.com/testing/both_audio_and_video", 5),
+};
+
 static const RtpHeaderExtension kVideoRtpExtensionAnswer[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:toffset", 14),
 };
 
 static const uint32 kSimulcastParamsSsrc[] = {10, 11, 20, 21, 30, 31};
 static const uint32 kSimSsrc[] = {10, 20, 30};
 static const uint32 kFec1Ssrc[] = {10, 11};
 static const uint32 kFec2Ssrc[] = {20, 21};
 static const uint32 kFec3Ssrc[] = {30, 31};
 
@@ skipping 1684 matching lines @@
       GetFirstAudioContentDescription(updated_offer.get());
   EXPECT_EQ(MAKE_VECTOR(kUpdatedAudioRtpExtensions),
             updated_acd->rtp_header_extensions());
 
   const VideoContentDescription* updated_vcd =
       GetFirstVideoContentDescription(updated_offer.get());
   EXPECT_EQ(MAKE_VECTOR(kUpdatedVideoRtpExtensions),
             updated_vcd->rtp_header_extensions());
 }
 
+// Verify that if the same RTP extension URI is used for audio and video, the
+// same ID is used. Also verify that the ID isn't changed when creating an
+// updated offer (this was previously a bug).
+TEST_F(MediaSessionDescriptionFactoryTest,
+       RtpHeaderExtensionIdReused) {
+  MediaSessionOptions opts;
+  opts.recv_audio = true;
+  opts.recv_video = true;
+
+  f1_.set_audio_rtp_header_extensions(MAKE_VECTOR(kAudioRtpExtension3));
+  f1_.set_video_rtp_header_extensions(MAKE_VECTOR(kVideoRtpExtension3));
+
+  rtc::scoped_ptr<SessionDescription> offer(f1_.CreateOffer(opts, NULL));
+
+  // Since the audio extensions used ID 3 for "both_audio_and_video", so should
+  // the video extensions.
+  const RtpHeaderExtension kExpectedVideoRtpExtension[] = {
+    kVideoRtpExtension3[0],
+    kAudioRtpExtension3[1],
+  };
+
+  EXPECT_EQ(MAKE_VECTOR(kAudioRtpExtension3),
+            GetFirstAudioContentDescription(
+                offer.get())->rtp_header_extensions());
+  EXPECT_EQ(MAKE_VECTOR(kExpectedVideoRtpExtension),
+            GetFirstVideoContentDescription(
+                offer.get())->rtp_header_extensions());
+
+  // Nothing should change when creating a new offer
+  rtc::scoped_ptr<SessionDescription> updated_offer(
+      f1_.CreateOffer(opts, offer.get()));
+
+  EXPECT_EQ(MAKE_VECTOR(kAudioRtpExtension3),
+            GetFirstAudioContentDescription(
+                updated_offer.get())->rtp_header_extensions());
+  EXPECT_EQ(MAKE_VECTOR(kExpectedVideoRtpExtension),
+            GetFirstVideoContentDescription(
+                updated_offer.get())->rtp_header_extensions());
+}
+
 TEST(MediaSessionDescription, CopySessionDescription) {
   SessionDescription source;
   cricket::ContentGroup group(cricket::CN_AUDIO);
   source.AddGroup(group);
   AudioContentDescription* acd(new AudioContentDescription());
   acd->set_codecs(MAKE_VECTOR(kAudioCodecs1));
   acd->AddLegacyStream(1);
   source.AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP, acd);
   VideoContentDescription* vcd(new VideoContentDescription());
   vcd->set_codecs(MAKE_VECTOR(kVideoCodecs1));
@@ skipping 377 matching lines @@
   offer.reset(f1_.CreateOffer(options, NULL));
   ASSERT_TRUE(offer.get() != NULL);
   audio_content = offer->GetContentByName("audio");
   EXPECT_TRUE(VerifyNoCNCodecs(audio_content));
   rtc::scoped_ptr<SessionDescription> answer(
       f1_.CreateAnswer(offer.get(), options, NULL));
   ASSERT_TRUE(answer.get() != NULL);
   audio_content = answer->GetContentByName("audio");
   EXPECT_TRUE(VerifyNoCNCodecs(audio_content));
 }