From 04615ca55aeb33518f08e1542888fef1a021a710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Brzezi=C5=84ski?= Date: Tue, 7 Feb 2023 16:25:02 +0100 Subject: [PATCH] vtenc/vtdec: Fix typo in RGBA64_LE availability define Part-of: --- subprojects/gst-plugins-bad/sys/applemedia/vtdec.c | 6 +++--- subprojects/gst-plugins-bad/sys/applemedia/vtenc.c | 4 ++-- subprojects/gst-plugins-bad/sys/applemedia/vtutil.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c index 5cb2ae56d7..01cb3ea7f6 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c +++ b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c @@ -169,7 +169,7 @@ gst_vtdec_class_init (GstVtdecClass * klass) { GstCaps *caps = gst_caps_from_string (VIDEO_SRC_CAPS); /* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */ - if (GST_VTUTIL_HAVE_64ARGBALE) + if (GST_VTUTIL_HAVE_64RGBALE) caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE"); gst_element_class_add_pad_template (element_class, gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps)); @@ -299,7 +299,7 @@ get_preferred_video_format (GstStructure * s, gboolean prores) return vfmt; break; case GST_VIDEO_FORMAT_RGBA64_LE: - if (GST_VTUTIL_HAVE_64ARGBALE) { + if (GST_VTUTIL_HAVE_64RGBALE) { if (prores) return vfmt; } else { @@ -697,7 +697,7 @@ gst_vtdec_create_session (GstVtdec * vtdec, GstVideoFormat format, cv_format = kCVPixelFormatType_64ARGB; break; case GST_VIDEO_FORMAT_RGBA64_LE: - if (GST_VTUTIL_HAVE_64ARGBALE) + if (GST_VTUTIL_HAVE_64RGBALE) cv_format = kCVPixelFormatType_64RGBALE; else /* Codepath will never be hit on macOS older than Big Sur (11.3) */ diff --git a/subprojects/gst-plugins-bad/sys/applemedia/vtenc.c b/subprojects/gst-plugins-bad/sys/applemedia/vtenc.c index c7d60887c7..c8babd8d86 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/vtenc.c +++ b/subprojects/gst-plugins-bad/sys/applemedia/vtenc.c @@ -254,7 +254,7 @@ gst_vtenc_base_init (GstVTEncClass * klass) if (enable_argb) { caps = gst_vtutil_caps_append_video_format (caps, "ARGB64_BE"); /* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */ - if (GST_VTUTIL_HAVE_64ARGBALE) + if (GST_VTUTIL_HAVE_64RGBALE) caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE"); } #endif @@ -1741,7 +1741,7 @@ gst_vtenc_encode_frame (GstVTEnc * self, GstVideoCodecFrame * frame) pixel_format_type = kCVPixelFormatType_4444AYpCbCr16; break; case GST_VIDEO_FORMAT_RGBA64_LE: - if (GST_VTUTIL_HAVE_64ARGBALE) + if (GST_VTUTIL_HAVE_64RGBALE) pixel_format_type = kCVPixelFormatType_64RGBALE; else /* Codepath will never be hit on macOS older than Big Sur (11.3) */ diff --git a/subprojects/gst-plugins-bad/sys/applemedia/vtutil.h b/subprojects/gst-plugins-bad/sys/applemedia/vtutil.h index 917d76fcbc..9da11abc87 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/vtutil.h +++ b/subprojects/gst-plugins-bad/sys/applemedia/vtutil.h @@ -35,7 +35,7 @@ #if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < 110300 #define kCVPixelFormatType_64RGBALE 'l64r' #endif -#define GST_VTUTIL_HAVE_64ARGBALE __builtin_available(macOS 11.3, *) +#define GST_VTUTIL_HAVE_64RGBALE __builtin_available(macOS 11.3, *) G_BEGIN_DECLS