pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-24 17:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: Remove MJPEG's video callback assert

Browse Source 
A NULL get_roundtrip_ms() callback simply disables rate control so
that mjpeg_encoder_get_source_fps() will not be called.
Should it be called despite this, simply return the highest allowed
framerate (get_source_fps()'s value is only an estimate anyway).
Finally update_client_playback_delay() is always checked before use.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
This commit is contained in:
Francois Gouget 2015-11-23 16:39:14 +01:00 committed by Victor Toso
parent 751576b173
commit 9e5363d483
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/mjpeg_encoder.c
View File

@ -329,7 +329,8 @@ spice_jpeg_mem_dest(j_compress_ptr cinfo,
static inline uint32_t mjpeg_encoder_get_source_fps(MJpegEncoder *encoder)
{
return encoder->cbs.get_source_fps(encoder->cbs_opaque);
return encoder->cbs.get_source_fps ?
encoder->cbs.get_source_fps(encoder->cbs_opaque) : MJPEG_MAX_FPS;
}
static inline uint32_t mjpeg_encoder_get_latency(MJpegEncoder *encoder)
@ -1347,8 +1348,6 @@ MJpegEncoder *mjpeg_encoder_new(uint64_t starting_bit_rate,
{
MJpegEncoder *encoder = spice_new0(MJpegEncoder, 1);
spice_assert(!cbs || (cbs && cbs->get_roundtrip_ms && cbs->get_source_fps));
encoder->first_frame = TRUE;
encoder->rate_control.byte_rate = starting_bit_rate / 8;
encoder->starting_bit_rate = starting_bit_rate;