commit 4a5c85500810da7de0af0f1020c5af7894696f06
author Niels Möller <nisse@webrtc.org> Wed Dec 16 15:30:01 2020
committer Commit Bot <commit-bot@chromium.org> Tue Jan 12 12:24:33 2021
tree d849623eb49bc7cc52d85e3c89984060c21ad732
parent 3a99ebefbb5e3faf33055a63e11eadb69c6ddc6f

Add thread annotation to IncomingVideoStream

Bug: None
Change-Id: I16426ce4fbd9afd59e00fb2ce06abfaba4d5c4de
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/197980
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32945}

common_video/include/incoming_video_stream.h

diff --git a/common_video/include/incoming_video_stream.h b/common_video/include/incoming_video_stream.h
index 0dcd4ef..a779f2c 100644
--- a/common_video/include/incoming_video_stream.h
+++ b/common_video/include/incoming_video_stream.h
@@ -19,6 +19,7 @@
 #include "common_video/video_render_frames.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/task_queue.h"
+#include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
@@ -37,7 +38,7 @@
   rtc::ThreadChecker main_thread_checker_;
   rtc::RaceChecker decoder_race_checker_;
 
-  VideoRenderFrames render_buffers_;  // Only touched on the TaskQueue.
+  VideoRenderFrames render_buffers_ RTC_GUARDED_BY(&incoming_render_queue_);
   rtc::VideoSinkInterface<VideoFrame>* const callback_;
   rtc::TaskQueue incoming_render_queue_;
 };

common_video/incoming_video_stream.cc

diff --git a/common_video/incoming_video_stream.cc b/common_video/incoming_video_stream.cc
index d1f8bea..15c668e 100644
--- a/common_video/incoming_video_stream.cc
+++ b/common_video/incoming_video_stream.cc
@@ -42,7 +42,7 @@
   // into the lambda instead of copying it, but it doesn't work unless we change
   // OnFrame to take its frame argument by value instead of const reference.
   incoming_render_queue_.PostTask([this, video_frame = video_frame]() mutable {
-    RTC_DCHECK(incoming_render_queue_.IsCurrent());
+    RTC_DCHECK_RUN_ON(&incoming_render_queue_);
     if (render_buffers_.AddFrame(std::move(video_frame)) == 1)
       Dequeue();
   });
@@ -50,7 +50,7 @@
 
 void IncomingVideoStream::Dequeue() {
   TRACE_EVENT0("webrtc", "IncomingVideoStream::Dequeue");
-  RTC_DCHECK(incoming_render_queue_.IsCurrent());
+  RTC_DCHECK_RUN_ON(&incoming_render_queue_);
   absl::optional<VideoFrame> frame_to_render = render_buffers_.FrameToRender();
   if (frame_to_render)
     callback_->OnFrame(*frame_to_render);