commit c35a3f13c7980b0afbb26d901df4bc2e6f45fa3f
author Markus Handell <handellm@webrtc.org> Fri Mar 03 09:04:27 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 03 16:08:07 2023
tree 57ba655cb23d6f59e3619eb276fe0eea9de91945
parent 28c4986e1b44b3d61f429d8bf560ce1d727bd3e4

RtpSenderEgress::SendPacket: avoid PostTasks.

Under the combined network/worker thread project, tasks
are unnecessarily posted to the same thread. Avoid this
by posting only if invoked on a diffferent sequence.

TESTED=presubmit + local Meet calls.

Bug: webrtc:137439
Change-Id: I9befde0583b214ebe014617695c2eb9f047de8a0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295869
Commit-Queue: Markus Handell <handellm@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39472}

modules/rtp_rtcp/source/rtp_sender_egress.cc

diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.cc b/modules/rtp_rtcp/source/rtp_sender_egress.cc
index 3f836c5..d8163dc 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_egress.cc
@@ -277,13 +277,20 @@
     RtpPacketMediaType packet_type = *packet->packet_type();
     RtpPacketCounter counter(*packet);
     size_t size = packet->size();
-    worker_queue_->PostTask(
-        SafeTask(task_safety_.flag(), [this, now, packet_ssrc, packet_type,
-                                       counter = std::move(counter), size]() {
-          RTC_DCHECK_RUN_ON(worker_queue_);
-          UpdateRtpStats(now, packet_ssrc, packet_type, std::move(counter),
-                         size);
-        }));
+    // TODO(bugs.webrtc.org/137439): clean up task posting when the combined
+    // network/worker project launches.
+    if (TaskQueueBase::Current() != worker_queue_) {
+      worker_queue_->PostTask(
+          SafeTask(task_safety_.flag(), [this, now, packet_ssrc, packet_type,
+                                         counter = std::move(counter), size]() {
+            RTC_DCHECK_RUN_ON(worker_queue_);
+            UpdateRtpStats(now, packet_ssrc, packet_type, std::move(counter),
+                           size);
+          }));
+    } else {
+      RTC_DCHECK_RUN_ON(worker_queue_);
+      UpdateRtpStats(now, packet_ssrc, packet_type, std::move(counter), size);
+    }
   }
 }