webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h - Issue 2770233003: Implemented the GetSources() in native code.

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

Issue 2770233003: Implemented the GetSources() in native code. (Closed)

Patch Set: Renaming. Add a unit test. Resolve the comments. Created 3 years, 8 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 side-by-side diff with in-line comments

« webrtc/call/audio_receive_stream.h ('K') | « webrtc/modules/rtp_rtcp/include/rtp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc » ('j') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

index 4b5524877c77206c58eb8db145ba0f88202b75c9..db0e861af25bd51cba1065d6a2207ef926d6dee0 100644

--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h

@@ -11,7 +11,10 @@

#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_

#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_

+#include <list>

#include <memory>

+#include <unordered_map>

+#include <vector>

#include "webrtc/base/criticalsection.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"

@@ -56,6 +59,8 @@ class RtpReceiverImpl : public RtpReceiver {

TelephoneEventHandler* GetTelephoneEventHandler() override;

+ const std::vector<RtpSource> GetSources() override;

hbos 2017/04/05 11:15:42 Make the return value non-const since it's returne

the sun 2017/04/05 14:58:30 +1 but make the function const: std::vector<RtpSou

Zhi Huang 2017/04/06 03:09:50 Done.

private:

bool HaveReceivedFrame() const;

@@ -66,6 +71,9 @@ class RtpReceiverImpl : public RtpReceiver {

bool* is_red,

PayloadUnion* payload);

+ void UpdateSources();

+ void UpdateSourceLists(int64_t now);

Clock* clock_;

RTPPayloadRegistry* rtp_payload_registry_;

std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_;

@@ -84,6 +92,11 @@ class RtpReceiverImpl : public RtpReceiver {

uint32_t last_received_timestamp_;

int64_t last_received_frame_time_ms_;

uint16_t last_received_sequence_number_;

+ std::unordered_map<uint32_t, std::list<RtpSource>::iterator>

+ iterator_by_csrc_;

+ std::list<RtpSource> csrc_sources_;

hbos 2017/04/05 11:15:42 Add a comment saying these are sorted chronologica

Zhi Huang 2017/04/06 03:09:50 Done.

+ std::vector<RtpSource> ssrc_sources_;

};

} // namespace webrtc

#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_