On Wed, 2016-05-04 at 11:44 +0200, Francois Gouget wrote:
> Signed-off-by: Francois Gouget <fgouget@xxxxxxxxxxxxxxx>
Acked-by: Pavel Grunt <pgrunt@xxxxxxxxxx>
> ---
> configure.ac | 26 ++-
> src/Makefile.am | 8 +
> src/channel-display-gst.c | 433
> +++++++++++++++++++++++++++++++++++++++++++++
> src/channel-display-priv.h | 6 +
> src/channel-display.c | 10 ++
> 5 files changed, 482 insertions(+), 1 deletion(-)
> create mode 100644 src/channel-display-gst.c
>
> diff --git a/configure.ac b/configure.ac
> index ce80d88..f13301d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -266,6 +266,29 @@ AS_IF([test "x$enable_pulse$have_gstaudio" = "xnono"],
> [SPICE_WARNING([No PulseAudio or GStreamer 1.0 audio decoder, audio
> will not be streamed])
> ])
>
> +AC_ARG_ENABLE([gstvideo],
> + AS_HELP_STRING([--enable-gstvideo=@<:@auto/yes/no@:>@],
> + [Enable GStreamer video support @<:@default=auto@:>@]),
> + [],
> + [enable_gstvideo="auto"])
> +AS_IF([test "x$enable_gstvideo" != "xno"],
> + [SPICE_CHECK_GSTREAMER(GSTVIDEO, 1.0,
> + [gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-video-
> 1.0],
> + [missing_gstreamer_elements=""
> + SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-base
> 1.0], [appsrc videoconvert appsink])
> + SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-good
> 1.0], [jpegdec vp8dec])
> + SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-bad
> 1.0], [h264parse])
> + SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gstreamer-libav
> 1.0], [avdec_h264])
> + AS_IF([test x"$missing_gstreamer_elements" = "xyes"],
> + SPICE_WARNING([The GStreamer video decoder can be built but
> may not work.]))
> + ],
> + [AS_IF([test "x$enable_gstvideo" = "xyes"],
> + AC_MSG_ERROR([GStreamer 1.0 video requested but not found]))
> + ])
> + ], [have_gstvideo="no"]
> +)
> +AM_CONDITIONAL([HAVE_GSTVIDEO], [test "x$have_gstvideo" = "xyes"])
> +
> AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
> AC_MSG_CHECKING([for jpeglib.h])
> AC_TRY_CPP(
> @@ -552,7 +575,7 @@ SPICE_CFLAGS="$SPICE_CFLAGS $WARN_CFLAGS"
>
> AC_SUBST(SPICE_CFLAGS)
>
> -SPICE_GLIB_CFLAGS="$PIXMAN_CFLAGS $PULSE_CFLAGS $GSTAUDIO_CFLAGS
> $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS"
> +SPICE_GLIB_CFLAGS="$PIXMAN_CFLAGS $PULSE_CFLAGS $GSTAUDIO_CFLAGS
> $GSTVIDEO_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS
> $SASL_CFLAGS"
> SPICE_GTK_CFLAGS="$SPICE_GLIB_CFLAGS $GTK_CFLAGS "
>
> AC_SUBST(SPICE_GLIB_CFLAGS)
> @@ -596,6 +619,7 @@ AC_MSG_NOTICE([
> Coroutine: ${with_coroutine}
> PulseAudio: ${enable_pulse}
> GStreamer Audio: ${have_gstaudio}
> + GStreamer Video: ${have_gstvideo}
> SASL support: ${have_sasl}
> Smartcard support: ${have_smartcard}
> USB redirection support: ${have_usbredir} ${with_usbredir_hotplug}
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 0ef3bea..317e993 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -94,6 +94,7 @@ SPICE_COMMON_CPPFLAGS =
> \
> $(SSL_CFLAGS) \
> $(SASL_CFLAGS) \
> $(GSTAUDIO_CFLAGS) \
> + $(GSTVIDEO_CFLAGS) \
> $(SMARTCARD_CFLAGS) \
> $(USBREDIR_CFLAGS) \
> $(GUDEV_CFLAGS) \
> @@ -197,6 +198,7 @@ libspice_client_glib_2_0_la_LIBADD =
> \
> $(SSL_LIBS) \
> $(PULSE_LIBS)
> \
> $(GSTAUDIO_LIBS) \
> + $(GSTVIDEO_LIBS) \
> $(SASL_LIBS) \
> $(SMARTCARD_LIBS) \
> $(USBREDIR_LIBS) \
> @@ -328,6 +330,12 @@ libspice_client_glib_2_0_la_SOURCES += \
> $(NULL)
> endif
>
> +if HAVE_GSTVIDEO
> +libspice_client_glib_2_0_la_SOURCES += \
> + channel-display-gst.c \
> + $(NULL)
> +endif
> +
> if WITH_PHODAV
> libspice_client_glib_2_0_la_SOURCES += \
> giopipe.c \
> diff --git a/src/channel-display-gst.c b/src/channel-display-gst.c
> new file mode 100644
> index 0000000..c139c5e
> --- /dev/null
> +++ b/src/channel-display-gst.c
> @@ -0,0 +1,433 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> + Copyright (C) 2015-2016 CodeWeavers, Inc
> +
> + This library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + This library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with this library; if not, see <http://www.gnu.org/licenses/
> >.
> +*/
> +#include "config.h"
> +
> +#include "spice-client.h"
> +#include "spice-common.h"
> +#include "spice-channel-priv.h"
> +
> +#include "channel-display-priv.h"
> +
> +#include <gst/gst.h>
> +#include <gst/app/gstappsrc.h>
> +#include <gst/app/gstappsink.h>
> +
> +
> +/* GStreamer decoder implementation */
> +
> +typedef struct SpiceGstDecoder {
> + VideoDecoder base;
> +
> + /* ---------- GStreamer pipeline ---------- */
> +
> + GstAppSrc *appsrc;
> + GstAppSink *appsink;
> + GstElement *pipeline;
> + GstClock *clock;
> +
> + /* ---------- Decoding and display queues ---------- */
> +
> + uint32_t last_mm_time;
> +
> + GMutex queues_mutex;
> + GQueue *decoding_queue;
> + GQueue *display_queue;
> + guint timer_id;
> +} SpiceGstDecoder;
> +
> +
> +/* ---------- SpiceFrame ---------- */
> +
> +typedef struct _SpiceFrame {
> + GstClockTime timestamp;
> + SpiceMsgIn *msg;
> + GstSample *sample;
> +} SpiceFrame;
> +
> +static SpiceFrame *create_frame(GstBuffer *buffer, SpiceMsgIn *msg)
> +{
> + SpiceFrame *frame = spice_new(SpiceFrame, 1);
> + frame->timestamp = GST_BUFFER_PTS(buffer);
> + frame->msg = msg;
> + spice_msg_in_ref(msg);
> + frame->sample = NULL;
> + return frame;
> +}
> +
> +static void free_frame(SpiceFrame *frame)
> +{
> + spice_msg_in_unref(frame->msg);
> + if (frame->sample) {
> + gst_sample_unref(frame->sample);
> + }
> + free(frame);
> +}
> +
> +
> +/* ---------- GStreamer pipeline ---------- */
> +
> +static void schedule_frame(SpiceGstDecoder *decoder);
> +
> +/* main context */
> +static gboolean display_frame(gpointer video_decoder)
> +{
> + SpiceGstDecoder *decoder = (SpiceGstDecoder*)video_decoder;
> +
> + decoder->timer_id = 0;
> +
> + g_mutex_lock(&decoder->queues_mutex);
> + SpiceFrame *frame = g_queue_pop_head(decoder->display_queue);
> + g_mutex_unlock(&decoder->queues_mutex);
> + g_return_val_if_fail(frame, G_SOURCE_REMOVE);
> +
> + GstBuffer *buffer = frame->sample ? gst_sample_get_buffer(frame->sample)
> : NULL;
> + GstMapInfo mapinfo;
> + if (!frame->sample) {
> + spice_warning("got a frame without a sample!");
> + } else if (gst_buffer_map(buffer, &mapinfo, GST_MAP_READ)) {
> + stream_display_frame(decoder->base.stream, frame->msg, mapinfo.data);
> + gst_buffer_unmap(buffer, &mapinfo);
> + } else {
> + spice_warning("GStreamer error: could not map the buffer");
> + }
> + free_frame(frame);
> +
> + schedule_frame(decoder);
> + return G_SOURCE_REMOVE;
> +}
> +
> +/* main loop or GStreamer streaming thread */
> +static void schedule_frame(SpiceGstDecoder *decoder)
> +{
> + guint32 now = stream_get_time(decoder->base.stream);
> + g_mutex_lock(&decoder->queues_mutex);
> +
> + while (!decoder->timer_id) {
> + SpiceFrame *frame = g_queue_peek_head(decoder->display_queue);
> + if (!frame) {
> + break;
> + }
> +
> + SpiceStreamDataHeader *op = spice_msg_in_parsed(frame->msg);
> + if (now < op->multi_media_time) {
> + decoder->timer_id = g_timeout_add(op->multi_media_time - now,
> + display_frame, decoder);
> + } else if (g_queue_get_length(decoder->display_queue) == 1) {
> + /* Still attempt to display the least out of date frame so the
> + * video is not completely frozen for an extended period of time.
> + */
> + decoder->timer_id = g_timeout_add(0, display_frame, decoder);
> + } else {
> + SPICE_DEBUG("%s: rendering too late by %u ms (ts: %u, mmtime:
> %u), dropping",
> + __FUNCTION__, now - op->multi_media_time,
> + op->multi_media_time, now);
> + stream_dropped_frame_on_playback(decoder->base.stream);
> + g_queue_pop_head(decoder->display_queue);
> + free_frame(frame);
> + }
> + }
> +
> + g_mutex_unlock(&decoder->queues_mutex);
> +}
> +
> +/* GStreamer thread
> + *
> + * We cannot use GStreamer's signals because they are not always run in
> + * the main context. So use a callback (lower overhead) and have it pull
> + * the sample to avoid a race with free_pipeline(). This means queuing the
> + * decoded frames outside GStreamer. So while we're at it, also schedule
> + * the frame display ourselves in schedule_frame().
> + */
> +static GstFlowReturn new_sample(GstAppSink *gstappsink, gpointer
> video_decoder)
> +{
> + SpiceGstDecoder *decoder = video_decoder;
> +
> + GstSample *sample = gst_app_sink_pull_sample(decoder->appsink);
> + GstBuffer *buffer = sample ? gst_sample_get_buffer(sample) : NULL;
> + if (sample) {
> + g_mutex_lock(&decoder->queues_mutex);
> +
> + /* gst_app_sink_pull_sample() sometimes returns the same buffer twice
> + * or buffers that have a modified, and thus unrecognizable, PTS.
> + * Blindly removing frames from the decoding_queue until we find a
> + * match would only empty the queue, resulting in later buffers not
> + * finding a match either, etc. So check the buffer has a matching
> + * frame first.
> + */
> + SpiceFrame *frame;
> + GList *l = g_queue_peek_head_link(decoder->decoding_queue);
> + while (l) {
> + frame = l->data;
> + if (frame->timestamp == GST_BUFFER_PTS(buffer)) {
> + /* Now that we know there is a match, remove the older
> + * frames from the decoding queue.
> + */
> + while ((frame = g_queue_pop_head(decoder->decoding_queue))) {
> + if (frame->timestamp == GST_BUFFER_PTS(buffer)) {
> + break;
> + }
> + /* The GStreamer pipeline dropped the corresponding
> + * buffer.
> + */
> + SPICE_DEBUG("the GStreamer pipeline dropped a frame");
> + free_frame(frame);
> + }
> +
> + /* The frame is now ready for display */
> + frame->sample = sample;
> + g_queue_push_tail(decoder->display_queue, frame);
> + break;
> + }
> + l = l->next;
> + }
> + if (!l) {
> + spice_warning("got an unexpected decoded buffer!");
> + gst_sample_unref(sample);
> + }
> +
> + g_mutex_unlock(&decoder->queues_mutex);
> + schedule_frame(decoder);
> + } else {
> + spice_warning("GStreamer error: could not pull sample");
> + }
> + return GST_FLOW_OK;
> +}
> +
> +static void free_pipeline(SpiceGstDecoder *decoder)
> +{
> + if (!decoder->pipeline) {
> + return;
> + }
> +
> + gst_element_set_state(decoder->pipeline, GST_STATE_NULL);
> + gst_object_unref(decoder->appsrc);
> + gst_object_unref(decoder->appsink);
> + gst_object_unref(decoder->pipeline);
> + gst_object_unref(decoder->clock);
> + decoder->pipeline = NULL;
> +}
> +
> +static gboolean create_pipeline(SpiceGstDecoder *decoder)
> +{
> + const gchar *src_caps, *gstdec_name;
> + switch (decoder->base.codec_type) {
> + case SPICE_VIDEO_CODEC_TYPE_MJPEG:
> + src_caps = "caps=image/jpeg";
> + gstdec_name = "jpegdec";
> + break;
> + case SPICE_VIDEO_CODEC_TYPE_VP8:
> + /* typefind is unable to identify VP8 streams by design.
> + * See: https://bugzilla.gnome.org/show_bug.cgi?id=756457
> + */
> + src_caps = "caps=video/x-vp8";
> + gstdec_name = "vp8dec";
> + break;
> + case SPICE_VIDEO_CODEC_TYPE_H264:
> + /* h264 streams detection works fine and setting an incomplete cap
> + * causes errors. So let typefind do all the work.
> + */
> + src_caps = "";
> + gstdec_name = "h264parse ! avdec_h264";
> + break;
> + default:
> + spice_warning("Unknown codec type %d", decoder->base.codec_type);
> + return -1;
> + }
> +
> + /* - We schedule the frame display ourselves so set sync=false on appsink
> + * so the pipeline decodes them as fast as possible. This will also
> + * minimize the risk of frames getting lost when we rebuild the
> + * pipeline.
> + * - Set max-bytes=0 on appsrc so it does not drop frames that may be
> + * needed by those that follow.
> + */
> + gchar *desc = g_strdup_printf("appsrc name=src is-live=true format=time
> max-bytes=0 block=true %s ! %s ! videoconvert ! appsink name=sink
> caps=video/x-raw,format=BGRx sync=false drop=false", src_caps, gstdec_name);
> + SPICE_DEBUG("GStreamer pipeline: %s", desc);
> +
> + GError *err = NULL;
> + decoder->pipeline = gst_parse_launch_full(desc, NULL,
> GST_PARSE_FLAG_FATAL_ERRORS, &err);
> + g_free(desc);
> + if (!decoder->pipeline) {
> + spice_warning("GStreamer error: %s", err->message);
> + g_clear_error(&err);
> + return FALSE;
> + }
> +
> + decoder->appsrc = GST_APP_SRC(gst_bin_get_by_name(GST_BIN(decoder-
> >pipeline), "src"));
> + decoder->appsink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(decoder-
> >pipeline), "sink"));
> + GstAppSinkCallbacks appsink_cbs = {NULL, NULL, &new_sample, {NULL}};
> + gst_app_sink_set_callbacks(decoder->appsink, &appsink_cbs, decoder,
> NULL);
> +
> + decoder->clock = gst_pipeline_get_clock(GST_PIPELINE(decoder->pipeline));
> +
> + if (gst_element_set_state(decoder->pipeline, GST_STATE_PLAYING) ==
> GST_STATE_CHANGE_FAILURE) {
> + SPICE_DEBUG("GStreamer error: Unable to set the pipeline to the
> playing state.");
> + free_pipeline(decoder);
> + return FALSE;
> + }
> +
> + return TRUE;
> +}
> +
> +
> +/* ---------- VideoDecoder's public API ---------- */
> +
> +static void spice_gst_decoder_reschedule(VideoDecoder *video_decoder)
> +{
> + SpiceGstDecoder *decoder = (SpiceGstDecoder*)video_decoder;
> + if (decoder->timer_id != 0) {
> + g_source_remove(decoder->timer_id);
> + decoder->timer_id = 0;
> + }
> + schedule_frame(decoder);
> +}
> +
> +/* main context */
> +static void spice_gst_decoder_destroy(VideoDecoder *video_decoder)
> +{
> + SpiceGstDecoder *decoder = (SpiceGstDecoder*)video_decoder;
> +
> + /* Stop and free the pipeline to ensure there will not be any further
> + * new_sample() call (clearing thread-safety concerns).
> + */
> + free_pipeline(decoder);
> +
> + /* Even if we kept the decoder around, once we return the stream will be
> + * destroyed making it impossible to display frames. So cancel any
> + * scheduled display_frame() call and drop the queued frames.
> + */
> + if (decoder->timer_id) {
> + g_source_remove(decoder->timer_id);
> + }
> + g_mutex_clear(&decoder->queues_mutex);
> + SpiceFrame *frame;
> + while ((frame = g_queue_pop_head(decoder->decoding_queue))) {
> + free_frame(frame);
> + }
> + g_queue_free(decoder->decoding_queue);
> + while ((frame = g_queue_pop_head(decoder->display_queue))) {
> + free_frame(frame);
> + }
> + g_queue_free(decoder->display_queue);
> +
> + free(decoder);
> +
> + /* Don't call gst_deinit() as other parts of the client
> + * may still be using GStreamer.
> + */
> +}
> +
> +static void release_buffer_data(gpointer data)
> +{
> + SpiceMsgIn* frame_msg = (SpiceMsgIn*)data;
> + spice_msg_in_unref(frame_msg);
> +}
> +
> +static void spice_gst_decoder_queue_frame(VideoDecoder *video_decoder,
> + SpiceMsgIn *frame_msg,
> + int32_t latency)
> +{
> + SpiceGstDecoder *decoder = (SpiceGstDecoder*)video_decoder;
> +
> + uint8_t *data;
> + uint32_t size = spice_msg_in_frame_data(frame_msg, &data);
> + if (size == 0) {
> + SPICE_DEBUG("got an empty frame buffer!");
> + return;
> + }
> +
> + SpiceStreamDataHeader *frame_op = spice_msg_in_parsed(frame_msg);
> + if (frame_op->multi_media_time < decoder->last_mm_time) {
> + SPICE_DEBUG("new-frame-time < last-frame-time (%u < %u):"
> + " resetting stream, id %d",
> + frame_op->multi_media_time,
> + decoder->last_mm_time, frame_op->id);
> + /* Let GStreamer deal with the frame anyway */
> + }
> + decoder->last_mm_time = frame_op->multi_media_time;
> +
> + if (latency < 0 &&
> + decoder->base.codec_type == SPICE_VIDEO_CODEC_TYPE_MJPEG) {
> + /* Dropping MJPEG frames has no impact on those that follow and
> + * saves CPU so do it.
> + */
> + SPICE_DEBUG("dropping a late MJPEG frame");
> + return;
> + }
> +
> + if (!decoder->pipeline && !create_pipeline(decoder)) {
> + stream_dropped_frame_on_playback(decoder->base.stream);
> + return;
> + }
> +
> + /* ref() the frame_msg for the buffer */
> + spice_msg_in_ref(frame_msg);
> + GstBuffer *buffer =
> gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS,
> + data, size, 0, size,
> + frame_msg,
> &release_buffer_data);
> +
> + GST_BUFFER_DURATION(buffer) = GST_CLOCK_TIME_NONE;
> + GST_BUFFER_DTS(buffer) = GST_CLOCK_TIME_NONE;
> + GST_BUFFER_PTS(buffer) = gst_clock_get_time(decoder->clock) -
> gst_element_get_base_time(decoder->pipeline) + ((uint64_t)MAX(0, latency)) *
> 1000 * 1000;
> +
> + g_mutex_lock(&decoder->queues_mutex);
> + g_queue_push_tail(decoder->decoding_queue, create_frame(buffer,
> frame_msg));
> + g_mutex_unlock(&decoder->queues_mutex);
> +
> + if (gst_app_src_push_buffer(decoder->appsrc, buffer) != GST_FLOW_OK) {
> + SPICE_DEBUG("GStreamer error: unable to push frame of size %d",
> size);
> + stream_dropped_frame_on_playback(decoder->base.stream);
> + }
> +}
> +
> +G_GNUC_INTERNAL
> +gboolean gstvideo_init(void)
> +{
> + static int success = 0;
> + if (!success) {
> + GError *err = NULL;
> + if (gst_init_check(NULL, NULL, &err)) {
> + success = 1;
> + } else {
> + spice_warning("Disabling GStreamer video support: %s", err-
> >message);
> + g_clear_error(&err);
> + success = -1;
> + }
> + }
> + return success > 0;
> +}
> +
> +G_GNUC_INTERNAL
> +VideoDecoder* create_gstreamer_decoder(int codec_type, display_stream
> *stream)
> +{
> + SpiceGstDecoder *decoder = NULL;
> +
> + if (gstvideo_init()) {
> + decoder = spice_new0(SpiceGstDecoder, 1);
> + decoder->base.destroy = spice_gst_decoder_destroy;
> + decoder->base.reschedule = spice_gst_decoder_reschedule;
> + decoder->base.queue_frame = spice_gst_decoder_queue_frame;
> + decoder->base.codec_type = codec_type;
> + decoder->base.stream = stream;
> + g_mutex_init(&decoder->queues_mutex);
> + decoder->decoding_queue = g_queue_new();
> + decoder->display_queue = g_queue_new();
> + }
> +
> + return (VideoDecoder*)decoder;
> +}
> diff --git a/src/channel-display-priv.h b/src/channel-display-priv.h
> index ec48f51..d1a30a6 100644
> --- a/src/channel-display-priv.h
> +++ b/src/channel-display-priv.h
> @@ -69,6 +69,12 @@ struct VideoDecoder {
> * @return: A pointer to a structure implementing the VideoDecoder
> methods.
> */
> VideoDecoder* create_mjpeg_decoder(int codec_type, display_stream *stream);
> +#ifdef HAVE_GSTVIDEO
> +VideoDecoder* create_gstreamer_decoder(int codec_type, display_stream
> *stream);
> +gboolean gstvideo_init(void);
> +#else
> +# define gstvideo_init() FALSE
> +#endif
>
>
> typedef struct display_surface {
> diff --git a/src/channel-display.c b/src/channel-display.c
> index 338a522..ed19e58 100644
> --- a/src/channel-display.c
> +++ b/src/channel-display.c
> @@ -716,6 +716,12 @@ static void
> spice_display_channel_reset_capabilities(SpiceChannel *channel)
> #ifdef G_OS_UNIX
> spice_channel_set_capability(SPICE_CHANNEL(channel),
> SPICE_DISPLAY_CAP_GL_SCANOUT);
> #endif
> + spice_channel_set_capability(SPICE_CHANNEL(channel),
> SPICE_DISPLAY_CAP_MULTI_CODEC);
> + spice_channel_set_capability(SPICE_CHANNEL(channel),
> SPICE_DISPLAY_CAP_CODEC_MJPEG);
> + if (gstvideo_init()) {
> + spice_channel_set_capability(SPICE_CHANNEL(channel),
> SPICE_DISPLAY_CAP_CODEC_VP8);
> + spice_channel_set_capability(SPICE_CHANNEL(channel),
> SPICE_DISPLAY_CAP_CODEC_H264);
> + }
> }
>
> static void destroy_surface(gpointer data)
> @@ -1096,7 +1102,11 @@ static void display_handle_stream_create(SpiceChannel
> *channel, SpiceMsgIn *in)
> st->video_decoder = create_mjpeg_decoder(op->codec_type, st);
> break;
> default:
> +#ifdef HAVE_GSTVIDEO
> + st->video_decoder = create_gstreamer_decoder(op->codec_type, st);
> +#else
> st->video_decoder = NULL;
> +#endif
> }
> if (st->video_decoder == NULL) {
> spice_printerr("could not create a video decoder for codec %d", op-
> >codec_type);
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel