| 1 |
dev-zero 14/07/01 16:42:01 |
| 2 |
|
| 3 |
Added: |
| 4 |
spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch |
| 5 |
Log: |
| 6 |
Version bump (bug #510844), also make sure that required static-libs are pulled in (bug #476268), do not run auto* anymore (bugs #493112, #514034). |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch |
| 17 |
=================================================================== |
| 18 |
From 284cca2a5ebc98257275585083321a7100fb89b3 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Jonathon Jongsma <jjongsma@××××××.com> |
| 20 |
Date: Fri, 30 May 2014 18:45:02 +0000 |
| 21 |
Subject: Fix assert in mjpeg_encoder_adjust_params_to_bit_rate() |
| 22 |
|
| 23 |
If mjpeg_encoder_reset_quality() is called with the same quality as currently |
| 24 |
set, it will not reset last_enc_size but not reset num_recent_enc_frames, |
| 25 |
violating some assumptions in _adjust_params_to_bit_rate(). To avoid aborting |
| 26 |
the server, simply return early from this function. |
| 27 |
|
| 28 |
Resolves: rhbz#1086820 |
| 29 |
--- |
| 30 |
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c |
| 31 |
index f465d88..12447da 100644 |
| 32 |
--- a/server/mjpeg_encoder.c |
| 33 |
+++ b/server/mjpeg_encoder.c |
| 34 |
@@ -625,7 +625,10 @@ static void mjpeg_encoder_adjust_params_to_bit_rate(MJpegEncoder *encoder) |
| 35 |
return; |
| 36 |
} |
| 37 |
|
| 38 |
- spice_assert(rate_control->num_recent_enc_frames); |
| 39 |
+ if (!rate_control->num_recent_enc_frames) { |
| 40 |
+ spice_debug("No recent encoded frames"); |
| 41 |
+ return; |
| 42 |
+ } |
| 43 |
|
| 44 |
if (rate_control->num_recent_enc_frames < MJPEG_AVERAGE_SIZE_WINDOW && |
| 45 |
rate_control->num_recent_enc_frames < rate_control->fps) { |
| 46 |
-- |
| 47 |
cgit v0.9.0.2-2-gbebe |
Archives