Google Git
Sign in
webrtc/src/fe8719a7ee^!/.
commit
fe8719a7eef4f7dc5bda642ea0578acb6be36a70
[log]
author
Tommi <tommi@webrtc.org>
Wed Apr 08 04:27:28 2026
committer
WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>
Wed Apr 08 11:29:46 2026
tree
b8eef3023dc728668db03cf9d6e039122fe88e3f
parent
5b9044cd69372b13d105a8af9d11168e4306e611 [diff]
Rename two callback based methods to *Task in MediaChannel

Renamed callback-returning methods to 'Task' suffix in MediaChannel
interfaces and implementations to clarify move-only task semantics.

The following methods were renamed:
* GetStatsCallback is now GetStatsTask
* GetResetUnsignaledRecvStreamCallback is now
  GetResetUnsignaledRecvStreamTask

Bug: none
Change-Id: Iebb3469414651c9e08b7d4fd3f0a75a34dd250c2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/461980
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#47347}

diff --git a/media/base/fake_media_engine.cc b/media/base/fake_media_engine.cc
index 2603c7b..49afc53 100644
--- a/media/base/fake_media_engine.cc
+++ b/media/base/fake_media_engine.cc

@@ -175,7 +175,7 @@
   return false;
 }
 absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()>
-FakeVoiceMediaReceiveChannel::GetStatsCallback(bool reset_legacy) {
+FakeVoiceMediaReceiveChannel::GetStatsTask(bool reset_legacy) {
   return [this, reset_legacy]() -> std::optional<VoiceMediaReceiveInfo> {
     VoiceMediaReceiveInfo info;
     if (GetStats(&info, reset_legacy)) {
@@ -330,7 +330,7 @@
   return false;
 }
 absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()>
-FakeVoiceMediaSendChannel::GetStatsCallback() {
+FakeVoiceMediaSendChannel::GetStatsTask() {
   return [this]() -> std::optional<VoiceMediaSendInfo> {
     VoiceMediaSendInfo info;
     if (GetStats(&info)) {
@@ -441,7 +441,7 @@
   return false;
 }
 absl::AnyInvocable<std::optional<VideoMediaSendInfo>()>
-FakeVideoMediaSendChannel::GetStatsCallback() {
+FakeVideoMediaSendChannel::GetStatsTask() {
   return [this]() -> std::optional<VideoMediaSendInfo> {
     VideoMediaSendInfo info;
     if (GetStats(&info)) {
@@ -591,7 +591,7 @@
   return false;
 }
 absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()>
-FakeVideoMediaReceiveChannel::GetStatsCallback() {
+FakeVideoMediaReceiveChannel::GetStatsTask() {
   return [this]() -> std::optional<VideoMediaReceiveInfo> {
     VideoMediaReceiveInfo info;
     if (GetStats(&info)) {

diff --git a/media/base/fake_media_engine.h b/media/base/fake_media_engine.h
index 18c278b..9e02448 100644
--- a/media/base/fake_media_engine.h
+++ b/media/base/fake_media_engine.h

@@ -125,8 +125,7 @@
   bool CheckNoRtcp() { return rtcp_packets_.empty(); }
   void set_fail_set_recv_codecs(bool fail) { fail_set_recv_codecs_ = fail; }
   void ResetUnsignaledRecvStream() override {}
-  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamCallback()
-      override {
+  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamTask() override {
     return [this]() { ResetUnsignaledRecvStream(); };
   }
   std::optional<uint32_t> GetUnsignaledSsrc() const override {
@@ -528,7 +527,7 @@
 
   bool GetStats(VoiceMediaReceiveInfo* info,
                 bool get_and_clear_legacy_stats) override;
-  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsCallback(
+  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsTask(
       bool reset_legacy) override;
 
   void SetRawAudioSink(uint32_t ssrc,
@@ -622,7 +621,7 @@
   std::optional<Codec> GetSendCodec() const override;
 
   bool GetStats(VoiceMediaSendInfo* stats) override;
-  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsTask()
       override;
 
  private:
@@ -708,7 +707,7 @@
   void ClearRecordableEncodedFrameCallback(uint32_t ssrc) override;
   void RequestRecvKeyFrame(uint32_t ssrc) override;
   bool GetStats(VideoMediaReceiveInfo* info) override;
-  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsTask()
       override;
 
   bool AddDefaultRecvStreamForTesting(const StreamParams& /* sp */) override {
@@ -770,7 +769,7 @@
 
   bool SendCodecHasNack() const override { return false; }
   bool GetStats(VideoMediaSendInfo* info) override;
-  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsTask()
       override;
   bool SetOptions(const VideoOptions& options) override;
 

diff --git a/media/base/media_channel.h b/media/base/media_channel.h
index 641b6e9..1e9d0d4 100644
--- a/media/base/media_channel.h
+++ b/media/base/media_channel.h

@@ -282,8 +282,7 @@
   // Returns a callback that can be used to reset unsignaled receive streams.
   // The purpose is to allow binding the channel's safety flag to a callback
   // that is run on the worker thread, ensuring the channel is alive.
-  virtual absl::AnyInvocable<void() &&>
-  GetResetUnsignaledRecvStreamCallback() = 0;
+  virtual absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamTask() = 0;
   // Sets the abstract interface class for sending RTP/RTCP data.
   virtual void SetInterface(MediaChannelNetworkInterface* iface) = 0;
   // Called on the network when an RTP packet is received.
@@ -934,7 +933,7 @@
   // during asynchronous teardown where signaling thread and worker thread state
   // may be torn down asynchronously.
   virtual absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()>
-  GetStatsCallback() = 0;
+  GetStatsTask() = 0;
   virtual bool SenderNackEnabled() const = 0;
   virtual bool SenderNonSenderRttEnabled() const = 0;
   virtual bool SetOptions(const AudioOptions& options) = 0;
@@ -966,7 +965,7 @@
   // during asynchronous teardown where signaling thread and worker thread state
   // may be torn down asynchronously.
   virtual absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()>
-  GetStatsCallback(bool reset_legacy) = 0;
+  GetStatsTask(bool reset_legacy) = 0;
   virtual enum RtcpMode RtcpMode() const = 0;
   virtual void SetRtcpMode(enum RtcpMode mode) = 0;
   virtual void SetReceiveNackEnabled(bool enabled) = 0;
@@ -1016,7 +1015,7 @@
   // during asynchronous teardown where signaling thread and worker thread state
   // may be torn down asynchronously.
   virtual absl::AnyInvocable<std::optional<VideoMediaSendInfo>()>
-  GetStatsCallback() = 0;
+  GetStatsTask() = 0;
   // This fills the "bitrate parts" (rtx, video bitrate) of the
   // BandwidthEstimationInfo, since that part that isn't possible to get
   // through Call::GetStats, as they are statistics of the send
@@ -1060,7 +1059,7 @@
   // during asynchronous teardown where signaling thread and worker thread state
   // may be torn down asynchronously.
   virtual absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()>
-  GetStatsCallback() = 0;
+  GetStatsTask() = 0;
   virtual bool AddDefaultRecvStreamForTesting(const StreamParams& sp) = 0;
 };
 

diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index cf1ff5d..65fd906 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc

@@ -1737,7 +1737,7 @@
 }
 
 absl::AnyInvocable<std::optional<VideoMediaSendInfo>()>
-WebRtcVideoSendChannel::GetStatsCallback() {
+WebRtcVideoSendChannel::GetStatsTask() {
   return [this, safety = task_safety_.flag()]() mutable
              -> std::optional<VideoMediaSendInfo> {
     if (!safety->alive()) {
@@ -3164,7 +3164,7 @@
 }
 
 absl::AnyInvocable<void() &&>
-WebRtcVideoReceiveChannel::GetResetUnsignaledRecvStreamCallback() {
+WebRtcVideoReceiveChannel::GetResetUnsignaledRecvStreamTask() {
   return SafeTask(task_safety_.flag(),
                   [this]() { ResetUnsignaledRecvStream(); });
 }
@@ -3262,7 +3262,7 @@
 }
 
 absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()>
-WebRtcVideoReceiveChannel::GetStatsCallback() {
+WebRtcVideoReceiveChannel::GetStatsTask() {
   return [this, safety = task_safety_.flag()]() mutable
              -> std::optional<VideoMediaReceiveInfo> {
     if (!safety->alive()) {

diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h
index 3630eb5..45ff9a7 100644
--- a/media/engine/webrtc_video_engine.h
+++ b/media/engine/webrtc_video_engine.h

@@ -211,7 +211,7 @@
   bool RemoveSendStream(uint32_t ssrc) override;
   void FillBitrateInfo(BandwidthEstimationInfo* bwe_info) override;
   bool GetStats(VideoMediaSendInfo* info) override;
-  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsTask()
       override;
 
   void OnPacketSent(const SentPacketInfo& sent_packet) override;
@@ -529,14 +529,14 @@
   }
   bool RemoveRecvStream(uint32_t ssrc) override;
   void ResetUnsignaledRecvStream() override;
-  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamCallback() override;
+  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamTask() override;
   std::optional<uint32_t> GetUnsignaledSsrc() const override;
   void OnDemuxerCriteriaUpdatePending() override;
   void OnDemuxerCriteriaUpdateComplete() override;
   bool SetSink(uint32_t ssrc, VideoSinkInterface<VideoFrame>* sink) override;
   void SetDefaultSink(VideoSinkInterface<VideoFrame>* sink) override;
   bool GetStats(VideoMediaReceiveInfo* info) override;
-  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsTask()
       override;
   void OnPacketReceived(RtpPacketReceived packet) override;
   bool SetBaseMinimumPlayoutDelayMs(uint32_t ssrc, int delay_ms) override;

diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index 05bfafe..7b1483d 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc

@@ -1862,7 +1862,7 @@
 }
 
 absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()>
-WebRtcVoiceSendChannel::GetStatsCallback() {
+WebRtcVoiceSendChannel::GetStatsTask() {
   return [this, safety = task_safety_.flag()]() mutable
              -> std::optional<VoiceMediaSendInfo> {
     if (!safety->alive()) {
@@ -2506,7 +2506,7 @@
 }
 
 absl::AnyInvocable<void() &&>
-WebRtcVoiceReceiveChannel::GetResetUnsignaledRecvStreamCallback() {
+WebRtcVoiceReceiveChannel::GetResetUnsignaledRecvStreamTask() {
   return SafeTask(task_safety_.flag(),
                   [this]() { ResetUnsignaledRecvStream(); });
 }
@@ -2811,19 +2811,18 @@
 }
 
 absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()>
-WebRtcVoiceReceiveChannel::GetStatsCallback(bool get_and_clear_legacy_stats) {
-  return
-      [this, get_and_clear_legacy_stats, safety = task_safety_.flag()]() mutable
-          -> std::optional<VoiceMediaReceiveInfo> {
-        if (!safety->alive()) {
-          return std::nullopt;
-        }
-        VoiceMediaReceiveInfo info;
-        if (GetStats(&info, get_and_clear_legacy_stats)) {
-          return info;
-        }
-        return std::nullopt;
-      };
+WebRtcVoiceReceiveChannel::GetStatsTask(bool reset_legacy) {
+  return [this, reset_legacy, safety = task_safety_.flag()]() mutable
+             -> std::optional<VoiceMediaReceiveInfo> {
+    if (!safety->alive()) {
+      return std::nullopt;
+    }
+    VoiceMediaReceiveInfo info;
+    if (GetStats(&info, reset_legacy)) {
+      return info;
+    }
+    return std::nullopt;
+  };
 }
 
 void WebRtcVoiceReceiveChannel::SetRawAudioSink(

diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h
index 450e99a..cb5ee76 100644
--- a/media/engine/webrtc_voice_engine.h
+++ b/media/engine/webrtc_voice_engine.h

@@ -250,7 +250,7 @@
                              const NetworkRoute& network_route) override;
   void OnReadyToSend(bool ready) override;
   bool GetStats(VoiceMediaSendInfo* info) override;
-  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsTask()
       override;
   bool SetOptions(const AudioOptions& options) override;
 
@@ -358,7 +358,7 @@
   bool AddRecvStream(const StreamParams& sp) override;
   bool RemoveRecvStream(uint32_t ssrc) override;
   void ResetUnsignaledRecvStream() override;
-  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamCallback() override;
+  absl::AnyInvocable<void() &&> GetResetUnsignaledRecvStreamTask() override;
   std::optional<uint32_t> GetUnsignaledSsrc() const override;
 
   void OnDemuxerCriteriaUpdatePending() override;
@@ -382,8 +382,8 @@
   void OnPacketReceived(RtpPacketReceived packet) override;
   bool GetStats(VoiceMediaReceiveInfo* info,
                 bool get_and_clear_legacy_stats) override;
-  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsCallback(
-      bool get_and_clear_legacy_stats) override;
+  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsTask(
+      bool reset_legacy) override;
 
   // Set the audio sink for an existing stream.
   void SetRawAudioSink(uint32_t ssrc,

diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index 598677b..359914e 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc

@@ -2319,8 +2319,8 @@
         VoiceMediaReceiveChannelInterface* voice_receive =
             receive_channel->AsVoiceReceiveChannel();
         RTC_CHECK(voice_receive);
-        refs.get_send_stats_voice = voice_send->GetStatsCallback();
-        refs.get_receive_stats_voice = voice_receive->GetStatsCallback(false);
+        refs.get_send_stats_voice = voice_send->GetStatsTask();
+        refs.get_receive_stats_voice = voice_receive->GetStatsTask(false);
         refs.get_send_parameters = voice_send->GetRtpSendParametersCallback();
       } else if (stats.media_type == MediaType::VIDEO) {
         VideoMediaSendChannelInterface* video_send =
@@ -2329,8 +2329,8 @@
         VideoMediaReceiveChannelInterface* video_receive =
             receive_channel->AsVideoReceiveChannel();
         RTC_CHECK(video_receive);
-        refs.get_send_stats_video = video_send->GetStatsCallback();
-        refs.get_receive_stats_video = video_receive->GetStatsCallback();
+        refs.get_send_stats_video = video_send->GetStatsTask();
+        refs.get_receive_stats_video = video_receive->GetStatsTask();
         refs.get_send_parameters = video_send->GetRtpSendParametersCallback();
       }
     }

diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc
index e5dae81..00ec069 100644
--- a/pc/sdp_offer_answer.cc
+++ b/pc/sdp_offer_answer.cc

@@ -5957,8 +5957,7 @@
         // Ideally we'd remove only the streams that were matched based on
         // payload type alone, but currently there is no straightforward way to
         // identify those streams.
-        worker_tasks.Add(
-            receive_channel->GetResetUnsignaledRecvStreamCallback());
+        worker_tasks.Add(receive_channel->GetResetUnsignaledRecvStreamTask());
       }
     }
   }

diff --git a/pc/test/fake_peer_connection_for_stats.h b/pc/test/fake_peer_connection_for_stats.h
index c2f0f07..bee4444 100644
--- a/pc/test/fake_peer_connection_for_stats.h
+++ b/pc/test/fake_peer_connection_for_stats.h

@@ -113,7 +113,7 @@
     return false;
   }
 
-  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VoiceMediaSendInfo>()> GetStatsTask()
       override {
     return [this, safety = task_safety_.flag()]() mutable
                -> std::optional<VoiceMediaSendInfo> {
@@ -156,8 +156,8 @@
     return false;
   }
 
-  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsCallback(
-      bool get_and_clear_legacy_stats) override {
+  absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()> GetStatsTask(
+      bool reset_legacy) override {
     return [this, safety = task_safety_.flag()]() mutable
                -> std::optional<VoiceMediaReceiveInfo> {
       if (!safety->alive()) {
@@ -198,7 +198,7 @@
     return false;
   }
 
-  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaSendInfo>()> GetStatsTask()
       override {
     return [this, safety = task_safety_.flag()]() mutable
                -> std::optional<VideoMediaSendInfo> {
@@ -239,7 +239,7 @@
     return false;
   }
 
-  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsCallback()
+  absl::AnyInvocable<std::optional<VideoMediaReceiveInfo>()> GetStatsTask()
       override {
     return [this, safety = task_safety_.flag()]() mutable
                -> std::optional<VideoMediaReceiveInfo> {

diff --git a/pc/test/mock_voice_media_receive_channel_interface.h b/pc/test/mock_voice_media_receive_channel_interface.h
index 688120d..83adde2 100644
--- a/pc/test/mock_voice_media_receive_channel_interface.h
+++ b/pc/test/mock_voice_media_receive_channel_interface.h

@@ -76,7 +76,7 @@
               (webrtc::VoiceMediaReceiveInfo * stats, bool reset_legacy),
               (override));
   MOCK_METHOD(absl::AnyInvocable<std::optional<VoiceMediaReceiveInfo>()>,
-              GetStatsCallback,
+              GetStatsTask,
               (bool reset_legacy),
               (override));
   MOCK_METHOD(::webrtc::RtcpMode, RtcpMode, (), (const, override));
@@ -102,7 +102,7 @@
   MOCK_METHOD(bool, RemoveRecvStream, (uint32_t ssrc), (override));
   MOCK_METHOD(void, ResetUnsignaledRecvStream, (), (override));
   MOCK_METHOD(absl::AnyInvocable<void() &&>,
-              GetResetUnsignaledRecvStreamCallback,
+              GetResetUnsignaledRecvStreamTask,
               (),
               (override));
   MOCK_METHOD(void,