Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: webrtc/call/rtp_demuxer.h

Issue 2943693003: Create RtcpDemuxer (Closed)
Patch Set: Rebased Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/call/rtcp_packet_sink_interface.h ('k') | webrtc/call/rtp_demuxer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_CALL_RTP_DEMUXER_H_ 11 #ifndef WEBRTC_CALL_RTP_DEMUXER_H_
12 #define WEBRTC_CALL_RTP_DEMUXER_H_ 12 #define WEBRTC_CALL_RTP_DEMUXER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <vector>
17 18
18 namespace webrtc { 19 namespace webrtc {
19 20
21 class RsidResolutionObserver;
20 class RtpPacketReceived; 22 class RtpPacketReceived;
21 class RtpPacketSinkInterface; 23 class RtpPacketSinkInterface;
22 24
23 // This class represents the RTP demuxing, for a single RTP session (i.e., one 25 // This class represents the RTP demuxing, for a single RTP session (i.e., one
24 // ssrc space, see RFC 7656). It isn't thread aware, leaving responsibility of 26 // ssrc space, see RFC 7656). It isn't thread aware, leaving responsibility of
25 // multithreading issues to the user of this class. 27 // multithreading issues to the user of this class.
26 // TODO(nisse): Should be extended to also do MID-based demux and payload-type 28 // TODO(nisse): Should be extended to also do MID-based demux and payload-type
27 // demux. 29 // demux.
28 class RtpDemuxer { 30 class RtpDemuxer {
29 public: 31 public:
30 RtpDemuxer(); 32 RtpDemuxer();
31 ~RtpDemuxer(); 33 ~RtpDemuxer();
32 34
33 // Registers a sink. The same sink can be registered for multiple ssrcs, and 35 // Registers a sink. The same sink can be registered for multiple ssrcs, and
34 // the same ssrc can have multiple sinks. Null pointer is not allowed. 36 // the same ssrc can have multiple sinks. Null pointer is not allowed.
35 void AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink); 37 void AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink);
36 38
37 // Registers a sink's association to an RSID. Null pointer is not allowed. 39 // Registers a sink's association to an RSID. Null pointer is not allowed.
38 void AddSink(const std::string& rsid, RtpPacketSinkInterface* sink); 40 void AddSink(const std::string& rsid, RtpPacketSinkInterface* sink);
39 41
40 // Removes a sink. Return value reports if anything was actually removed. 42 // Removes a sink. Return value reports if anything was actually removed.
41 // Null pointer is not allowed. 43 // Null pointer is not allowed.
42 bool RemoveSink(const RtpPacketSinkInterface* sink); 44 bool RemoveSink(const RtpPacketSinkInterface* sink);
43 45
44 // Returns true if at least one matching sink was found, otherwise false. 46 // Returns true if at least one matching sink was found.
45 bool OnRtpPacket(const RtpPacketReceived& packet); 47 bool OnRtpPacket(const RtpPacketReceived& packet);
46 48
49 // Allows other objects to be notified when RSID-SSRC associations are
50 // resolved by this object.
51 void RegisterRsidResolutionObserver(RsidResolutionObserver* observer);
52
53 // Undo a previous RegisterRsidResolutionObserver().
54 void DeregisterRsidResolutionObserver(const RsidResolutionObserver* observer);
55
47 private: 56 private:
48 // Records a sink<->SSRC association. This can happen by explicit 57 // Records a sink<->SSRC association. This can happen by explicit
49 // configuration by AddSink(ssrc...), or by inferred configuration from an 58 // configuration by AddSink(ssrc...), or by inferred configuration from an
50 // RSID-based configuration which is resolved to an SSRC upon 59 // RSID-based configuration which is resolved to an SSRC upon
51 // packet reception. 60 // packet reception.
52 void RecordSsrcToSinkAssociation(uint32_t ssrc, RtpPacketSinkInterface* sink); 61 void RecordSsrcToSinkAssociation(uint32_t ssrc, RtpPacketSinkInterface* sink);
53 62
54 // When a new packet arrives, we attempt to resolve extra associations, 63 // When a new packet arrives, we attempt to resolve extra associations.
55 // such as which RSIDs are associated with which SSRCs. 64 void ResolveAssociations(const RtpPacketReceived& packet);
56 void FindSsrcAssociations(const RtpPacketReceived& packet); 65
66 // Find the associations of RSID to SSRCs.
67 void ResolveRsidToSsrcAssociations(const RtpPacketReceived& packet);
68
69 // Notify observers of the resolution of an RSID to an SSRC.
70 void NotifyObserversOfRsidResolution(const std::string& rsid, uint32_t ssrc);
57 71
58 // This records the association SSRCs to sinks. Other associations, such 72 // This records the association SSRCs to sinks. Other associations, such
59 // as by RSID, also end up here once the RSID, etc., is resolved to an SSRC. 73 // as by RSID, also end up here once the RSID, etc., is resolved to an SSRC.
60 std::multimap<uint32_t, RtpPacketSinkInterface*> sinks_; 74 std::multimap<uint32_t, RtpPacketSinkInterface*> sinks_;
61 75
62 // A sink may be associated with an RSID - RTP Stream ID. This tag has a 76 // A sink may be associated with an RSID - RTP Stream ID. This tag has a
63 // one-to-one association with an SSRC, but that SSRC is not yet known. 77 // one-to-one association with an SSRC, but that SSRC is not yet known.
64 // When it becomes known, the association of the sink to the RSID is deleted 78 // When it becomes known, the association of the sink to the RSID is deleted
65 // from this container, and moved into |sinks_|. 79 // from this container, and moved into |sinks_|.
66 std::multimap<std::string, RtpPacketSinkInterface*> rsid_sinks_; 80 std::multimap<std::string, RtpPacketSinkInterface*> rsid_sinks_;
67 81
68 // Iterating over |rsid_sinks_| for each incoming and performing multiple 82 // Iterating over |rsid_sinks_| for each incoming and performing multiple
69 // string comparisons is of non-trivial cost. To avoid this cost, we only 83 // string comparisons is of non-trivial cost. To avoid this cost, we only
70 // check RSIDs for the first packet on each incoming SSRC stream. 84 // check RSIDs for the first packet on each incoming SSRC stream.
71 // (If RSID associations are added later, we check again.) 85 // (If RSID associations are added later, we check again.)
72 std::set<uint32_t> processed_ssrcs_; 86 std::set<uint32_t> processed_ssrcs_;
73 87
74 // Avoid an attack that would create excessive logging. 88 // Avoid an attack that would create excessive logging.
75 bool logged_max_processed_ssrcs_exceeded_ = false; 89 bool logged_max_processed_ssrcs_exceeded_ = false;
90
91 // Observers which will be notified when an RSID association to an SSRC is
92 // resolved by this object.
93 std::vector<RsidResolutionObserver*> rsid_resolution_observers_;
76 }; 94 };
77 95
78 } // namespace webrtc 96 } // namespace webrtc
79 97
80 #endif // WEBRTC_CALL_RTP_DEMUXER_H_ 98 #endif // WEBRTC_CALL_RTP_DEMUXER_H_
OLDNEW
« no previous file with comments | « webrtc/call/rtcp_packet_sink_interface.h ('k') | webrtc/call/rtp_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698