Remove RtpDemuxer tweak for preventing multiple RSID inspections

webrtc/call/rtp_demuxer_unittest.cc

 /*
  *  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.
  */
 
@@ skipping 363 matching lines @@
   InSequence sequence;  // Verify that the order of delivery is unchanged.
 
   constexpr uint32_t shared_ssrc = 100;
 
   // First a packet with |rsid_a| is received, and |sink_a| is associated with
   // its SSRC.
   auto packet_a = CreateRtpPacketReceivedWithRsid(rsid_a, shared_ssrc, 10);
   EXPECT_CALL(sink_a, OnRtpPacket(SamePacketAs(*packet_a))).Times(1);
   EXPECT_TRUE(demuxer.OnRtpPacket(*packet_a));
 
-  // Second, a packet with |rsid_b| is received. Its RSID is ignored.
+  // Second, a packet with |rsid_b| is received. We guarantee that |sink_a|
+  // would receive it, and make no guarantees about |sink_b|.
   auto packet_b = CreateRtpPacketReceivedWithRsid(rsid_b, shared_ssrc, 20);
   EXPECT_CALL(sink_a, OnRtpPacket(SamePacketAs(*packet_b))).Times(1);
+  EXPECT_CALL(sink_b, OnRtpPacket(SamePacketAs(*packet_b))).Times(AtLeast(0));
   EXPECT_TRUE(demuxer.OnRtpPacket(*packet_b));
 
   // Known edge-case; adding a new RSID association makes us re-examine all
   // SSRCs. |sink_b| may or may not be associated with the SSRC now; we make
   // no promises on that. We do however still guarantee that |sink_a| still
   // receives the new packets.
-  MockRtpPacketSink sink_ignored;
-  demuxer.AddSink("ignored", &sink_ignored);
-  auto packet_c = CreateRtpPacketReceivedWithRsid(rsid_b, shared_ssrc, 30);
+  MockRtpPacketSink sink_c;
+  const std::string rsid_c = "c";
+  constexpr uint32_t some_other_ssrc = shared_ssrc + 1;
+  demuxer.AddSink(some_other_ssrc, &sink_c);
+  auto packet_c = CreateRtpPacketReceivedWithRsid(rsid_c, shared_ssrc, 30);
   EXPECT_CALL(sink_a, OnRtpPacket(SamePacketAs(*packet_c))).Times(1);
   EXPECT_CALL(sink_b, OnRtpPacket(SamePacketAs(*packet_c))).Times(AtLeast(0));
   EXPECT_TRUE(demuxer.OnRtpPacket(*packet_c));
 
   // Test tear-down
   demuxer.RemoveSink(&sink_a);
   demuxer.RemoveSink(&sink_b);
-  demuxer.RemoveSink(&sink_ignored);
+  demuxer.RemoveSink(&sink_c);
 }
 
 TEST(RtpDemuxerTest, MultipleRsidsOnSameSink) {
   RtpDemuxer demuxer;
 
   MockRtpPacketSink sink;
   const std::string rsids[] = {"a", "b", "c"};
 
   for (const std::string& rsid : rsids) {
     demuxer.AddSink(rsid, &sink);
@@ skipping 97 matching lines @@
 
   // The expected calls to OnRsidResolved() will be triggered by this.
   demuxer.OnRtpPacket(*CreateRtpPacketReceivedWithRsid(rsid, ssrc));
 
   // Test tear-down
   for (auto& observer : rsid_resolution_observers) {
     demuxer.DeregisterRsidResolutionObserver(&observer);
   }
 }
 
-// Normally, we only produce one notification per resolution (though no such
-// guarantee is made), but when a new observer is added, we reset
-// this suppression - we "re-resolve" associations for the benefit of the
-// new observer..
-TEST(RtpDemuxerTest, NotificationSuppressionResetWhenNewObserverAdded) {
-  RtpDemuxer demuxer;
-
-  constexpr uint32_t ssrc = 111;
-  const std::string rsid = "a";
-
-  // First observer registered, then gets a notification.
-  NiceMock<MockRsidResolutionObserver> first_observer;
-  demuxer.RegisterRsidResolutionObserver(&first_observer);
-  demuxer.OnRtpPacket(*CreateRtpPacketReceivedWithRsid(rsid, ssrc));
-
-  // Second observer registered, then gets a notification. No guarantee is made
-  // about whether the first observer would get an additional notification.
-  MockRsidResolutionObserver second_observer;
-  demuxer.RegisterRsidResolutionObserver(&second_observer);
-  EXPECT_CALL(first_observer, OnRsidResolved(rsid, ssrc)).Times(AtLeast(0));
-  EXPECT_CALL(second_observer, OnRsidResolved(rsid, ssrc)).Times(1);
-  demuxer.OnRtpPacket(*CreateRtpPacketReceivedWithRsid(rsid, ssrc));
-
-  // Test tear-down
-  demuxer.DeregisterRsidResolutionObserver(&first_observer);
-  demuxer.DeregisterRsidResolutionObserver(&second_observer);
-}
-
 TEST(RtpDemuxerTest, DeregisteredRsidObserversNotInformedOfResolutions) {
   RtpDemuxer demuxer;
 
   constexpr uint32_t ssrc = 111;
   const std::string rsid = "a";
   NiceMock<MockRtpPacketSink> sink;
   demuxer.AddSink(rsid, &sink);
 
   // Register several, then deregister only one, to show that not all of the
   // observers had been forgotten when one was removed.
@@ skipping 61 matching lines @@
      DregisterationOfNeverRegisteredRsidResolutionObserverDisallowed) {
   RtpDemuxer demuxer;
   MockRsidResolutionObserver observer;
   EXPECT_DEATH(demuxer.DeregisterRsidResolutionObserver(&observer), "");
 }
 
 #endif
 
 }  // namespace
 }  // namespace webrtc