eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_colordetect: Avoid sequentially consistent atomics

Browse Source 
Reviewed-by: Martin Storsjö <martin@martin.st>
Reviewed-by: Niklas Haas <ffmpeg@haasn.dev>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-09-15 19:14:39 +02:00
parent a35c91dc14
commit fe0a313299
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/vf_colordetect.c
+17 -10
View File
@@ -138,7 +138,8 @@ static int detect_range(AVFilterContext *ctx, void *arg,
if (s->dsp.detect_range(in->data[0] + y_start * stride, stride,
in->width, h_slice, s->mpeg_min, s->mpeg_max))
atomic_store(&s->detected_range, AVCOL_RANGE_JPEG);
atomic_store_explicit(&s->detected_range, AVCOL_RANGE_JPEG,
memory_order_relaxed);
return 0;
}
@@ -194,11 +195,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
ColorDetectContext *s = ctx->priv;
const int nb_threads = FFMIN(inlink->h, s->nb_threads);
if (s->mode & COLOR_DETECT_COLOR_RANGE && s->detected_range == AVCOL_RANGE_UNSPECIFIED)
enum AVColorRange detected_range = atomic_load_explicit(&s->detected_range, memory_order_relaxed);
if (s->mode & COLOR_DETECT_COLOR_RANGE && detected_range == AVCOL_RANGE_UNSPECIFIED)
ff_filter_execute(ctx, detect_range, in, NULL, nb_threads);
if (s->mode & COLOR_DETECT_ALPHA_MODE && s->detected_alpha != FF_ALPHA_NONE &&
s->detected_alpha != FF_ALPHA_STRAIGHT)
enum FFAlphaDetect detected_alpha = atomic_load_explicit(&s->detected_alpha, memory_order_relaxed);
if (s->mode & COLOR_DETECT_ALPHA_MODE && detected_alpha != FF_ALPHA_NONE &&
detected_alpha != FF_ALPHA_STRAIGHT)
ff_filter_execute(ctx, detect_alpha, in, NULL, nb_threads);
return ff_filter_frame(inlink->dst->outputs[0], in);
@@ -212,17 +215,21 @@ static av_cold void uninit(AVFilterContext *ctx)
av_log(ctx, AV_LOG_INFO, "Detected color properties:\n");
if (s->mode & COLOR_DETECT_COLOR_RANGE) {
enum AVColorRange detected_range = atomic_load_explicit(&s->detected_range,
memory_order_relaxed);
av_log(ctx, AV_LOG_INFO, " Color range: %s\n",
s->detected_range == AVCOL_RANGE_JPEG ? "JPEG / full range"
: "undetermined");
detected_range == AVCOL_RANGE_JPEG ? "JPEG / full range"
: "undetermined");
}
if (s->mode & COLOR_DETECT_ALPHA_MODE) {
enum FFAlphaDetect detected_alpha = atomic_load_explicit(&s->detected_alpha,
memory_order_relaxed);
av_log(ctx, AV_LOG_INFO, " Alpha mode: %s\n",
s->detected_alpha == FF_ALPHA_NONE ? "none" :
s->detected_alpha == FF_ALPHA_STRAIGHT ? "straight" :
s->detected_alpha == FF_ALPHA_TRANSPARENT ? "undetermined"
: "opaque");
detected_alpha == FF_ALPHA_NONE ? "none" :
detected_alpha == FF_ALPHA_STRAIGHT ? "straight" :
detected_alpha == FF_ALPHA_TRANSPARENT ? "undetermined"
: "opaque");
}
}