[FFmpeg-devel] [PATCH] avfilter/vf_colordetect: Reorder to avoid null pointer check (PR #20299)

[Zhao Zhili]

PR #20299 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20299
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20299.patch

Follow the general practice to assign the C implementation to DSP,
then the SIMD-optimized version.


From 2796ce20d9a91193dbdca9aa980accfb9f2794b0 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao at tencent.com>
Date: Thu, 21 Aug 2025 11:01:35 +0800
Subject: [PATCH] avfilter/vf_colordetect: Reorder to avoid null pointer check

Follow the general practice to assign the C implementation to DSP,
then the SIMD-optimized version.
---
 libavfilter/vf_colordetect.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libavfilter/vf_colordetect.c b/libavfilter/vf_colordetect.c
index a7fc98e2f1..88374ac3e2 100644
--- a/libavfilter/vf_colordetect.c
+++ b/libavfilter/vf_colordetect.c
@@ -229,19 +229,16 @@ static av_cold void uninit(AVFilterContext *ctx)
 av_cold void ff_color_detect_dsp_init(FFColorDetectDSPContext *dsp, int depth,
                                       enum AVColorRange color_range)
 {
+    dsp->detect_range = depth > 8 ? ff_detect_range16_c : ff_detect_range_c;
+    if (color_range == AVCOL_RANGE_JPEG) {
+        dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_full_c : ff_detect_alpha_full_c;
+    } else {
+        dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_limited_c : ff_detect_alpha_limited_c;
+    }
+
 #if ARCH_X86
     ff_color_detect_dsp_init_x86(dsp, depth, color_range);
 #endif
-
-    if (!dsp->detect_range)
-        dsp->detect_range = depth > 8 ? ff_detect_range16_c : ff_detect_range_c;
-    if (!dsp->detect_alpha) {
-        if (color_range == AVCOL_RANGE_JPEG) {
-            dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_full_c : ff_detect_alpha_full_c;
-        } else {
-            dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_limited_c : ff_detect_alpha_limited_c;
-        }
-    }
 }
 
 static const AVFilterPad colordetect_inputs[] = {
-- 
2.49.1