Create RtcpDemuxer

webrtc/call/rsid_ssrc_association_resolution_observer.h

Index: webrtc/call/rsid_ssrc_association_resolution_observer.h
diff --git a/webrtc/call/rsid_ssrc_association_resolution_observer.h b/webrtc/call/rsid_ssrc_association_resolution_observer.h
new file mode 100644
index 0000000000000000000000000000000000000000..73bb94aeae85ed5cfd10688c8be5ca1b0594894c
--- /dev/null
+++ b/webrtc/call/rsid_ssrc_association_resolution_observer.h
@@ -0,0 +1,30 @@
+/*
+ *  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.
+ */
+#ifndef WEBRTC_CALL_RSID_SSRC_ASSOCIATION_RESOLUTION_OBSERVER_H_
+#define WEBRTC_CALL_RSID_SSRC_ASSOCIATION_RESOLUTION_OBSERVER_H_
+
+#include <string>
+
+#include "webrtc/base/basictypes.h"
+
+namespace webrtc {
+
+// One RSID can be associated with one, and only one, SSRC, throughout a call.
+// The resolution might either happen during call setup, or during the call.

[danilchap, 2017/06/16 16:46:18]

Is there a use case where rsid resolution passed not between rtp_demuxer and
rtcp_demuxer?
If not, may it will be simpler design to merge rtp_demuxer and rtcp_demuxer into
single class and pass resolution internally.

[eladalon, 2017/06/19 11:28:46]

Do you mean have one class that has one RtpDemuxer and one RtcpDemuxer? If so,
I'd be open to the idea, although I think maybe the boilerplate we'll need makes
it no longer worth it.

But if you mean to merge everything into a single class, RtpRtcpDemuxer, where
all the logic lies, I'd vote against. I think things are clearer and more
maintainable like this; despite the similarity of the two classes, we won't be
eliminating any code when merging, except for the Register/Deregister-observer
functions.

+class RsidResolutionObserver {

[nisse-webrtc, 2017/06/16 13:18:34]

For consistency, also rename the file to "rsid_resolution_observer.h". (And the
include guards).

[eladalon, 2017/06/16 15:18:43]

Done.

+ public:
+  virtual ~RsidResolutionObserver() = default;
+
+  virtual void OnRsidResolved(const std::string& rsid, uint32_t ssrc) = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // WEBRTC_CALL_RSID_SSRC_ASSOCIATION_RESOLUTION_OBSERVER_H_