build: rename USE_HEVC_DECODER to USE_H265_DECODER

Rename to be consistent with H.264 and also H.265 encoder. The
meson build assumed this was already consistently named, and so
previously was not able to actually build the H.265 decoder.

https://bugzilla.gnome.org/show_bug.cgi?id=778576

diff --git a/configure.ac b/configure.ac
index cde58fb..ba223f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -638,9 +638,9 @@ AC_CHECK_HEADERS([va/va_dec_hevc.h], [], [],
 CPPFLAGS="$saved_CPPFLAGS"
 
 dnl Check for HEVC decoding API (0.38+)
-USE_HEVC_DECODER=0
+USE_H265_DECODER=0
 AC_CACHE_CHECK([for HEVC decoding API],
-  [ac_cv_have_hevc_decoding_api],
+  [ac_cv_have_h265_decoding_api],
   [
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
@@ -663,12 +663,12 @@ slice_param.slice_data_offset = 0;
 slice_param.slice_data_flag = 0;
           ]])
       ],
-      [ac_cv_have_hevc_decoding_api="yes"],
-      [ac_cv_have_hevc_decoding_api="no"])
+      [ac_cv_have_h265_decoding_api="yes"],
+      [ac_cv_have_h265_decoding_api="no"])
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
   ])
-AS_IF([test "x$ac_cv_have_hevc_decoding_api" = "xyes"], [USE_HEVC_DECODER=1])
+AS_IF([test "x$ac_cv_have_h265_decoding_api" = "xyes"], [USE_H265_DECODER=1])
 
 dnl Check for vpp (video post-processing) support
 USE_VA_VPP=0
@@ -981,9 +981,9 @@ AC_DEFINE_UNQUOTED([USE_VP9_DECODER], [$USE_VP9_DECODER],
   [Defined to 1 if VP9 decoder is used])
 AM_CONDITIONAL([USE_VP9_DECODER], [test $USE_VP9_DECODER -eq 1])
 
-AC_DEFINE_UNQUOTED([USE_HEVC_DECODER], [$USE_HEVC_DECODER],
+AC_DEFINE_UNQUOTED([USE_H265_DECODER], [$USE_H265_DECODER],
   [Defined to 1 if HEVC decoder is used])
-AM_CONDITIONAL([USE_HEVC_DECODER], [test $USE_HEVC_DECODER -eq 1])
+AM_CONDITIONAL([USE_H265_DECODER], [test $USE_H265_DECODER -eq 1])
 
 AC_DEFINE_UNQUOTED([USE_DRM], [$USE_DRM],
   [Defined to 1 if DRM is enabled])

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 56a2255..1159928 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -166,7 +166,7 @@ endif
 
 libgstvaapi_hevcdec_source_c = gstvaapidecoder_h265.c
 libgstvaapi_hevcdec_source_h = gstvaapidecoder_h265.h
-if USE_HEVC_DECODER
+if USE_H265_DECODER
 libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c)
 libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h)
 endif

diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 80993d5..b279b83 100644 (file)
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -65,7 +65,7 @@ static const char gst_vaapidecode_sink_caps_str[] =
     GST_CAPS_CODEC("video/x-xvid")
     GST_CAPS_CODEC("video/x-h263")
     GST_CAPS_CODEC("video/x-h264")
-#if USE_HEVC_DECODER
+#if USE_H265_DECODER
     GST_CAPS_CODEC("video/x-h265")
 #endif
     GST_CAPS_CODEC("video/x-wmv")
@@ -119,7 +119,7 @@ static const GstVaapiDecoderMap vaapi_decode_map[] = {
 #if USE_VP9_DECODER
   {GST_VAAPI_CODEC_VP9, GST_RANK_PRIMARY, "vp9", "video/x-vp9"},
 #endif
-#if USE_HEVC_DECODER
+#if USE_H265_DECODER
   {GST_VAAPI_CODEC_H265, GST_RANK_PRIMARY, "h265", "video/x-h265"},
 #endif
   {0 /* the rest */ , GST_RANK_PRIMARY + 1, NULL,
@@ -855,7 +855,7 @@ gst_vaapidecode_create (GstVaapiDecode * decode, GstCaps * caps)
         }
       }
       break;
-#if USE_HEVC_DECODER
+#if USE_H265_DECODER
     case GST_VAAPI_CODEC_H265:
       decode->decoder = gst_vaapi_decoder_h265_new (dpy, caps);
 

diff --git a/gst/vaapi/gstvaapidecodebin.c b/gst/vaapi/gstvaapidecodebin.c
index 9fc2bd4..295c12b 100644 (file)
--- a/gst/vaapi/gstvaapidecodebin.c
+++ b/gst/vaapi/gstvaapidecodebin.c
@@ -85,7 +85,7 @@ static const char gst_vaapi_decode_bin_sink_caps_str[] =
     GST_CAPS_CODEC("video/x-xvid")
     GST_CAPS_CODEC("video/x-h263")
     GST_CAPS_CODEC("video/x-h264")
-#if USE_HEVC_DECODER
+#if USE_H265_DECODER
     GST_CAPS_CODEC("video/x-h265")
 #endif
     GST_CAPS_CODEC("video/x-wmv")