[vlc-commits] [Git][videolan/vlc][master] 2 commits: vt_utils: fix availability of CVBufferHasAttachment()

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
1f7768b1 by Steve Lhomme at 2025-10-03T12:04:08+00:00
vt_utils: fix availability of CVBufferHasAttachment()

It's available in macOS 12.0, not macOS 10.12 [^1].

[^1]: https://developer.apple.com/documentation/corevideo/cvbufferhasattachment(_:_:)

- - - - -
5d6d2889 by Steve Lhomme at 2025-10-03T12:04:08+00:00
vt_utils: trim line endings

- - - - -


1 changed file:

- modules/codec/vt_utils.c


Changes:

=====================================
modules/codec/vt_utils.c
=====================================
@@ -316,7 +316,7 @@ cvpxpool_new_cvpx(CVPixelBufferPoolRef pool)
     return cvpx;
 }
 
-CFStringRef 
+CFStringRef
 cvpx_map_YCbCrMatrix_from_vcs(video_color_space_t color_space)
 {
     switch (color_space) {
@@ -332,7 +332,7 @@ cvpx_map_YCbCrMatrix_from_vcs(video_color_space_t color_space)
         break;
     default:
         if (__builtin_available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *)) {
-            enum iso_23001_8_mc mc_cicp = 
+            enum iso_23001_8_mc mc_cicp =
                 vlc_coeffs_to_iso_23001_8_mc(color_space);
             return CVYCbCrMatrixGetStringForIntegerCodePoint(mc_cicp);
         }
@@ -340,7 +340,7 @@ cvpx_map_YCbCrMatrix_from_vcs(video_color_space_t color_space)
     return NULL;
 }
 
-CFStringRef 
+CFStringRef
 cvpx_map_ColorPrimaries_from_vcp(video_color_primaries_t color_primaries)
 {
     switch (color_primaries) {
@@ -356,7 +356,7 @@ cvpx_map_ColorPrimaries_from_vcp(video_color_primaries_t color_primaries)
         break;
     default:
         if (__builtin_available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *)) {
-            enum iso_23001_8_cp cp_cicp = 
+            enum iso_23001_8_cp cp_cicp =
                 vlc_primaries_to_iso_23001_8_cp(color_primaries);
             return CVColorPrimariesGetStringForIntegerCodePoint(cp_cicp);
         }
@@ -364,7 +364,7 @@ cvpx_map_ColorPrimaries_from_vcp(video_color_primaries_t color_primaries)
     return NULL;
 }
 
-CFStringRef 
+CFStringRef
 cvpx_map_TransferFunction_from_vtf(video_transfer_func_t transfer_func)
 {
     switch (transfer_func) {
@@ -373,7 +373,7 @@ cvpx_map_TransferFunction_from_vtf(video_transfer_func_t transfer_func)
             return kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
         break;
     case TRANSFER_FUNC_BT709:
-    /* note: as stated by CVImageBuffer.h, 
+    /* note: as stated by CVImageBuffer.h,
        kCVImageBufferTransferFunction_ITU_R_709_2 is equivalent to
        kCVImageBufferTransferFunction_ITU_R_2020 and preferred
     */
@@ -408,11 +408,11 @@ cvpx_map_TransferFunction_from_vtf(video_transfer_func_t transfer_func)
 }
 
 bool cvpx_has_attachment(CVPixelBufferRef pixelBuffer, CFStringRef key) {
-#if (TARGET_OS_OSX    && defined(__MAC_10_12)   && MAC_OS_X_VERSION_MAX_ALLOWED    >= __MAC_10_12) ||\
+#if (TARGET_OS_OSX    && defined(__MAC_12_0)    && MAC_OS_X_VERSION_MAX_ALLOWED    >= __MAC_12_0) ||\
     (TARGET_OS_IOS    && defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0) || \
     (TARGET_OS_TV     && defined(__TVOS_15_0)   && __TV_OS_VERSION_MAX_ALLOWED     >= __TVOS_15_0) || \
     (TARGET_OS_WATCH  && defined(__WATCHOS_8_0) && __WATCH_OS_VERSION_MAX_ALLOWED  >= __WATCHOS_8_0)
-    if (__builtin_available(macOS 10.12, iOS 15, tvOS 15, watchOS 8, *)) {
+    if (__builtin_available(macOS 12.0, iOS 15, tvOS 15, watchOS 8, *)) {
         return CVBufferHasAttachment(pixelBuffer, key);
     }
 #endif
@@ -425,12 +425,12 @@ bool cvpx_has_attachment(CVPixelBufferRef pixelBuffer, CFStringRef key) {
 
 
 
-void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx, 
+void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx,
                                          const video_format_t *fmt)
 {
     if (!cvpx_has_attachment(cvpx, kCVImageBufferYCbCrMatrixKey))
     {
-        CFStringRef color_matrix = 
+        CFStringRef color_matrix =
             cvpx_map_YCbCrMatrix_from_vcs(fmt->space);
         if (color_matrix) {
             CVBufferSetAttachment(
@@ -444,7 +444,7 @@ void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx,
 
     if (!cvpx_has_attachment(cvpx, kCVImageBufferColorPrimariesKey))
     {
-        CFStringRef color_primaries = 
+        CFStringRef color_primaries =
             cvpx_map_ColorPrimaries_from_vcp(fmt->primaries);
         if (color_primaries) {
             CVBufferSetAttachment(
@@ -458,7 +458,7 @@ void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx,
 
     if (!cvpx_has_attachment(cvpx, kCVImageBufferTransferFunctionKey))
     {
-        CFStringRef color_transfer_func = 
+        CFStringRef color_transfer_func =
             cvpx_map_TransferFunction_from_vtf(fmt->transfer);
         if (color_transfer_func) {
             CVBufferSetAttachment(
@@ -469,7 +469,7 @@ void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx,
             );
         }
     }
-    
+
     if (!cvpx_has_attachment(cvpx, kCVImageBufferGammaLevelKey))
     {
         Float32 gamma = 0;
@@ -487,7 +487,7 @@ void cvpx_attach_mapped_color_properties(CVPixelBufferRef cvpx,
             );
             CFRelease(value);
         }
-    }    
+    }
 }
 
 struct cvpx_video_context



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/47b44f902ed0669a28db99f1a2dc64cc2501f175...5d6d2889780e51f5f5a73eb44e76504712892613

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/47b44f902ed0669a28db99f1a2dc64cc2501f175...5d6d2889780e51f5f5a73eb44e76504712892613
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance