From 0f1b9a9589cc398fa2e0d81ecbc25a2a2f9d5400 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 17 Jan 2024 19:32:15 +0100 Subject: [PATCH] Replace rtc::TaskQueue* with TaskQueueBase* in audio channel send frame transformer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To remove unneeded dependency on rtc::TaskQueue wrapper Bug: webrtc:14169 Change-Id: Ib43da5c2a942a8278761db6a99a1632e72ee34fb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334920 Commit-Queue: Danil Chapovalov Auto-Submit: Danil Chapovalov Reviewed-by: Jakob Ivarsson‎ Cr-Commit-Position: refs/heads/main@{#41555} --- audio/channel_send.cc | 2 +- audio/channel_send_frame_transformer_delegate.cc | 2 +- audio/channel_send_frame_transformer_delegate.h | 6 +++--- ...channel_send_frame_transformer_delegate_unittest.cc | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/audio/channel_send.cc b/audio/channel_send.cc index ecf2cb5175..78d3c64dc5 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -873,7 +873,7 @@ void ChannelSend::InitFrameTransformerDelegate( frame_transformer_delegate_ = rtc::make_ref_counted( std::move(send_audio_callback), std::move(frame_transformer), - &encoder_queue_); + encoder_queue_.Get()); frame_transformer_delegate_->Init(); } diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc index 2eea0d2387..ac32410aed 100644 --- a/audio/channel_send_frame_transformer_delegate.cc +++ b/audio/channel_send_frame_transformer_delegate.cc @@ -114,7 +114,7 @@ class TransformableOutgoingAudioFrame ChannelSendFrameTransformerDelegate::ChannelSendFrameTransformerDelegate( SendFrameCallback send_frame_callback, rtc::scoped_refptr frame_transformer, - rtc::TaskQueue* encoder_queue) + TaskQueueBase* encoder_queue) : send_frame_callback_(send_frame_callback), frame_transformer_(std::move(frame_transformer)), encoder_queue_(encoder_queue) {} diff --git a/audio/channel_send_frame_transformer_delegate.h b/audio/channel_send_frame_transformer_delegate.h index 97fc14f737..30e63ff98b 100644 --- a/audio/channel_send_frame_transformer_delegate.h +++ b/audio/channel_send_frame_transformer_delegate.h @@ -16,10 +16,10 @@ #include "api/frame_transformer_interface.h" #include "api/sequence_checker.h" +#include "api/task_queue/task_queue_base.h" #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "rtc_base/buffer.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/task_queue.h" namespace webrtc { @@ -40,7 +40,7 @@ class ChannelSendFrameTransformerDelegate : public TransformedFrameCallback { ChannelSendFrameTransformerDelegate( SendFrameCallback send_frame_callback, rtc::scoped_refptr frame_transformer, - rtc::TaskQueue* encoder_queue); + TaskQueueBase* encoder_queue); // Registers `this` as callback for `frame_transformer_`, to get the // transformed frames. @@ -79,7 +79,7 @@ class ChannelSendFrameTransformerDelegate : public TransformedFrameCallback { mutable Mutex send_lock_; SendFrameCallback send_frame_callback_ RTC_GUARDED_BY(send_lock_); rtc::scoped_refptr frame_transformer_; - rtc::TaskQueue* encoder_queue_ RTC_GUARDED_BY(send_lock_); + TaskQueueBase* const encoder_queue_; bool short_circuit_ RTC_GUARDED_BY(send_lock_) = false; }; diff --git a/audio/channel_send_frame_transformer_delegate_unittest.cc b/audio/channel_send_frame_transformer_delegate_unittest.cc index 4dcd15cd95..483a2cce78 100644 --- a/audio/channel_send_frame_transformer_delegate_unittest.cc +++ b/audio/channel_send_frame_transformer_delegate_unittest.cc @@ -78,7 +78,7 @@ std::unique_ptr CreateFrame() { MockChannelSend mock_channel; rtc::scoped_refptr delegate = rtc::make_ref_counted( - mock_channel.callback(), mock_frame_transformer, &channel_queue); + mock_channel.callback(), mock_frame_transformer, channel_queue.Get()); std::unique_ptr frame; ON_CALL(*mock_frame_transformer, Transform) @@ -131,7 +131,7 @@ TEST(ChannelSendFrameTransformerDelegateTest, MockChannelSend mock_channel; rtc::scoped_refptr delegate = rtc::make_ref_counted( - mock_channel.callback(), mock_frame_transformer, &channel_queue); + mock_channel.callback(), mock_frame_transformer, channel_queue.Get()); rtc::scoped_refptr callback; EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameCallback) .WillOnce(SaveArg<0>(&callback)); @@ -160,7 +160,7 @@ TEST(ChannelSendFrameTransformerDelegateTest, MockChannelSend mock_channel; rtc::scoped_refptr delegate = rtc::make_ref_counted( - mock_channel.callback(), mock_frame_transformer, &channel_queue); + mock_channel.callback(), mock_frame_transformer, channel_queue.Get()); rtc::scoped_refptr callback; EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameCallback) .WillOnce(SaveArg<0>(&callback)); @@ -192,7 +192,7 @@ TEST(ChannelSendFrameTransformerDelegateTest, MockChannelSend mock_channel; rtc::scoped_refptr delegate = rtc::make_ref_counted( - mock_channel.callback(), mock_frame_transformer, &channel_queue); + mock_channel.callback(), mock_frame_transformer, channel_queue.Get()); delegate->Reset(); EXPECT_CALL(mock_channel, SendFrame).Times(0); @@ -207,7 +207,7 @@ TEST(ChannelSendFrameTransformerDelegateTest, ShortCircuitingSkipsTransform) { MockChannelSend mock_channel; rtc::scoped_refptr delegate = rtc::make_ref_counted( - mock_channel.callback(), mock_frame_transformer, &channel_queue); + mock_channel.callback(), mock_frame_transformer, channel_queue.Get()); delegate->StartShortCircuiting();