summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch')
-rw-r--r--meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch b/meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
deleted file mode 100644
index 18fa8fade8..0000000000
--- a/meta-networking/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 3cb746329ea4846bd9c65e0198e69423379b6f62 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?=EC=86=8C=EB=B3=91=EC=B2=A0?= <byungchul.so@samsung.com>
3Date: Thu, 24 Apr 2014 12:26:32 +0000
4Subject: [PATCH] Use PRI macros in printf to keep compatibility between
5 32/64bit system
6
7gcc's some integer type definitions are different between 32/64bit system.
8This causes platform dependency problem with printf function. However,
9we can avoid this problem by using PRI macros that supports platform
10independent printf.
11---
12 server/mjpeg_encoder.c | 7 ++++---
13 server/red_worker.c | 4 ++--
14 2 files changed, 6 insertions(+), 5 deletions(-)
15
16diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
17index aea4964..f465d88 100644
18--- a/server/mjpeg_encoder.c
19+++ b/server/mjpeg_encoder.c
20@@ -23,6 +23,7 @@
21 #include "mjpeg_encoder.h"
22 #include <jerror.h>
23 #include <jpeglib.h>
24+#include <inttypes.h>
25
26 #define MJPEG_MAX_FPS 25
27 #define MJPEG_MIN_FPS 1
28@@ -66,7 +67,7 @@ static const int mjpeg_quality_samples[MJPEG_QUALITY_SAMPLE_NUM] = {20, 30, 40,
29 * are not necessarily related to mis-estimation of the bit rate, and we would
30 * like to wait till the stream stabilizes.
31 */
32-#define MJPEG_WARMUP_TIME 3000L // 3 sec
33+#define MJPEG_WARMUP_TIME 3000LL // 3 sec
34
35 enum {
36 MJPEG_QUALITY_EVAL_TYPE_SET,
37@@ -638,7 +639,7 @@ static void mjpeg_encoder_adjust_params_to_bit_rate(MJpegEncoder *encoder)
38
39 spice_debug("cur-fps=%u new-fps=%u (new/old=%.2f) |"
40 "bit-rate=%.2f (Mbps) latency=%u (ms) quality=%d |"
41- " new-size-avg %lu , base-size %lu, (new/old=%.2f) ",
42+ " new-size-avg %"PRIu64" , base-size %"PRIu64", (new/old=%.2f) ",
43 rate_control->fps, new_fps, ((double)new_fps)/rate_control->fps,
44 ((double)rate_control->byte_rate*8)/1024/1024,
45 latency,
46@@ -703,7 +704,7 @@ static void mjpeg_encoder_adjust_fps(MJpegEncoder *encoder, uint64_t now)
47
48 avg_fps = ((double)rate_control->adjusted_fps_num_frames*1000) /
49 adjusted_fps_time_passed;
50- spice_debug("#frames-adjust=%lu #adjust-time=%lu avg-fps=%.2f",
51+ spice_debug("#frames-adjust=%"PRIu64" #adjust-time=%"PRIu64" avg-fps=%.2f",
52 rate_control->adjusted_fps_num_frames, adjusted_fps_time_passed, avg_fps);
53 spice_debug("defined=%u old-adjusted=%.2f", rate_control->fps, rate_control->adjusted_fps);
54 fps_ratio = avg_fps / rate_control->fps;
55diff --git a/server/red_worker.c b/server/red_worker.c
56index 619f7bc..1871e13 100644
57--- a/server/red_worker.c
58+++ b/server/red_worker.c
59@@ -2594,8 +2594,8 @@ static void red_print_stream_stats(DisplayChannelClient *dcc, StreamAgent *agent
60 mjpeg_encoder_get_stats(agent->mjpeg_encoder, &encoder_stats);
61 }
62
63- spice_debug("stream=%ld dim=(%dx%d) #in-frames=%lu #in-avg-fps=%.2f #out-frames=%lu "
64- "out/in=%.2f #drops=%lu (#pipe=%lu #fps=%lu) out-avg-fps=%.2f "
65+ spice_debug("stream=%"PRIdPTR" dim=(%dx%d) #in-frames=%"PRIu64" #in-avg-fps=%.2f #out-frames=%"PRIu64" "
66+ "out/in=%.2f #drops=%"PRIu64" (#pipe=%"PRIu64" #fps=%"PRIu64") out-avg-fps=%.2f "
67 "passed-mm-time(sec)=%.2f size-total(MB)=%.2f size-per-sec(Mbps)=%.2f "
68 "size-per-frame(KBpf)=%.2f avg-quality=%.2f "
69 "start-bit-rate(Mbps)=%.2f end-bit-rate(Mbps)=%.2f",
70--
712.10.2
72