admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add thread annotation to IncomingVideoStream

Browse Source 
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}
This commit is contained in:
Niels Möller 2020-12-16 16:30:01 +01:00 committed by Commit Bot
parent 3a99ebefbb
commit 4a5c855008
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common_video/include/incoming_video_stream.h
View File

@ -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 @@ class IncomingVideoStream : public rtc::VideoSinkInterface<VideoFrame> {
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_;
};

4
common_video/incoming_video_stream.cc
View File

@ -42,7 +42,7 @@ void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) {
// 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::OnFrame(const VideoFrame& video_frame) {
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);