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

mjpeg: Pull more code in get_min_required_playback_delay()

Browse Source 
This reduces code duplication and passing the MJpegEncoder object
makes it possible to modify the playback calculation without adding
more arguments.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Francois Gouget 2019-05-21 02:43:18 +02:00 committed by Frediano Ziglio
parent 7515a0ac57
commit 3d7f1cc512
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/mjpeg-encoder.c
View File

@ -181,9 +181,8 @@ typedef struct MJpegEncoder {
} MJpegEncoder;
static void mjpeg_encoder_process_server_drops(MJpegEncoder *encoder);
static uint32_t get_min_required_playback_delay(uint64_t frame_enc_size,
uint64_t byte_rate,
uint32_t latency);
static uint32_t get_min_required_playback_delay(const MJpegEncoder *encoder,
uint64_t frame_enc_size);
static void mjpeg_video_buffer_free(VideoBuffer *video_buffer)
{
@ -534,10 +533,7 @@ complete_sample:
spice_debug("MJpeg quality sample end %p: quality %d fps %d",
encoder, mjpeg_quality_samples[rate_control->quality_id], rate_control->fps);
if (encoder->cbs.update_client_playback_delay) {
uint32_t latency = mjpeg_encoder_get_latency(encoder);
uint32_t min_delay = get_min_required_playback_delay(final_quality_enc_size,
rate_control->byte_rate,
latency);
uint32_t min_delay = get_min_required_playback_delay(encoder, final_quality_enc_size);
encoder->cbs.update_client_playback_delay(encoder->cbs.opaque, min_delay);
}
@ -1166,10 +1162,11 @@ static void mjpeg_encoder_handle_positive_client_stream_report(MJpegEncoder *enc
* the video playback jitter buffer should be at least (send_time*2 + net_latency) for
* preventing underflow
*/
static uint32_t get_min_required_playback_delay(uint64_t frame_enc_size,
uint64_t byte_rate,
uint32_t latency)
static uint32_t get_min_required_playback_delay(const MJpegEncoder *encoder,
uint64_t frame_enc_size)
{
uint64_t byte_rate = encoder->rate_control.byte_rate;
uint32_t latency = mjpeg_encoder_get_latency(encoder);
uint32_t one_frame_time;
uint32_t min_delay;
@ -1219,8 +1216,7 @@ static void mjpeg_encoder_client_stream_report(VideoEncoder *video_encoder,
rate_control->num_recent_enc_frames;
}
spice_debug("recent size avg %.2f (KB)", avg_enc_size / 1024.0);
min_playback_delay = get_min_required_playback_delay(avg_enc_size, rate_control->byte_rate,
mjpeg_encoder_get_latency(encoder));
min_playback_delay = get_min_required_playback_delay(encoder, avg_enc_size);
spice_debug("min-delay %u client-delay %d", min_playback_delay, end_frame_delay);
if (min_playback_delay > end_frame_delay) {