From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 97CB746173 for ; Wed, 7 Jun 2023 19:25:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AA0F68C077; Wed, 7 Jun 2023 22:25:07 +0300 (EEST) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2CEE68BF82 for ; Wed, 7 Jun 2023 22:24:58 +0300 (EEST) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3942c6584f0so5277639b6e.3 for ; Wed, 07 Jun 2023 12:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1686165897; x=1688757897; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=2MlnL1tEmilrlrzu0+F31W4B2g6ctnw6iv/ovDckciE=; b=pehOWhTgkRvZZZWyDIpEVahMrHOH1uv69GFFD3g13khdrDPCot4rbNQtQJQeMHcyR3 6Co6q7VIL6+8um3rfGxqNifkSvalL2xo42pknK6PbMgI+UQBErSPud43TXw4lThbmBxm UKo5did8c3Sf1ogFe8C00hS/7hpApByMyXNQyaSFfrzuKtFsWgAf0KwRKVYfMKGR01x1 aU/uMin0H7JCGNQjOU7RFyM4CKbuhG8Y/F5unfBE/Jf1BMyAyA4yeuHE7VgyRpG66Wa+ Hv5wlFrbbxUBNuC6cbHNFrsdpZpL/wmLOVxvtOpUsAv6kcWRsD6+T6qXf0vfOF4aaJ8t ZENA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686165897; x=1688757897; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2MlnL1tEmilrlrzu0+F31W4B2g6ctnw6iv/ovDckciE=; b=AWFUK8tt60ox0EerGw+yH8nmWQ+Cc/MKRlfeE/UeKxOzvhxwbD3stvMKX6wBdAZGCx J7j32uYT1qiYR8UqOOSyj6z/m2pNLt/vcbLCHzMeL3GiMqMFd1cnL9c7m/o898PyxQPf 87axNLWzWptwlPpent20peVmOhvrPfmIgArpRDOEw+XWzFKZR4qaqfrmYMh6EkSN4mNT wDNg0ogSVuHLr9oRLtzSlvDlePf5r7IUdy3I2p99iGHGdSoJaPm+/yEkdRbucxjIiH1d P+1eflA/+cCih/A8vqgsbBdM7SxsZOlCpiZtwgsSeLy+6oapRyEGSf6zzY3Nc/V2hizH P6yQ== X-Gm-Message-State: AC+VfDz6gWNrUPHCiSvYaLDFyqwMn7O9hq1awDsItpXgbyqGCZbkeumH 167fgRTf2WNaNFn2jagcUA26Q0Y4hGPg8//ZJyA= X-Google-Smtp-Source: ACHHUZ6K1cFN/2jnY4bg9J87gz08T8MKIleS1m7I1FY8x/vB+IvelyhF2IUPVn6uzhgAbCGN59CDWQ== X-Received: by 2002:a54:4414:0:b0:39a:a880:50dc with SMTP id k20-20020a544414000000b0039aa88050dcmr5574877oiw.52.1686165895902; Wed, 07 Jun 2023 12:24:55 -0700 (PDT) Received: from ltnt-nyc-580testdevin.livetimenet.com (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id j18-20020a0cf512000000b006261c80d76dsm133643qvm.71.2023.06.07.12.24.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2023 12:24:55 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jun 2023 16:22:22 -0400 Message-Id: <1686169347-28987-3-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686169347-28987-1-git-send-email-dheitmueller@ltnglobal.com> References: <1686169347-28987-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH 2/7] vf_drawtext: Add ability to show AFD value 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 Cc: Devin Heitmueller MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Add an "afd" variable which shows the current AFD side data for the given frame. This is to assist in debugging as it allows us to burn the current AFD right into the video. Example usage: ./ffmpeg -y -i afd.ts -vf drawtext=fontfile=/Library/Fonts/Verdana.ttf:text="AFD=%{afd}":fontsize=32:x=10:y=50:fontcolor=blue burnin.ts Signed-off-by: Devin Heitmueller --- doc/filters.texi | 5 +++++ libavfilter/vf_drawtext.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index a46357b..9179c20 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12601,6 +12601,11 @@ The following functions are available: @table @command +@item afd +The Active Format Descriptor value of the current frame (as specified in the +frame's side data). This can be useful for debugging aspect ratio issues. +See standards ETSI TS 101 154 or SMPTE ST2016-1 for more details on its meaning. + @item expr, e The expression evaluation result. diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 71ab851..32accfb 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -221,6 +221,7 @@ typedef struct DrawTextContext { int text_shaping; ///< 1 to shape the text before drawing it #endif AVDictionary *metadata; + AVFrame *frame; } DrawTextContext; #define OFFSET(x) offsetof(DrawTextContext, x) @@ -1056,6 +1057,22 @@ static int func_metadata(AVFilterContext *ctx, AVBPrint *bp, return 0; } +static int func_afd(AVFilterContext *ctx, AVBPrint *bp, + char *fct, unsigned argc, char **argv, int tag) +{ + DrawTextContext *s = ctx->priv; + AVFrameSideData *side_data; + + side_data = av_frame_get_side_data(s->frame, AV_FRAME_DATA_AFD); + if (side_data) { + av_bprintf(bp, "0x%02x", side_data->data[0]); + } else { + av_bprintf(bp, "none"); + } + + return 0; +} + static int func_strftime(AVFilterContext *ctx, AVBPrint *bp, char *fct, unsigned argc, char **argv, int tag) { @@ -1234,6 +1251,7 @@ static const struct drawtext_function { { "frame_num", 0, 0, 0, func_frame_num }, { "n", 0, 0, 0, func_frame_num }, { "metadata", 1, 2, 0, func_metadata }, + { "afd", 0, 0, 0, func_afd }, }; static int eval_function(AVFilterContext *ctx, AVBPrint *bp, char *fct, @@ -1680,6 +1698,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->var_values[VAR_DURATION] = frame->duration * av_q2d(inlink->time_base); s->metadata = frame->metadata; + s->frame = frame; for (int i = 0; i < loop; i++) { if (header) { -- 1.8.3.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".