From 3fa23eec4bf93280f6d64a63169685df6cfc861a Mon Sep 17 00:00:00 2001 From: Markus Handell Date: Mon, 18 May 2020 15:09:46 +0200 Subject: [PATCH] VideoAdapter: add missing attribute thread annotations. Bug: webrtc:11567 Change-Id: Iacb4ba4504e58778f828e7027a1b8d0f96227267 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175660 Reviewed-by: Niels Moller Commit-Queue: Markus Handell Cr-Commit-Position: refs/heads/master@{#31311} --- media/base/video_adapter.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/media/base/video_adapter.h b/media/base/video_adapter.h index 936cf8917e..65c2d42267 100644 --- a/media/base/video_adapter.h +++ b/media/base/video_adapter.h @@ -99,12 +99,17 @@ class VideoAdapter { // Determine if frame should be dropped based on input fps and requested fps. bool KeepFrame(int64_t in_timestamp_ns); - int frames_in_; // Number of input frames. - int frames_out_; // Number of output frames. - int frames_scaled_; // Number of frames scaled. - int adaption_changes_; // Number of changes in scale factor. - int previous_width_; // Previous adapter output width. - int previous_height_; // Previous adapter output height. + int frames_in_ RTC_GUARDED_BY(critical_section_); // Number of input frames. + int frames_out_ + RTC_GUARDED_BY(critical_section_); // Number of output frames. + int frames_scaled_ + RTC_GUARDED_BY(critical_section_); // Number of frames scaled. + int adaption_changes_ + RTC_GUARDED_BY(critical_section_); // Number of changes in scale factor. + int previous_width_ + RTC_GUARDED_BY(critical_section_); // Previous adapter output width. + int previous_height_ + RTC_GUARDED_BY(critical_section_); // Previous adapter output height. const bool variable_start_scale_factor_; // The fixed source resolution alignment requirement.