From patchwork Fri May 14 10:23:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 27775 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp335951iof; Fri, 14 May 2021 03:24:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyshfo/7EIx8WQ+f7B8/d6/rZL8ezHD6uDeEmhYUTd/+X83BgMAp/ej8SWJ4Dxsm3wl4N39 X-Received: by 2002:a05:6402:177c:: with SMTP id da28mr54297255edb.135.1620987841393; Fri, 14 May 2021 03:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620987841; cv=none; d=google.com; s=arc-20160816; b=yxeWAAKaXZ8QoB4XeEDOblesvv3g8DskkklJyybTFIb8qSEs9s/9PpnvSVu/mcjX8S gM4xwRoKvufI+oMdqNj9f5xkdYIZFRATnQ7/QMw1tax9bfu/wJZJquR2cqJfB8K99b+Y Q2t++nDMpxwfMXqEYGtCd7nOUHhQ8yO8C/v3HyMWPshi5F+S7JULOVOa3nj7yBHGKRd3 3tKy96apEX6mLjUAUmqlmUWAIS6DhoWwzD2zaKW0/oUsRk2UIec6EdHUnPRMu/ubUBTk d5n4/yO51CJtYBZ6bA0lwmmtDy613+L9KPez+rKD19Y9+0ejlmJ9R8J9POVCpxuQ08Ky FzpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=6ydZxaqv0A88y4tZzkOF0OdjUzNxui/jymkN+1mQNCY=; b=vlnvowikIPFhyx53gne7SV7IrH5vtRNW6InZriOc+vtYr1sg+IH8cfj7jbawishZyO IijMJJG/ZmXAnupPnaHG3uFbE1PRPn/2hMFKn7VeaHHvUOtdoi6PA4nHkK6mPHUISV5r PBBdlw5IJl3+Gqyesq1HP5L0tLGZE0+1WuK78kRzl+pVP6qzKvrdCmOQTdkmTS3NjCVg oHhw75u7tcKolQBCbkevdCuCTgwyJLNb6oPGgftaFaM/SOUeM8RkzeUo+dsnzWEO7R6S sTjCniaKDUlGSngjhBGqUY7zn7xjnLVH0kaFpSaD3rnZIinehepIYlmJaT1mnIoOk2nX 6a7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m9si5999327edc.229.2021.05.14.03.24.00; Fri, 14 May 2021 03:24:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0258680BFE; Fri, 14 May 2021 13:23:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84469680211 for ; Fri, 14 May 2021 13:23:50 +0300 (EEST) Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4FhPks47JVzQjy8 for ; Fri, 14 May 2021 12:23:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id zO6mytfpWVfy for ; Fri, 14 May 2021 12:23:46 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 15:53:31 +0530 Message-Id: <20210514102331.1818-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-MBO-SPAM-Probability: ***** X-Rspamd-Score: 7.29 / 15.00 / 15.00 X-Rspamd-Queue-Id: 9846718B2 X-Rspamd-UID: 163bc5 Subject: [FFmpeg-devel] [PATCH] avfilter/metadata: add intuitive labels for metadata values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: n5srNrKOfhyn --- doc/filters.texi | 4 ++-- libavfilter/f_metadata.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index ed0ffe91fc..1a8843fe4f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -25296,10 +25296,10 @@ The expression is evaluated through the eval API and can contain the following constants: @table @option -@item VALUE1 +@item VALUE1, FRAMEVAL Float representation of @code{value} from metadata key. -@item VALUE2 +@item VALUE2, USERVAL Float representation of @code{value} as supplied by user in @code{value} option. @end table diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 5fec7c3c56..e7c7b00118 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -61,12 +61,16 @@ enum MetadataFunction { static const char *const var_names[] = { "VALUE1", "VALUE2", + "FRAMEVAL", + "USERVAL", NULL }; enum var_name { VAR_VALUE1, VAR_VALUE2, + VAR_FRAMEVAL, + VAR_USERVAL, VAR_VARS_NB }; @@ -172,8 +176,8 @@ static int parse_expr(MetadataContext *s, const char *value1, const char *value2 if (sscanf(value1, "%lf", &f1) + sscanf(value2, "%lf", &f2) != 2) return 0; - s->var_values[VAR_VALUE1] = f1; - s->var_values[VAR_VALUE2] = f2; + s->var_values[VAR_VALUE1] = s->var_values[VAR_FRAMEVAL] = f1; + s->var_values[VAR_VALUE2] = s->var_values[VAR_USERVAL] = f2; return av_expr_eval(s->expr, s->var_values, NULL); }