zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split FlexfecReceiveStreamImpl init into worker / network steps.

Browse Source 
This is comparable to this change for AudioReceiveStream:
https://webrtc-review.googlesource.com/c/src/+/220608/

Bug: webrtc:11993
Change-Id: I6bad7fa693441f80e86d8b021b8cf42727dc9142
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/220609
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34170}
This commit is contained in:
Tommi
2021-05-31 14:26:05 +02:00
committed by WebRTC LUCI CQ
parent 261eec5456
commit 0377bab21b
4 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
call/flexfec_receive_stream_impl.cc
View File

@ -138,7 +138,6 @@ std::unique_ptr<ModuleRtpRtcpImpl2> CreateRtpRtcpModule(
FlexfecReceiveStreamImpl::FlexfecReceiveStreamImpl(
Clock* clock,
RtpStreamReceiverControllerInterface* receiver_controller,
const Config& config,
RecoveredPacketReceiver* recovered_packet_receiver,
RtcpRttStats* rtt_stats,
@ -155,23 +154,11 @@ FlexfecReceiveStreamImpl::FlexfecReceiveStreamImpl(
process_thread_(process_thread) {
RTC_LOG(LS_INFO) << "FlexfecReceiveStreamImpl: " << config_.ToString();
network_thread_checker_.Detach();
// RTCP reporting.
rtp_rtcp_->SetRTCPStatus(config_.rtcp_mode);
process_thread_->RegisterModule(rtp_rtcp_.get(), RTC_FROM_HERE);
// Register with transport.
// TODO(nisse): OnRtpPacket in this class delegates all real work to
// |receiver_|. So maybe we don't need to implement RtpPacketSinkInterface
// here at all, we'd then delete the OnRtpPacket method and instead register
// |receiver_| as the RtpPacketSinkInterface for this stream.
// TODO(nisse): Passing |this| from the constructor to the RtpDemuxer, before
// the object is fully initialized, is risky. But it works in this case
// because locking in our caller, Call::CreateFlexfecReceiveStream, ensures
// that the demuxer doesn't call OnRtpPacket before this object is fully
// constructed. Registering |receiver_| instead of |this| would solve this
// problem too.
rtp_stream_receiver_ =
receiver_controller->CreateReceiver(config_.remote_ssrc, this);
}
FlexfecReceiveStreamImpl::~FlexfecReceiveStreamImpl() {
@ -179,6 +166,27 @@ FlexfecReceiveStreamImpl::~FlexfecReceiveStreamImpl() {
process_thread_->DeRegisterModule(rtp_rtcp_.get());
}
void FlexfecReceiveStreamImpl::RegisterWithTransport(
RtpStreamReceiverControllerInterface* receiver_controller) {
RTC_DCHECK_RUN_ON(&network_thread_checker_);
RTC_DCHECK(!rtp_stream_receiver_);
if (!receiver_)
return;
// TODO(nisse): OnRtpPacket in this class delegates all real work to
// `receiver_`. So maybe we don't need to implement RtpPacketSinkInterface
// here at all, we'd then delete the OnRtpPacket method and instead register
// `receiver_` as the RtpPacketSinkInterface for this stream.
rtp_stream_receiver_ =
receiver_controller->CreateReceiver(config_.remote_ssrc, this);
}
void FlexfecReceiveStreamImpl::UnregisterFromTransport() {
RTC_DCHECK_RUN_ON(&network_thread_checker_);
rtp_stream_receiver_.reset();
}
void FlexfecReceiveStreamImpl::OnRtpPacket(const RtpPacketReceived& packet) {
if (!receiver_)
return;