From a8b150888ca61b72de674a999a86aa8fc0682652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 7 Feb 2018 13:42:09 +0100 Subject: [PATCH] Stricter declarations in VideoStreamEncoder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mark overuse_detector_ pointer const, add a few RTC_RUN_ON and RTC_PT_GUARDED_BY annotations. Bug: none Change-Id: Ibaf6d738f20fbffacfed42c36a34779be52dd9fc Reviewed-on: https://webrtc-review.googlesource.com/46000 Commit-Queue: Niels Moller Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#21936} --- video/video_stream_encoder.cc | 1 - video/video_stream_encoder.h | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index 18f9d216a6..1d56c5287b 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -570,7 +570,6 @@ void VideoStreamEncoder::ConfigureEncoderOnTaskQueue( // the VideoBitrateAllocator and call OnEncoderConfigurationChanged with a // "soft" reconfiguration. void VideoStreamEncoder::ReconfigureEncoder() { - RTC_DCHECK_RUN_ON(&encoder_queue_); RTC_DCHECK(pending_encoder_reconfiguration_); std::vector streams = encoder_config_.video_stream_factory->CreateEncoderStreams( diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h index 9da8f93410..ae0a9583bc 100644 --- a/video/video_stream_encoder.h +++ b/video/video_stream_encoder.h @@ -141,7 +141,7 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface, void ConfigureEncoderOnTaskQueue(VideoEncoderConfig config, size_t max_data_payload_length, bool nack_enabled); - void ReconfigureEncoder(); + void ReconfigureEncoder() RTC_RUN_ON(&encoder_queue_); void ConfigureQualityScaler(); @@ -218,10 +218,11 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface, const VideoCodecType codec_type_; vcm::VideoSender video_sender_ RTC_GUARDED_BY(&encoder_queue_); - std::unique_ptr overuse_detector_ - RTC_GUARDED_BY(&encoder_queue_); + const std::unique_ptr overuse_detector_ + RTC_PT_GUARDED_BY(&encoder_queue_); std::unique_ptr quality_scaler_ - RTC_GUARDED_BY(&encoder_queue_); + RTC_GUARDED_BY(&encoder_queue_) + RTC_PT_GUARDED_BY(&encoder_queue_); SendStatisticsProxy* const stats_proxy_; rtc::VideoSinkInterface* const pre_encode_callback_; @@ -231,7 +232,8 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface, VideoEncoderConfig encoder_config_ RTC_GUARDED_BY(&encoder_queue_); std::unique_ptr rate_allocator_ - RTC_GUARDED_BY(&encoder_queue_); + RTC_GUARDED_BY(&encoder_queue_) + RTC_PT_GUARDED_BY(&encoder_queue_); // The maximum frame rate of the current codec configuration, as determined // at the last ReconfigureEncoder() call. int max_framerate_ RTC_GUARDED_BY(&encoder_queue_);