Skip to content

Commit

Permalink
[Adaptation] Disable inital frame drop for simuclast/svc
Browse files Browse the repository at this point in the history
Bug: chromium:1080789
Change-Id: I72bbee4ac21302d15b6c54abea48d665e8ef6922
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174808
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@google.com>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31212}
  • Loading branch information
Ilya Nikolaevskiy authored and Commit Bot committed May 11, 2020
1 parent 6efc14b commit a270250
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion video/video_stream_encoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,12 @@ void VideoStreamEncoder::OnBitrateUpdated(DataRate target_bitrate,
}

bool VideoStreamEncoder::DropDueToSize(uint32_t pixel_count) const {
if (!stream_resource_manager_.DropInitialFrames() ||
bool simulcast_or_svc =
(send_codec_.codecType == VideoCodecType::kVideoCodecVP9 &&
send_codec_.VP9().numberOfSpatialLayers > 1) ||
send_codec_.numberOfSimulcastStreams > 1;

if (simulcast_or_svc || !stream_resource_manager_.DropInitialFrames() ||
!encoder_target_bitrate_bps_.has_value()) {
return false;
}
Expand Down

0 comments on commit a270250

Please sign in to comment.