nit: Rename RtpDemuxer::sink_ to RtpDemuxer::ssrc_sinks_

webrtc/call/rtp_demuxer.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 "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 
 namespace webrtc {
 
 namespace {
 constexpr size_t kMaxProcessedSsrcs = 1000;  // Prevent memory overuse.
 }  // namespace
 
 RtpDemuxer::RtpDemuxer() = default;
 
 RtpDemuxer::~RtpDemuxer() {
-  RTC_DCHECK(sinks_.empty());
+  RTC_DCHECK(ssrc_sinks_.empty());
   RTC_DCHECK(rsid_sinks_.empty());
 }
 
 void RtpDemuxer::AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink) {
   RTC_DCHECK(sink);
   RecordSsrcToSinkAssociation(ssrc, sink);
 }
 
 void RtpDemuxer::AddSink(const std::string& rsid,
                          RtpPacketSinkInterface* sink) {
   RTC_DCHECK(StreamId::IsLegalName(rsid));
   RTC_DCHECK(sink);
   RTC_DCHECK(!MultimapAssociationExists(rsid_sinks_, rsid, sink));
 
   rsid_sinks_.emplace(rsid, sink);
 
   // This RSID might now map to an SSRC which we saw earlier.
   processed_ssrcs_.clear();
 }
 
 bool RtpDemuxer::RemoveSink(const RtpPacketSinkInterface* sink) {
   RTC_DCHECK(sink);
-  return (RemoveFromMultimapByValue(&sinks_, sink) +
+  return (RemoveFromMultimapByValue(&ssrc_sinks_, sink) +
           RemoveFromMultimapByValue(&rsid_sinks_, sink)) > 0;
 }
 
 void RtpDemuxer::RecordSsrcToSinkAssociation(uint32_t ssrc,
                                              RtpPacketSinkInterface* sink) {
   RTC_DCHECK(sink);
   // The association might already have been set by a different
   // configuration source.
-  if (!MultimapAssociationExists(sinks_, ssrc, sink)) {
-    sinks_.emplace(ssrc, sink);
+  if (!MultimapAssociationExists(ssrc_sinks_, ssrc, sink)) {
+    ssrc_sinks_.emplace(ssrc, sink);
   }
 }
 
 bool RtpDemuxer::OnRtpPacket(const RtpPacketReceived& packet) {
   ResolveAssociations(packet);
-  auto it_range = sinks_.equal_range(packet.Ssrc());
+  auto it_range = ssrc_sinks_.equal_range(packet.Ssrc());
   for (auto it = it_range.first; it != it_range.second; ++it) {
     it->second->OnRtpPacket(packet);
   }
   return it_range.first != it_range.second;
 }
 
 void RtpDemuxer::RegisterRsidResolutionObserver(
     RsidResolutionObserver* observer) {
   RTC_DCHECK(observer);
   RTC_DCHECK(!ContainerHasKey(rsid_resolution_observers_, observer));
@@ skipping 50 matching lines @@
 }
 
 void RtpDemuxer::NotifyObserversOfRsidResolution(const std::string& rsid,
                                                  uint32_t ssrc) {
   for (auto* observer : rsid_resolution_observers_) {
     observer->OnRsidResolved(rsid, ssrc);
   }
 }
 
 }  // namespace webrtc