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

Add utility method for consistency checking in BaseChannel classes.

Browse Source 
This is a simple check for upcoming changes for media channels to
be able to check if the state on the network thread is consistent.

Bug: webrtc:11992
Change-Id: I8ed2d091ecf3869a66970fc4733aebf209c4ef82
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/246681
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35706}
This commit is contained in:
Tomas Gunnarsson
2022-01-16 20:44:25 +01:00
committed by WebRTC LUCI CQ
parent a49942af17
commit cc9b7ec740
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/base/media_channel.cc
View File

@ -89,6 +89,11 @@ bool MediaChannel::ExtmapAllowMixed() const {
return extmap_allow_mixed_; return extmap_allow_mixed_;
} }
bool MediaChannel::HasNetworkInterface() const {
RTC_DCHECK_RUN_ON(network_thread_);
return network_interface_ != nullptr;
}
void MediaChannel::SetEncoderToPacketizerFrameTransformer( void MediaChannel::SetEncoderToPacketizerFrameTransformer(
uint32_t ssrc, uint32_t ssrc,
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer) {} rtc::scoped_refptr<FrameTransformerInterface> frame_transformer) {}

4
media/base/media_channel.h
View File

@ -260,6 +260,10 @@ class MediaChannel {
void SetExtmapAllowMixed(bool extmap_allow_mixed); void SetExtmapAllowMixed(bool extmap_allow_mixed);
bool ExtmapAllowMixed() const; bool ExtmapAllowMixed() const;
// Returns `true` if a non-null NetworkInterface pointer is held.
// Must be called on the network thread.
bool HasNetworkInterface() const;
virtual webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const = 0; virtual webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const = 0;
virtual webrtc::RTCError SetRtpSendParameters( virtual webrtc::RTCError SetRtpSendParameters(
uint32_t ssrc, uint32_t ssrc,

3
pc/channel.cc
View File

@ -192,6 +192,7 @@ void BaseChannel::Init_w(webrtc::RtpTransportInternal* rtp_transport) {
SetRtpTransport(rtp_transport); SetRtpTransport(rtp_transport);
// Both RTP and RTCP channels should be set, we can call SetInterface on // Both RTP and RTCP channels should be set, we can call SetInterface on
// the media channel and it can set network options. // the media channel and it can set network options.
RTC_DCHECK(!media_channel_->HasNetworkInterface());
media_channel_->SetInterface(this); media_channel_->SetInterface(this);
}); });
} }
@ -208,6 +209,7 @@ void BaseChannel::Deinit() {
if (rtp_transport_) { if (rtp_transport_) {
DisconnectFromRtpTransport_n(); DisconnectFromRtpTransport_n();
} }
RTC_DCHECK(!network_initialized());
}); });
} }
@ -797,6 +799,7 @@ bool BaseChannel::ClearHandledPayloadTypes() {
void BaseChannel::SignalSentPacket_n(const rtc::SentPacket& sent_packet) { void BaseChannel::SignalSentPacket_n(const rtc::SentPacket& sent_packet) {
RTC_DCHECK_RUN_ON(network_thread()); RTC_DCHECK_RUN_ON(network_thread());
RTC_DCHECK(network_initialized());
media_channel()->OnPacketSent(sent_packet); media_channel()->OnPacketSent(sent_packet);
} }

4
pc/channel.h
View File

@ -217,6 +217,10 @@ class BaseChannel : public ChannelInterface,
return extensions_filter_; return extensions_filter_;
} }
bool network_initialized() RTC_RUN_ON(network_thread()) {
return media_channel_->HasNetworkInterface();
}
bool enabled() const RTC_RUN_ON(worker_thread()) { return enabled_; } bool enabled() const RTC_RUN_ON(worker_thread()) { return enabled_; }
rtc::Thread* signaling_thread() const { return signaling_thread_; } rtc::Thread* signaling_thread() const { return signaling_thread_; }