maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-240: Make JPEG quality a parameter to methods. Reorder JPEG_LIBS in LDFLAGS

Browse Source
This commit is contained in:
Frode Langelo 2015-07-31 15:41:55 -07:00 committed by Michael Jumper
parent c27e2997dd
commit 240867a432
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libguac/Makefile.am
View File

@ -97,11 +97,11 @@ libguac_la_CFLAGS = \
libguac_la_LDFLAGS = \ libguac_la_LDFLAGS = \
-version-info 9:0:0 \ -version-info 9:0:0 \
@CAIRO_LIBS@ \ @CAIRO_LIBS@ \
@JPEG_LIBS@ \
@PNG_LIBS@ \ @PNG_LIBS@ \
@PTHREAD_LIBS@ \ @PTHREAD_LIBS@ \
@UUID_LIBS@ \ @UUID_LIBS@ \
@VORBIS_LIBS@ \ @VORBIS_LIBS@
@JPEG_LIBS@
libguac_la_LIBADD = \ libguac_la_LIBADD = \
@LIBADD_DLOPEN@ @LIBADD_DLOPEN@

6
src/libguac/guacamole/protocol.h
View File

@ -637,11 +637,15 @@ int guac_protocol_send_png(guac_socket* socket, guac_composite_mode mode,
* @param surface * @param surface
* A cairo surface containing the image data to send. * A cairo surface containing the image data to send.
* *
* @param quality
* JPEG image quality.
*
* @return * @return
* Zero on success, non-zero on error. * Zero on success, non-zero on error.
*/ */
int guac_protocol_send_jpeg(guac_socket* socket, guac_composite_mode mode, int guac_protocol_send_jpeg(guac_socket* socket, guac_composite_mode mode,
const guac_layer* layer, int x, int y, cairo_surface_t* surface); const guac_layer* layer, int x, int y, cairo_surface_t* surface,
int quality);
/** /**
* Sends a pop instruction over the given guac_socket connection. * Sends a pop instruction over the given guac_socket connection.

12
src/libguac/protocol.c
View File

@ -85,10 +85,14 @@ ssize_t __guac_socket_write_length_double(guac_socket* socket, double d) {
* @param surface * @param surface
*   A cairo surface containing the image data to send. *   A cairo surface containing the image data to send.
* *
* @param quality
* JPEG image quality.
*
* @return * @return
* Zero on success, non-zero on error. * Zero on success, non-zero on error.
*/ */
static int __guac_socket_write_length_jpeg(guac_socket* socket, cairo_surface_t* surface) { static int __guac_socket_write_length_jpeg(guac_socket* socket,
cairo_surface_t* surface, int quality) {
/* Get image surface properties and data */ /* Get image surface properties and data */
cairo_format_t format = cairo_image_surface_get_format(surface); cairo_format_t format = cairo_image_surface_get_format(surface);
@ -99,7 +103,6 @@ static int __guac_socket_write_length_jpeg(guac_socket* socket, cairo_surface_t*
return -1; return -1;
} }
int quality = 80; /* JPEG compression quality setting */
int width = cairo_image_surface_get_width(surface); int width = cairo_image_surface_get_width(surface);
int height = cairo_image_surface_get_height(surface); int height = cairo_image_surface_get_height(surface);
int stride = cairo_image_surface_get_stride(surface); int stride = cairo_image_surface_get_stride(surface);
@ -1181,7 +1184,8 @@ int guac_protocol_send_pipe(guac_socket* socket, const guac_stream* stream,
} }
int guac_protocol_send_jpeg(guac_socket* socket, guac_composite_mode mode, int guac_protocol_send_jpeg(guac_socket* socket, guac_composite_mode mode,
const guac_layer* layer, int x, int y, cairo_surface_t* surface) { const guac_layer* layer, int x, int y, cairo_surface_t* surface,
int quality) {
int ret_val; int ret_val;
@ -1196,7 +1200,7 @@ int guac_protocol_send_jpeg(guac_socket* socket, guac_composite_mode mode,
|| guac_socket_write_string(socket, ",") || guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_int(socket, y) || __guac_socket_write_length_int(socket, y)
|| guac_socket_write_string(socket, ",") || guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_jpeg(socket, surface) || __guac_socket_write_length_jpeg(socket, surface, quality)
|| guac_socket_write_string(socket, ";"); || guac_socket_write_string(socket, ";");
guac_socket_instruction_end(socket); guac_socket_instruction_end(socket);