Revert of Create RtcpDemuxer

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.
  */
 
 #include "webrtc/call/rtp_demuxer.h"
 
 #include <memory>
 #include <string>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/ptr_util.h"
-#include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
-#include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 namespace {
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::InSequence;
 using ::testing::NiceMock;
 
 class MockRtpPacketSink : public RtpPacketSinkInterface {
  public:
   MOCK_METHOD1(OnRtpPacket, void(const RtpPacketReceived&));
 };
 
-class MockRsidResolutionObserver : public RsidResolutionObserver {
- public:
-  MOCK_METHOD2(OnRsidResolved, void(const std::string& rsid, uint32_t ssrc));
-};
-
 MATCHER_P(SamePacketAs, other, "") {
   return arg.Ssrc() == other.Ssrc() &&
          arg.SequenceNumber() == other.SequenceNumber();
 }
 
 std::unique_ptr<RtpPacketReceived> CreateRtpPacketReceived(
     uint32_t ssrc,
     size_t sequence_number = 0) {
   // |sequence_number| is declared |size_t| to prevent ugly casts when calling
   // the function, but should in reality always be a |uint16_t|.
@@ skipping 62 matching lines @@
 
   // Test tear-down
   for (const auto& sink : sinks) {
     demuxer.RemoveSink(&sink);
   }
 }
 
 TEST(RtpDemuxerTest, PacketsDeliveredInRightOrder) {
   RtpDemuxer demuxer;
 
-  constexpr uint32_t ssrc = 101;
-  MockRtpPacketSink sink;
-  demuxer.AddSink(ssrc, &sink);
+  constexpr uint32_t ssrcs[] = {101, 202, 303};
+  MockRtpPacketSink sinks[arraysize(ssrcs)];
+  for (size_t i = 0; i < arraysize(ssrcs); i++) {
+    demuxer.AddSink(ssrcs[i], &sinks[i]);
+  }
 
   std::unique_ptr<RtpPacketReceived> packets[5];
   for (size_t i = 0; i < arraysize(packets); i++) {
-    packets[i] = CreateRtpPacketReceived(ssrc, i);
+    packets[i] = CreateRtpPacketReceived(ssrcs[0], i);
   }
 
   InSequence sequence;
   for (const auto& packet : packets) {
-    EXPECT_CALL(sink, OnRtpPacket(SamePacketAs(*packet))).Times(1);
+    EXPECT_CALL(sinks[0], OnRtpPacket(SamePacketAs(*packet))).Times(1);
   }
 
   for (const auto& packet : packets) {
     EXPECT_TRUE(demuxer.OnRtpPacket(*packet));
   }
 
   // Test tear-down
-  demuxer.RemoveSink(&sink);
+  for (const auto& sink : sinks) {
+    demuxer.RemoveSink(&sink);
+  }
 }
 
 TEST(RtpDemuxerTest, MultipleSinksMappedToSameSsrc) {
   RtpDemuxer demuxer;
 
   MockRtpPacketSink sinks[3];
   constexpr uint32_t ssrc = 404;
   for (auto& sink : sinks) {
     demuxer.AddSink(ssrc, &sink);
   }
@@ skipping 261 matching lines @@
     auto packet =
         CreateRtpPacketReceivedWithRsid(rsids[i], ssrc, sequence_number);
     EXPECT_CALL(sink, OnRtpPacket(SamePacketAs(*packet))).Times(1);
     EXPECT_TRUE(demuxer.OnRtpPacket(*packet));
   }
 
   // Test tear-down
   demuxer.RemoveSink(&sink);
 }
 
-TEST(RtpDemuxerTest, RsidUsedByMultipleSinks) {
-  RtpDemuxer demuxer;
-
-  MockRtpPacketSink sinks[3];
-  const std::string shared_rsid = "a";
-
-  for (MockRtpPacketSink& sink : sinks) {
-    demuxer.AddSink(shared_rsid, &sink);
-  }
-
-  constexpr uint32_t shared_ssrc = 888;
-  auto packet = CreateRtpPacketReceivedWithRsid(shared_rsid, shared_ssrc);
-
-  for (auto& sink : sinks) {
-    EXPECT_CALL(sink, OnRtpPacket(SamePacketAs(*packet))).Times(1);
-  }
-
-  EXPECT_TRUE(demuxer.OnRtpPacket(*packet));
-
-  // Test tear-down
-  for (MockRtpPacketSink& sink : sinks) {
-    demuxer.RemoveSink(&sink);
-  }
-}
-
 TEST(RtpDemuxerTest, SinkWithBothRsidAndSsrcAssociations) {
   RtpDemuxer demuxer;
 
   MockRtpPacketSink sink;
   constexpr uint32_t standalone_ssrc = 10101;
   constexpr uint32_t rsid_ssrc = 20202;
   const std::string rsid = "a";
 
   demuxer.AddSink(standalone_ssrc, &sink);
   demuxer.AddSink(rsid, &sink);
@@ skipping 24 matching lines @@
 
   constexpr uint16_t seq_num = 999;
   auto packet = CreateRtpPacketReceivedWithRsid(rsid, ssrc, seq_num);
   EXPECT_CALL(sink, OnRtpPacket(SamePacketAs(*packet))).Times(1);
   EXPECT_TRUE(demuxer.OnRtpPacket(*packet));
 
   // Test tear-down
   demuxer.RemoveSink(&sink);
 }
 
-TEST(RtpDemuxerTest, RsidObserversInformedOfResolutions) {
-  RtpDemuxer demuxer;
-
-  constexpr uint32_t ssrc = 111;
-  const std::string rsid = "a";
-
-  MockRsidResolutionObserver rsid_resolution_observers[3];
-  for (auto& observer : rsid_resolution_observers) {
-    demuxer.RegisterRsidResolutionObserver(&observer);
-    EXPECT_CALL(observer, OnRsidResolved(rsid, ssrc)).Times(1);
-  }
-
-  // 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.
-  MockRsidResolutionObserver observer_1;
-  MockRsidResolutionObserver observer_2_removed;
-  MockRsidResolutionObserver observer_3;
-
-  demuxer.RegisterRsidResolutionObserver(&observer_1);
-  demuxer.RegisterRsidResolutionObserver(&observer_2_removed);
-  demuxer.RegisterRsidResolutionObserver(&observer_3);
-
-  demuxer.DeregisterRsidResolutionObserver(&observer_2_removed);
-
-  EXPECT_CALL(observer_1, OnRsidResolved(rsid, ssrc)).Times(1);
-  EXPECT_CALL(observer_2_removed, OnRsidResolved(_, _)).Times(0);
-  EXPECT_CALL(observer_3, OnRsidResolved(rsid, ssrc)).Times(1);
-
-  // The expected calls to OnRsidResolved() will be triggered by this.
-  demuxer.OnRtpPacket(*CreateRtpPacketReceivedWithRsid(rsid, ssrc));
-
-  // Test tear-down
-  demuxer.RemoveSink(&sink);
-  demuxer.DeregisterRsidResolutionObserver(&observer_1);
-  demuxer.DeregisterRsidResolutionObserver(&observer_3);
-}
-
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(RtpDemuxerTest, RsidMustBeNonEmpty) {
   RtpDemuxer demuxer;
   MockRtpPacketSink sink;
   EXPECT_DEATH(demuxer.AddSink("", &sink), "");
 }
 
 TEST(RtpDemuxerTest, RsidMustBeAlphaNumeric) {
   RtpDemuxer demuxer;
   MockRtpPacketSink sink;
   EXPECT_DEATH(demuxer.AddSink("a_3", &sink), "");
 }
 
 TEST(RtpDemuxerTest, RsidMustNotExceedMaximumLength) {
   RtpDemuxer demuxer;
   MockRtpPacketSink sink;
   std::string rsid(StreamId::kMaxSize + 1, 'a');
   EXPECT_DEATH(demuxer.AddSink(rsid, &sink), "");
 }
 
 TEST(RtpDemuxerTest, RepeatedRsidAssociationsDisallowed) {
   RtpDemuxer demuxer;
   MockRtpPacketSink sink;
   demuxer.AddSink("a", &sink);
   EXPECT_DEATH(demuxer.AddSink("a", &sink), "");
-  demuxer.RemoveSink(&sink);
 }
-
-TEST(RtpDemuxerTest,
-     DoubleRegisterationOfNeverRegisteredRsidResolutionObserverDisallowed) {
-  RtpDemuxer demuxer;
-  MockRsidResolutionObserver observer;
-  demuxer.RegisterRsidResolutionObserver(&observer);
-  EXPECT_DEATH(demuxer.RegisterRsidResolutionObserver(&observer), "");
-  demuxer.DeregisterRsidResolutionObserver(&observer);
-}
-
-TEST(RtpDemuxerTest,
-     DregisterationOfNeverRegisteredRsidResolutionObserverDisallowed) {
-  RtpDemuxer demuxer;
-  MockRsidResolutionObserver observer;
-  EXPECT_DEATH(demuxer.DeregisterRsidResolutionObserver(&observer), "");
-}
-
 #endif
 
 }  // namespace
 }  // namespace webrtc