zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused method VideoSender::EnableFrameDropper.

Browse Source 
Bug: None
Change-Id: I03558e4c6ed63b52d42a36d89bb4c89f8210e449
Reviewed-on: https://webrtc-review.googlesource.com/c/115418
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26144}
This commit is contained in:
Niels Möller
2018-12-21 16:28:06 +01:00
committed by Commit Bot
parent 32106925c2
commit 357c2b7b94
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/video_coding_impl.h
View File

@ -117,16 +117,10 @@ class VideoSender {
EncodedImageCallback* const post_encode_callback_; EncodedImageCallback* const post_encode_callback_;
VCMEncoderDataBase _codecDataBase RTC_GUARDED_BY(encoder_crit_); VCMEncoderDataBase _codecDataBase RTC_GUARDED_BY(encoder_crit_);
// |frame_dropper_requested_| specifies if the user of this class has // If frame dropper is not force disabled, frame dropping might still be
// requested frame dropping to be enabled, via EnableFrameDropper(). // disabled if VideoEncoder::GetEncoderInfo() indicates that the encoder has a
// Depending on video encoder configuration, this setting may be overridden // trusted rate controller. This is determined on a per-frame basis, as the
// and the frame dropper be force disabled. If so, // encoder behavior might dynamically change.
// |force_disable_frame_dropper_| will be set to true.
// If frame dropper is requested, and is not force disabled, frame dropping
// might still be disabled if VideoEncoder::GetEncoderInfo() indicates that
// the encoder has a trusted rate controller. This is determined on a
// per-frame basis, as the encoder behavior might dynamically change.
bool frame_dropper_requested_ RTC_GUARDED_BY(encoder_crit_);
bool force_disable_frame_dropper_ RTC_GUARDED_BY(encoder_crit_); bool force_disable_frame_dropper_ RTC_GUARDED_BY(encoder_crit_);
// Must be accessed on the construction thread of VideoSender. // Must be accessed on the construction thread of VideoSender.

9
modules/video_coding/video_sender.cc
View File

@ -52,7 +52,6 @@ VideoSender::VideoSender(Clock* clock,
_encodedFrameCallback(post_encode_callback, &_mediaOpt), _encodedFrameCallback(post_encode_callback, &_mediaOpt),
post_encode_callback_(post_encode_callback), post_encode_callback_(post_encode_callback),
_codecDataBase(&_encodedFrameCallback), _codecDataBase(&_encodedFrameCallback),
frame_dropper_requested_(true),
force_disable_frame_dropper_(false), force_disable_frame_dropper_(false),
current_codec_(), current_codec_(),
encoder_has_internal_source_(false), encoder_has_internal_source_(false),
@ -286,7 +285,7 @@ int32_t VideoSender::AddVideoFrame(
// Frame dropping is enabled iff frame dropping has been requested, and // Frame dropping is enabled iff frame dropping has been requested, and
// frame dropping is not force-disabled, and rate controller is not trusted. // frame dropping is not force-disabled, and rate controller is not trusted.
const bool frame_dropping_enabled = const bool frame_dropping_enabled =
frame_dropper_requested_ && !force_disable_frame_dropper_ && !force_disable_frame_dropper_ &&
!encoder_info->has_trusted_rate_controller; !encoder_info->has_trusted_rate_controller;
_mediaOpt.EnableFrameDropper(frame_dropping_enabled); _mediaOpt.EnableFrameDropper(frame_dropping_enabled);
@ -383,11 +382,5 @@ int32_t VideoSender::IntraFrameRequest(size_t stream_index) {
return VCM_OK; return VCM_OK;
} }
int32_t VideoSender::EnableFrameDropper(bool enable) {
rtc::CritScope lock(&encoder_crit_);
frame_dropper_requested_ = enable;
_mediaOpt.EnableFrameDropper(enable);
return VCM_OK;
}
} // namespace vcm } // namespace vcm
} // namespace webrtc } // namespace webrtc