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

webrtc/call/rtp_demuxer.h

Index: webrtc/call/rtp_demuxer.h
diff --git a/webrtc/call/rtp_demuxer.h b/webrtc/call/rtp_demuxer.h
index 9ec93787dea7ab9f533483319eb2596973983006..5060a80a70806afe46213592f62d0f05c534bf7e 100644
--- a/webrtc/call/rtp_demuxer.h
+++ b/webrtc/call/rtp_demuxer.h
@@ -71,12 +71,12 @@ class RtpDemuxer {
 
   // This records the association SSRCs to sinks. Other associations, such
   // as by RSID, also end up here once the RSID, etc., is resolved to an SSRC.
-  std::multimap<uint32_t, RtpPacketSinkInterface*> sinks_;
+  std::multimap<uint32_t, RtpPacketSinkInterface*> ssrc_sinks_;

[danilchap, 2017/06/28 14:05:39]

while just 'sinks' is not properly differentiated from rsid_sinks, I'm not sure
new name use right direction: These names make false impression there are two
different kind of sinks. Sinks are same, they are just mapped by different keys,
so may be call them 'sinks_by_ssrc_' and 'sinks_by_rsid_'

 
   // A sink may be associated with an RSID - RTP Stream ID. This tag has a
   // one-to-one association with an SSRC, but that SSRC is not yet known.
   // When it becomes known, the association of the sink to the RSID is deleted
-  // from this container, and moved into |sinks_|.
+  // from this container, and moved into |ssrc_sinks_|.
   std::multimap<std::string, RtpPacketSinkInterface*> rsid_sinks_;
 
   // Iterating over |rsid_sinks_| for each incoming and performing multiple