mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Demote RtpStreamReceiverController AddSink/RemoveSink to private

Browse source 
Bug: webrtc:7135, webrtc:10198, webrtc:14256
Change-Id: I47dc9034170b1868ad442d36c74c5380964b476b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267827
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37457}
This commit is contained in:
Niels Möller 2022-07-06 10:02:23 +02:00 committed by WebRTC LUCI CQ
parent ed66b77e58
commit 25e268ae0f
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
call/rtp_stream_receiver_controller.cc
View file

@ -31,9 +31,7 @@ RtpStreamReceiverController::Receiver::Receiver(
}
RtpStreamReceiverController::Receiver::~Receiver() {
// Don't require return value > 0, since for RTX we currently may
// have multiple Receiver objects with the same sink.
// TODO(nisse): Consider adding a DCHECK when RtxReceiveStream is wired up.
// This may fail, if corresponding AddSink in the constructor failed.
controller_->RemoveSink(sink_);
}
@ -58,7 +56,7 @@ bool RtpStreamReceiverController::AddSink(uint32_t ssrc,
return demuxer_.AddSink(ssrc, sink);
}
size_t RtpStreamReceiverController::RemoveSink(
bool RtpStreamReceiverController::RemoveSink(
const RtpPacketSinkInterface* sink) {
RTC_DCHECK_RUN_ON(&demuxer_sequence_);
return demuxer_.RemoveSink(sink);

8
call/rtp_stream_receiver_controller.h
View file

@ -35,10 +35,6 @@ class RtpStreamReceiverController
uint32_t ssrc,
RtpPacketSinkInterface* sink) override;
// Thread-safe wrappers for the corresponding RtpDemuxer methods.
bool AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink) override;
size_t RemoveSink(const RtpPacketSinkInterface* sink) override;
// TODO(bugs.webrtc.org/7135): Not yet responsible for parsing.
bool OnRtpPacket(const RtpPacketReceived& packet);
@ -56,6 +52,10 @@ class RtpStreamReceiverController
RtpPacketSinkInterface* const sink_;
};
// Thread-safe wrappers for the corresponding RtpDemuxer methods.
bool AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink);
bool RemoveSink(const RtpPacketSinkInterface* sink);
// TODO(bugs.webrtc.org/11993): We expect construction and all methods to be
// called on the same thread/tq. Currently this is the worker thread
// (including OnRtpPacket) but a more natural fit would be the network thread.

3
call/rtp_stream_receiver_controller_interface.h
View file

@ -36,9 +36,6 @@ class RtpStreamReceiverControllerInterface {
virtual std::unique_ptr<RtpStreamReceiverInterface> CreateReceiver(
uint32_t ssrc,
RtpPacketSinkInterface* sink) = 0;
// For registering additional sinks, needed for FlexFEC.
virtual bool AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink) = 0;
virtual size_t RemoveSink(const RtpPacketSinkInterface* sink) = 0;
};
} // namespace webrtc