[Spice-devel] [PATCH spice-server] gstreamer: Use pthread to avoid Glib compatibility issues with RHEL6

[Christophe Fergeau]

On Mon, Nov 14, 2016 at 12:00:18PM +0000, Frediano Ziglio wrote:
> GCond/GMutex interface is different between Glib 2.32 and
> previous versions. Use pthread for compatibility.

In general, I'd have a slight preference for the glib API, but in this
case this makes things consistent with the rest of the codebase, so

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

Christophe

> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/gstreamer-encoder.c | 31 ++++++++++++++++---------------
>  1 file changed, 16 insertions(+), 15 deletions(-)
> 
> This is more an alternative way to
> "gstreamer: Compatibility layer for old GLib" patch to avoid
> compatibility issues.
> 
> diff --git a/server/gstreamer-encoder.c b/server/gstreamer-encoder.c
> index 3d5f8a0..c7cf20f 100644
> --- a/server/gstreamer-encoder.c
> +++ b/server/gstreamer-encoder.c
> @@ -21,6 +21,7 @@
>  #endif
>  
>  #include <inttypes.h>
> +#include <pthread.h>
>  
>  #include <gst/gst.h>
>  #include <gst/app/gstappsrc.h>
> @@ -118,8 +119,8 @@ typedef struct SpiceGstEncoder {
>      uint32_t set_pipeline;
>  
>      /* Output buffer */
> -    GMutex outbuf_mutex;
> -    GCond outbuf_cond;
> +    pthread_mutex_t outbuf_mutex;
> +    pthread_cond_t outbuf_cond;
>      VideoBuffer *outbuf;
>  
>      /* The video bit rate. */
> @@ -822,10 +823,10 @@ static GstBusSyncReply handle_pipeline_message(GstBus *bus, GstMessage *msg, gpo
>          g_clear_error(&err);
>  
>          /* Unblock the main thread */
> -        g_mutex_lock(&encoder->outbuf_mutex);
> +        pthread_mutex_lock(&encoder->outbuf_mutex);
>          encoder->outbuf = (VideoBuffer*)create_gst_video_buffer();
> -        g_cond_signal(&encoder->outbuf_cond);
> -        g_mutex_unlock(&encoder->outbuf_mutex);
> +        pthread_cond_signal(&encoder->outbuf_cond);
> +        pthread_mutex_unlock(&encoder->outbuf_mutex);
>      }
>      return GST_BUS_PASS;
>  }
> @@ -855,10 +856,10 @@ static GstFlowReturn new_sample(GstAppSink *gstappsink, gpointer video_encoder)
>  #endif
>  
>      /* Notify the main thread that the output buffer is ready */
> -    g_mutex_lock(&encoder->outbuf_mutex);
> +    pthread_mutex_lock(&encoder->outbuf_mutex);
>      encoder->outbuf = (VideoBuffer*)outbuf;
> -    g_cond_signal(&encoder->outbuf_cond);
> -    g_mutex_unlock(&encoder->outbuf_mutex);
> +    pthread_cond_signal(&encoder->outbuf_cond);
> +    pthread_mutex_unlock(&encoder->outbuf_mutex);
>  
>      return GST_FLOW_OK;
>  }
> @@ -1409,13 +1410,13 @@ static int push_raw_frame(SpiceGstEncoder *encoder,
>  static int pull_compressed_buffer(SpiceGstEncoder *encoder,
>                                    VideoBuffer **outbuf)
>  {
> -    g_mutex_lock(&encoder->outbuf_mutex);
> +    pthread_mutex_lock(&encoder->outbuf_mutex);
>      while (!encoder->outbuf) {
> -        g_cond_wait(&encoder->outbuf_cond, &encoder->outbuf_mutex);
> +        pthread_cond_wait(&encoder->outbuf_cond, &encoder->outbuf_mutex);
>      }
>      *outbuf = encoder->outbuf;
>      encoder->outbuf = NULL;
> -    g_mutex_unlock(&encoder->outbuf_mutex);
> +    pthread_mutex_unlock(&encoder->outbuf_mutex);
>  
>      if ((*outbuf)->data) {
>          return VIDEO_ENCODER_FRAME_ENCODE_DONE;
> @@ -1435,8 +1436,8 @@ static void spice_gst_encoder_destroy(VideoEncoder *video_encoder)
>      SpiceGstEncoder *encoder = (SpiceGstEncoder*)video_encoder;
>  
>      free_pipeline(encoder);
> -    g_mutex_clear(&encoder->outbuf_mutex);
> -    g_cond_clear(&encoder->outbuf_cond);
> +    pthread_mutex_destroy(&encoder->outbuf_mutex);
> +    pthread_cond_destroy(&encoder->outbuf_cond);
>  
>      /* Unref any lingering bitmap opaque structures from past frames */
>      clear_zero_copy_queue(encoder, TRUE);
> @@ -1722,8 +1723,8 @@ VideoEncoder *gstreamer_encoder_new(SpiceVideoCodecType codec_type,
>      encoder->bitmap_ref = bitmap_ref;
>      encoder->bitmap_unref = bitmap_unref;
>      encoder->format = GSTREAMER_FORMAT_INVALID;
> -    g_mutex_init(&encoder->outbuf_mutex);
> -    g_cond_init(&encoder->outbuf_cond);
> +    pthread_mutex_init(&encoder->outbuf_mutex, NULL);
> +    pthread_cond_init(&encoder->outbuf_cond, NULL);
>  
>      /* All the other fields are initialized to zero by spice_new0(). */
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20161115/b6010ae2/attachment-0001.sig>