commit 0f1b9a9589cc398fa2e0d81ecbc25a2a2f9d5400
author Danil Chapovalov <danilchap@webrtc.org> Wed Jan 17 18:32:15 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 18 09:39:55 2024
tree 188c17171c5cdded140e08a0789883cc9309a5bf
parent 7aff4d1a4083512dd3949bbc63f3e8dbb1c63e60

Replace rtc::TaskQueue* with TaskQueueBase* in audio channel send frame transformer

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 <danilchap@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41555}

audio/channel_send.cc

diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index ecf2cb5..78d3c64 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -873,7 +873,7 @@
   frame_transformer_delegate_ =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
           std::move(send_audio_callback), std::move(frame_transformer),
-          &encoder_queue_);
+          encoder_queue_.Get());
   frame_transformer_delegate_->Init();
 }
 

audio/channel_send_frame_transformer_delegate.cc

diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc
index 2eea0d2..ac32410 100644
--- a/audio/channel_send_frame_transformer_delegate.cc
+++ b/audio/channel_send_frame_transformer_delegate.cc
@@ -114,7 +114,7 @@
 ChannelSendFrameTransformerDelegate::ChannelSendFrameTransformerDelegate(
     SendFrameCallback send_frame_callback,
     rtc::scoped_refptr<FrameTransformerInterface> 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) {}

audio/channel_send_frame_transformer_delegate.h

diff --git a/audio/channel_send_frame_transformer_delegate.h b/audio/channel_send_frame_transformer_delegate.h
index 97fc14f..30e63ff 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 @@
   ChannelSendFrameTransformerDelegate(
       SendFrameCallback send_frame_callback,
       rtc::scoped_refptr<FrameTransformerInterface> 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 @@
   mutable Mutex send_lock_;
   SendFrameCallback send_frame_callback_ RTC_GUARDED_BY(send_lock_);
   rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_;
-  rtc::TaskQueue* encoder_queue_ RTC_GUARDED_BY(send_lock_);
+  TaskQueueBase* const encoder_queue_;
   bool short_circuit_ RTC_GUARDED_BY(send_lock_) = false;
 };
 

audio/channel_send_frame_transformer_delegate_unittest.cc

diff --git a/audio/channel_send_frame_transformer_delegate_unittest.cc b/audio/channel_send_frame_transformer_delegate_unittest.cc
index 4dcd15c..483a2cc 100644
--- a/audio/channel_send_frame_transformer_delegate_unittest.cc
+++ b/audio/channel_send_frame_transformer_delegate_unittest.cc
@@ -78,7 +78,7 @@
   MockChannelSend mock_channel;
   rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
-          mock_channel.callback(), mock_frame_transformer, &channel_queue);
+          mock_channel.callback(), mock_frame_transformer, channel_queue.Get());
 
   std::unique_ptr<TransformableFrameInterface> frame;
   ON_CALL(*mock_frame_transformer, Transform)
@@ -131,7 +131,7 @@
   MockChannelSend mock_channel;
   rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
-          mock_channel.callback(), mock_frame_transformer, &channel_queue);
+          mock_channel.callback(), mock_frame_transformer, channel_queue.Get());
   rtc::scoped_refptr<TransformedFrameCallback> callback;
   EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameCallback)
       .WillOnce(SaveArg<0>(&callback));
@@ -160,7 +160,7 @@
   MockChannelSend mock_channel;
   rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
-          mock_channel.callback(), mock_frame_transformer, &channel_queue);
+          mock_channel.callback(), mock_frame_transformer, channel_queue.Get());
   rtc::scoped_refptr<TransformedFrameCallback> callback;
   EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameCallback)
       .WillOnce(SaveArg<0>(&callback));
@@ -192,7 +192,7 @@
   MockChannelSend mock_channel;
   rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
-          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 @@
   MockChannelSend mock_channel;
   rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate =
       rtc::make_ref_counted<ChannelSendFrameTransformerDelegate>(
-          mock_channel.callback(), mock_frame_transformer, &channel_queue);
+          mock_channel.callback(), mock_frame_transformer, channel_queue.Get());
 
   delegate->StartShortCircuiting();