[Spice-commits] configure.ac src/channel-display-priv.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 20 13:07:31 UTC 2018


 configure.ac               |    6 +++---
 src/channel-display-priv.h |    5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0d3692d012e1054e96af87959731fd345037cdfe
Author: Snir Sheriber <ssheribe at redhat.com>
Date:   Mon Jun 11 15:15:59 2018 +0300

    Support h265 streams
    
    This requires spice protocol v0.12.15
    
    Signed-off-by: Snir Sheriber <ssheribe at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/configure.ac b/configure.ac
index 768e180..1cc3000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
 AC_CONFIG_SUBDIRS([spice-common])
-PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.14])
+PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.15])
 
 COMMON_CFLAGS='-I${top_builddir}/spice-common/ -I${top_srcdir}/spice-common/ ${SPICE_PROTOCOL_CFLAGS}'
 AC_SUBST(COMMON_CFLAGS)
@@ -260,8 +260,8 @@ AS_IF([test "x$enable_gstvideo" != "xno"],
          [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 vp9dec])
-          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])
+          SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-bad 1.0], [h264parse h265parse])
+          SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gstreamer-libav 1.0], [avdec_h264 avdec_h265])
           AS_IF([test x"$missing_gstreamer_elements" = "xyes"],
                 SPICE_WARNING([The GStreamer video decoder can be built but may not work.]))
          ],
diff --git a/src/channel-display-priv.h b/src/channel-display-priv.h
index 76d4dd0..c1b3fe5 100644
--- a/src/channel-display-priv.h
+++ b/src/channel-display-priv.h
@@ -188,6 +188,11 @@ static const struct {
     /* SPICE_VIDEO_CODEC_TYPE_VP9 */
     { SPICE_DISPLAY_CAP_CODEC_VP9, "vp9",
       "vp9dec", "video/x-vp9" },
+
+    /* SPICE_DISPLAY_CAP_CODEC_H265 */
+    { SPICE_DISPLAY_CAP_CODEC_H265, "h265",
+      "h265parse ! avdec_h265", "video/x-h265" },
+
 };
 
 G_STATIC_ASSERT(G_N_ELEMENTS(gst_opts) <= SPICE_VIDEO_CODEC_TYPE_ENUM_END);


More information about the Spice-commits mailing list