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

Use webrtc::TaskQueueBase type instead of rtc::Thread

Browse source 
...for signaling and worker thread members in BaseChannel classes.

Bug: webrtc:15099
Change-Id: I83611ed2564e143aca19d0f12ce060b77eb9d2a7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325260
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41041}
This commit is contained in:
Tommi 2023-10-28 18:24:41 +02:00 committed by WebRTC LUCI CQ
parent f3e9db9e17
commit c3b7a50720
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pc/channel.cc
View file

@ -112,9 +112,9 @@ void RtpSendParametersFromMediaDescription(
} }
BaseChannel::BaseChannel( BaseChannel::BaseChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<MediaSendChannelInterface> send_media_channel_impl, std::unique_ptr<MediaSendChannelInterface> send_media_channel_impl,
std::unique_ptr<MediaReceiveChannelInterface> receive_media_channel_impl, std::unique_ptr<MediaReceiveChannelInterface> receive_media_channel_impl,
absl::string_view mid, absl::string_view mid,
@ -819,9 +819,9 @@ void BaseChannel::SignalSentPacket_n(const rtc::SentPacket& sent_packet) {
} }
VoiceChannel::VoiceChannel( VoiceChannel::VoiceChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<VoiceMediaSendChannelInterface> media_send_channel, std::unique_ptr<VoiceMediaSendChannelInterface> media_send_channel,
std::unique_ptr<VoiceMediaReceiveChannelInterface> media_receive_channel, std::unique_ptr<VoiceMediaReceiveChannelInterface> media_receive_channel,
absl::string_view mid, absl::string_view mid,
@ -952,9 +952,9 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
} }
VideoChannel::VideoChannel( VideoChannel::VideoChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<VideoMediaSendChannelInterface> media_send_channel, std::unique_ptr<VideoMediaSendChannelInterface> media_send_channel,
std::unique_ptr<VideoMediaReceiveChannelInterface> media_receive_channel, std::unique_ptr<VideoMediaReceiveChannelInterface> media_receive_channel,
absl::string_view mid, absl::string_view mid,

20
pc/channel.h
View file

@ -82,9 +82,9 @@ class BaseChannel : public ChannelInterface,
// Constructor for use when the MediaChannels are split // Constructor for use when the MediaChannels are split
BaseChannel( BaseChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<MediaSendChannelInterface> media_send_channel, std::unique_ptr<MediaSendChannelInterface> media_send_channel,
std::unique_ptr<MediaReceiveChannelInterface> media_receive_channel, std::unique_ptr<MediaReceiveChannelInterface> media_receive_channel,
absl::string_view mid, absl::string_view mid,
@ -93,7 +93,7 @@ class BaseChannel : public ChannelInterface,
rtc::UniqueRandomIdGenerator* ssrc_generator); rtc::UniqueRandomIdGenerator* ssrc_generator);
virtual ~BaseChannel(); virtual ~BaseChannel();
rtc::Thread* worker_thread() const { return worker_thread_; } webrtc::TaskQueueBase* worker_thread() const { return worker_thread_; }
rtc::Thread* network_thread() const { return network_thread_; } rtc::Thread* network_thread() const { return network_thread_; }
const std::string& mid() const override { return demuxer_criteria_.mid(); } const std::string& mid() const override { return demuxer_criteria_.mid(); }
// TODO(deadbeef): This is redundant; remove this. // TODO(deadbeef): This is redundant; remove this.
@ -206,7 +206,7 @@ class BaseChannel : public ChannelInterface,
} }
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_; } webrtc::TaskQueueBase* signaling_thread() const { return signaling_thread_; }
// Call to verify that: // Call to verify that:
// * The required content description directions have been set. // * The required content description directions have been set.
@ -311,9 +311,9 @@ class BaseChannel : public ChannelInterface,
void DisconnectFromRtpTransport_n() RTC_RUN_ON(network_thread()); void DisconnectFromRtpTransport_n() RTC_RUN_ON(network_thread());
void SignalSentPacket_n(const rtc::SentPacket& sent_packet); void SignalSentPacket_n(const rtc::SentPacket& sent_packet);
rtc::Thread* const worker_thread_; webrtc::TaskQueueBase* const worker_thread_;
rtc::Thread* const network_thread_; rtc::Thread* const network_thread_;
rtc::Thread* const signaling_thread_; webrtc::TaskQueueBase* const signaling_thread_;
rtc::scoped_refptr<webrtc::PendingTaskSafetyFlag> alive_; rtc::scoped_refptr<webrtc::PendingTaskSafetyFlag> alive_;
std::function<void()> on_first_packet_received_ std::function<void()> on_first_packet_received_
@ -367,9 +367,9 @@ class BaseChannel : public ChannelInterface,
class VoiceChannel : public BaseChannel { class VoiceChannel : public BaseChannel {
public: public:
VoiceChannel( VoiceChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<VoiceMediaSendChannelInterface> send_channel_impl, std::unique_ptr<VoiceMediaSendChannelInterface> send_channel_impl,
std::unique_ptr<VoiceMediaReceiveChannelInterface> receive_channel_impl, std::unique_ptr<VoiceMediaReceiveChannelInterface> receive_channel_impl,
absl::string_view mid, absl::string_view mid,
@ -437,9 +437,9 @@ class VoiceChannel : public BaseChannel {
class VideoChannel : public BaseChannel { class VideoChannel : public BaseChannel {
public: public:
VideoChannel( VideoChannel(
rtc::Thread* worker_thread, webrtc::TaskQueueBase* worker_thread,
rtc::Thread* network_thread, rtc::Thread* network_thread,
rtc::Thread* signaling_thread, webrtc::TaskQueueBase* signaling_thread,
std::unique_ptr<VideoMediaSendChannelInterface> media_send_channel, std::unique_ptr<VideoMediaSendChannelInterface> media_send_channel,
std::unique_ptr<VideoMediaReceiveChannelInterface> media_receive_channel, std::unique_ptr<VideoMediaReceiveChannelInterface> media_receive_channel,
absl::string_view mid, absl::string_view mid,