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

Stricter declarations in VideoStreamEncoder.

Browse Source 
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 <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21936}
This commit is contained in:
Niels Möller 2018-02-07 13:42:09 +01:00 committed by Commit Bot
parent 1f432e014b
commit a8b150888c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
video/video_stream_encoder.cc
View File

@ -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<VideoStream> streams =
encoder_config_.video_stream_factory->CreateEncoderStreams(

12
video/video_stream_encoder.h
View File

@ -141,7 +141,7 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface<VideoFrame>,
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<VideoFrame>,
const VideoCodecType codec_type_;
vcm::VideoSender video_sender_ RTC_GUARDED_BY(&encoder_queue_);
std::unique_ptr<OveruseFrameDetector> overuse_detector_
RTC_GUARDED_BY(&encoder_queue_);
const std::unique_ptr<OveruseFrameDetector> overuse_detector_
RTC_PT_GUARDED_BY(&encoder_queue_);
std::unique_ptr<QualityScaler> quality_scaler_
RTC_GUARDED_BY(&encoder_queue_);
RTC_GUARDED_BY(&encoder_queue_)
RTC_PT_GUARDED_BY(&encoder_queue_);
SendStatisticsProxy* const stats_proxy_;
rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
@ -231,7 +232,8 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface<VideoFrame>,
VideoEncoderConfig encoder_config_ RTC_GUARDED_BY(&encoder_queue_);
std::unique_ptr<VideoBitrateAllocator> 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_);