From de95a62e2f3767c194a62a2fe67c801c41429d26 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Thu, 4 Jun 2026 10:11:26 +0800
Subject: [PATCH] Codec (macOS): removes usage of JPEG XL; replaces enums with
 raw constants

---
 src/detection/codec/codec.h       |  3 +--
 src/detection/codec/codec_apple.c | 44 +++++++++++++++----------------
 src/modules/codec/codec.c         |  2 --
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/detection/codec/codec.h b/src/detection/codec/codec.h
index 3ed07ceb4..d0f48d978 100644
--- a/src/detection/codec/codec.h
+++ b/src/detection/codec/codec.h
@@ -24,8 +24,7 @@ typedef enum FF_A_PACKED FFCodecType {
     FF_CODEC_TYPE_DOLBY_VISION_HEVC = UINT32_C(1) << 16,
     FF_CODEC_TYPE_PRORES = UINT32_C(1) << 17,
     FF_CODEC_TYPE_PRORES_RAW = UINT32_C(1) << 18,
-    FF_CODEC_TYPE_JPEG_XL = UINT32_C(1) << 19,
-    FF_CODEC_TYPE_MAX = FF_CODEC_TYPE_JPEG_XL,
+    FF_CODEC_TYPE_MAX = FF_CODEC_TYPE_PRORES_RAW,
     FF_CODEC_TYPE_FORCE_UNSIGNED = UINT32_MAX,
 } FFCodecType;
 
diff --git a/src/detection/codec/codec_apple.c b/src/detection/codec/codec_apple.c
index 68ee5933e..377837303 100644
--- a/src/detection/codec/codec_apple.c
+++ b/src/detection/codec/codec_apple.c
@@ -7,28 +7,28 @@ static const struct {
     CMVideoCodecType codec;
     FFCodecType type;
 } FF_CODEC_CODECS[] = {
-    { kCMVideoCodecType_H263, FF_CODEC_TYPE_H263 },
-    { kCMVideoCodecType_JPEG, FF_CODEC_TYPE_MJPEG },
-    { kCMVideoCodecType_JPEG_XL, FF_CODEC_TYPE_JPEG_XL },
-    { kCMVideoCodecType_MPEG1Video, FF_CODEC_TYPE_MPEG1 },
-    { kCMVideoCodecType_MPEG2Video, FF_CODEC_TYPE_MPEG2 },
-    { kCMVideoCodecType_MPEG4Video, FF_CODEC_TYPE_DIVX_XVID },
-    { kCMVideoCodecType_H264, FF_CODEC_TYPE_H264 },
-    { kCMVideoCodecType_HEVC, FF_CODEC_TYPE_HEVC },
-    { kCMVideoCodecType_HEVCWithAlpha, FF_CODEC_TYPE_HEVC },
-    { kCMVideoCodecType_DolbyVisionHEVC, FF_CODEC_TYPE_DOLBY_VISION_HEVC },
-    { kCMVideoCodecType_DisparityHEVC, FF_CODEC_TYPE_HEVC },
-    { kCMVideoCodecType_DepthHEVC, FF_CODEC_TYPE_HEVC },
-    { kCMVideoCodecType_VP9, FF_CODEC_TYPE_VP9 },
-    { kCMVideoCodecType_AV1, FF_CODEC_TYPE_AV1 },
-    { kCMVideoCodecType_AppleProRes4444XQ, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProRes4444, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProRes422HQ, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProRes422, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProRes422LT, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProRes422Proxy, FF_CODEC_TYPE_PRORES },
-    { kCMVideoCodecType_AppleProResRAW, FF_CODEC_TYPE_PRORES_RAW },
-    { kCMVideoCodecType_AppleProResRAWHQ, FF_CODEC_TYPE_PRORES_RAW },
+    { 'h263', FF_CODEC_TYPE_H263 },              // kCMVideoCodecType_H263
+    { 'jpeg', FF_CODEC_TYPE_MJPEG },             // kCMVideoCodecType_JPEG
+    { 'dmb1', FF_CODEC_TYPE_MJPEG },             // kCMVideoCodecType_JPEG_OpenDML
+    { 'mp1v', FF_CODEC_TYPE_MPEG1 },             // kCMVideoCodecType_MPEG1Video
+    { 'mp2v', FF_CODEC_TYPE_MPEG2 },             // kCMVideoCodecType_MPEG2Video
+    { 'mp4v', FF_CODEC_TYPE_DIVX_XVID },         // kCMVideoCodecType_MPEG4Video
+    { 'avc1', FF_CODEC_TYPE_H264 },              // kCMVideoCodecType_H264
+    { 'hvc1', FF_CODEC_TYPE_HEVC },              // kCMVideoCodecType_HEVC
+    { 'muxa', FF_CODEC_TYPE_HEVC },              // kCMVideoCodecType_HEVCWithAlpha
+    { 'dvh1', FF_CODEC_TYPE_DOLBY_VISION_HEVC }, // kCMVideoCodecType_DolbyVisionHEVC
+    { 'dish', FF_CODEC_TYPE_HEVC },              // kCMVideoCodecType_DisparityHEVC
+    { 'deph', FF_CODEC_TYPE_HEVC },              // kCMVideoCodecType_DepthHEVC
+    { 'vp09', FF_CODEC_TYPE_VP9 },               // kCMVideoCodecType_VP9
+    { 'av01', FF_CODEC_TYPE_AV1 },               // kCMVideoCodecType_AV1
+    { 'ap4x', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes4444XQ
+    { 'ap4h', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes4444
+    { 'apch', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes422HQ
+    { 'apcn', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes422
+    { 'apcs', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes422LT
+    { 'apco', FF_CODEC_TYPE_PRORES },            // kCMVideoCodecType_AppleProRes422Proxy
+    { 'aprn', FF_CODEC_TYPE_PRORES_RAW },        // kCMVideoCodecType_AppleProResRAW
+    { 'aprh', FF_CODEC_TYPE_PRORES_RAW },        // kCMVideoCodecType_AppleProResRAWHQ
 };
 
 static FFCodecType ffCodecCodecToType(CMVideoCodecType codec) {
diff --git a/src/modules/codec/codec.c b/src/modules/codec/codec.c
index 640d3e665..4e6889e30 100644
--- a/src/modules/codec/codec.c
+++ b/src/modules/codec/codec.c
@@ -41,8 +41,6 @@ static const char* ffCodecTypeToString(FFCodecType type) {
             return "Apple ProRes";
         case FF_CODEC_TYPE_PRORES_RAW:
             return "Apple ProRes RAW";
-        case FF_CODEC_TYPE_JPEG_XL:
-            return "JPEG XL";
         case FF_CODEC_TYPE_UNKNOWN:
         default:
             return "Unknown";