pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-08 09:04:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mjpeg: Convert rate control checks to asserts in encoder

Browse Source 
The checks would lead the reader to think these functions can be called
when bit rate control is off when in fact they are only called when it
is active.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
This commit is contained in:
Francois Gouget 2015-06-10 17:33:01 +02:00 committed by Christophe Fergeau
parent 03af3f382d
commit f017d7a421
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/mjpeg_encoder.c
View File

@ -607,9 +607,7 @@ static void mjpeg_encoder_adjust_params_to_bit_rate(MJpegEncoder *encoder)
uint32_t latency = 0;
uint32_t src_fps;
if (!encoder->rate_control_is_active) {
return;
}
spice_assert(encoder->rate_control_is_active);
rate_control = &encoder->rate_control;
quality_eval = &rate_control->quality_eval_data;
@ -694,9 +692,8 @@ static void mjpeg_encoder_adjust_fps(MJpegEncoder *encoder, uint64_t now)
MJpegEncoderRateControl *rate_control = &encoder->rate_control;
uint64_t adjusted_fps_time_passed;
if (!encoder->rate_control_is_active) {
return;
}
spice_assert(encoder->rate_control_is_active);
adjusted_fps_time_passed = (now - rate_control->adjusted_fps_start_time) / 1000 / 1000;
if (!rate_control->during_quality_eval &&