From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5DE654C73E for ; Fri, 12 Sep 2025 11:20:28 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'QXZLRroESlA9UuhI0W5S3tcLE5krXkj0nUfk5tkN/Qc=', expected b'r/EHOAM67QDAhYcdzoi2aPe+K9CUsXjBWyX0ijC6wBw=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757676014; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=QXZLRroESlA9UuhI0W5S3tcLE5krXkj0nUfk5tkN/Qc=; b=Q6RcDbTBj1cCMAdxUGJXQ0iB/RbqNcjF++0Vigr2CbdlzXquyuRwn5M+9Vwj27utTus31 dBfFOh05YQgU/H2FvxOg1jNxLpWHF4yy6qNVbvDsmVY2Z711SEQR1XlXLJTArX+kjus9w/f yWM2d70OUpTO4rjPU7Oogs0xYsu9O+D0Q1Gb5rTqyWpXtwUsj8GCNi3fArHIYKfI8df2LXv 9TnWSbNPj1DIupG1gj464ZOnjhbRzHEL6Bf14AuisgvH5YD9PRskX4g5hx0RLATTe/97pgm JKbhSxzNVZ/RbetRLnmB5egU1k6MfklQqIS/nKp57VHZQYEI5zKn9WfErj2w== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 50A5368D4D6; Fri, 12 Sep 2025 14:20:14 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757676012; b=r8PlxYHjt0mcPFndJj6DdrvMBb7IRCo68fsk0YB4uzLL5ub4O8/iAzrdoZzGKfXs1HhU0 DsUbo6AAEUHJHINsLqNzGYa1BgnEBTRsaZEa2ms19rFlqQk/s8szqKWo1eu6qJJXI1ojDv8 HYB9R0wOG86EZIT9IgLP37YXKYi5c/yqDuPpMn34AYTVKdmplluVlg03ET0bE49tnMf5T7H scQA/rRXDCEw3HxG8kF7jhDaQtpW5HuRLK9/1cDd8pX7MdeT/dwTYDqnwWGeTB4ujL2RsFH wc8oRMzktWNKkWGu/zhFFPiZF64Ii3O2mUx9SauJ32V80YSqVq1TRjeXYVFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757676012; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=Hz5TuDAOBswx6+uxCO31DJEeC+ClSk43FZaHer8jAHw=; b=LysYgJqiCSYSW/gvkEHooLr90WvbXfIRZwAuhZ6CsudfobaSuLZDfhjjKnYd65JfeogWR UmhgMiBLOpIfoIGc7ErizwFqvrE1Pbui3awqNLE7VNI6qSKEHyC/rs5di0p0odJE7mWi3MS 6e2v9T+KhxOBr1A2+drC3XTQhcvsuV3DCLLK0NI58QuvTCeBTKFGVHuI3A7obPjYyLuf4rC OSZdTfKtA29SkvkYG/RbCYZl9rIWoHcW5TkRfGqotuUDJxjMRg7uuEvTomLGHDamDdW2hsQ +gZzsTb8sHibv3H5vRmwEIUpTsfxcK1ng+eR6yNd9/09a3MCR6+1RCGsg79w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757676000; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=r/EHOAM67QDAhYcdzoi2aPe+K9CUsXjBWyX0ijC6wBw=; b=UYZVAj5UbGvs9M0e45Wd2kGtsGzkZN0NfvBuUI0i8H/B5MglkD3DSbncXqp+nQM7lKmTb i0zzIVbhTpclbHFTqMr4eU4i+wCAY68y2U7XEynOV7qTsvCBdwLO0g8NSl4f1xloYaJtmYj VX50CF0nddarH535+Pcp4fbLhQM8CThaLvEhil3xoN1saP4+guYLQEQRsz9NNUTlXtEg4Fv h2clOrIAtTtrWWDPS7PZ50uIMhk0tdBtf9XQTmZ1E/2WpNKyuejO+axU+7s7m67BVOdbd1J 3kBWKJ+SOllkoSF6DWgo5gqEBEdIsX2DfpUfwJAFTDYVDUZNXzNN1TV3eIAA== Received: from 3f9d35a0eedc (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8151468D4D6 for ; Fri, 12 Sep 2025 14:20:00 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Sep 2025 11:19:59 -0000 Message-ID: <175767600084.25.6282037680849514793@463a07221176> Message-ID-Hash: 6DMBRNDLPOHKKW35N4V566KWAJ5CDMXI X-Message-ID-Hash: 6DMBRNDLPOHKKW35N4V566KWAJ5CDMXI X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avfilter/vf_colordetect: only report detected properties on EOF (PR #20503) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Niklas Haas via ffmpeg-devel Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20503 opened by Niklas Haas (haasn) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20503 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20503.patch Instead of reporting them also when the filtergraph is suddenly destroyed mid-stream, e.g. during the `ffmpeg` tool's early init. >>From 113878b880bf0d25a0c683acd9e3c0dc91bc2a34 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Fri, 12 Sep 2025 13:18:07 +0200 Subject: [PATCH] avfilter/vf_colordetect: only report detected properties on EOF Instead of reporting them also when the filtergraph is suddenly destroyed mid-stream, e.g. during the `ffmpeg` tool's early init. --- libavfilter/vf_colordetect.c | 37 +++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_colordetect.c b/libavfilter/vf_colordetect.c index ef7fb25130..5fd61a302c 100644 --- a/libavfilter/vf_colordetect.c +++ b/libavfilter/vf_colordetect.c @@ -204,7 +204,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(inlink->dst->outputs[0], in); } -static av_cold void uninit(AVFilterContext *ctx) +static av_cold void report_detected_props(AVFilterContext *ctx) { ColorDetectContext *s = ctx->priv; if (!s->mode) @@ -226,6 +226,38 @@ static av_cold void uninit(AVFilterContext *ctx) } } +static int activate(AVFilterContext *ctx) +{ + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *frame; + int64_t pts; + int ret; + + ret = ff_outlink_get_status(outlink); + if (ret) { + ff_inlink_set_status(inlink, ret); + report_detected_props(ctx); + return 0; + } + + ret = ff_inlink_consume_frame(inlink, &frame); + if (ret < 0) { + return ret; + } else if (ret) { + return filter_frame(inlink, frame); + } + + if (ff_inlink_acknowledge_status(inlink, &ret, &pts)) { + ff_outlink_set_status(outlink, ret, pts); + report_detected_props(ctx); + return 0; + } + + FF_FILTER_FORWARD_WANTED(outlink, inlink); + return FFERROR_NOT_READY; +} + av_cold void ff_color_detect_dsp_init(FFColorDetectDSPContext *dsp, int depth, enum AVColorRange color_range) { @@ -248,7 +280,6 @@ static const AVFilterPad colordetect_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .filter_frame = filter_frame, }, }; @@ -261,5 +292,5 @@ const FFFilter ff_vf_colordetect = { FILTER_INPUTS(colordetect_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC2(query_format), - .uninit = uninit, + .activate = activate, }; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org