From patchwork Tue May 30 17:34:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Mark X-Patchwork-Id: 3767 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1999123vsk; Tue, 30 May 2017 10:47:53 -0700 (PDT) X-Received: by 10.223.161.30 with SMTP id o30mr14456384wro.186.1496166473248; Tue, 30 May 2017 10:47:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496166473; cv=none; d=google.com; s=arc-20160816; b=vDXIoww9Z86KB380kTES63PQX0e4j2VivnK4mQQH+kNiRwUrX6FqFs2mgGcX9wA5Ue SmQh/KsWUQtN72NL/uwvstGCb0h0C6eDiwFAWgCNCbgOOFIOiwKouEJP/0dxK+fqrQc5 oBdvGqgjVwXW4o1CiEwyF/hbKJM0dch59xKHhFog6TtyfGoF1Z8gduY+YXiwkCr0bMui 1ASQF2+yrR9P3aFAnNa/DLojzmsvv4t2hZECdKYKuYhp9uUgkDOP493Pr/MoTPdzRLV+ irmRe8Xc+CGV2mnqxUyq7eLAMvoicx94JNZjYQ0tzRKlJEWAFyx+nZXOe7mil1QSSCUN 57vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=N2JtwIPLg7dxZqXScyxMY1pC29j63zKzG9agfnjA8Hw=; b=j48ULzjl27A4A7ZiMcWALoPP8WLFhVkfs6vr2Z8oE/0uRsFJCTdo1CWeXf8nZ3EMLY ueodciPjd7/eR5oX/bzXRKmqzvhKYATWmPVeFtQPAxk2uatzsAQKVe9IQFvEhzyoNLy1 JJ65gv7Xh/kLAwSs6KVYwWSvxEERI51F28Mw7Mbv5uVZOXtbgFMQZ6U/mYJyycEPyljR FYuSMIerqilUi2FtGGgTay5P1YXuJRzfDqm0Gd8Fa5EJRDwmkFKliy+iMIsl5DdrctnN 7KSD3paC5Nh7zQFQ466f2pTJoNKICYBHnk08Qyx1CreMbT5KWWdqOat/8Pqy3f+QAU+/ EhAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m187si25709970wmm.41.2017.05.30.10.47.52; Tue, 30 May 2017 10:47:53 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F3586883AB; Tue, 30 May 2017 20:47:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f174.google.com (mail-qt0-f174.google.com [209.85.216.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCA6968071A for ; Tue, 30 May 2017 20:47:38 +0300 (EEST) Received: by mail-qt0-f174.google.com with SMTP id t26so76152845qtg.0 for ; Tue, 30 May 2017 10:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/Jd/u9LyfVcjds/VdrszfDr+XbogHGu50sSmuXjNyCo=; b=Z98SUU+9Z0b5z0nTFC6pbEzWcKwLbu2Ga2LUtQrUBYZ7jMRo41ZGcXLLFlBihuTQSR n6A6lfbQM1LRE8hknYpWBlL1UZmivA/lEeW0baTAQ1nnpwruygbi8nKTDBKhZSyB7zTc fhpbRxRhYgr2xUL3c4vLPPzVGFUEthdZxGC/6g68Vgsic7K2bz0xQYedPplMziWhKr9O zOXLzXQc52o/oj9bJcYZmhyXAfflKZt0jre0VbPVUBrHdhCsvYBgyyRSQ7QwAF2RRthZ v1BU8a6MaRmbc4/gfEDHrH3hnRb4Lr6RkNYuB2GotFaSOBcVXXQE902x/6FoEs3P6H2I I3xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/Jd/u9LyfVcjds/VdrszfDr+XbogHGu50sSmuXjNyCo=; b=O10NANifVcTVu50buqJfUg5b7p9cnBeG3MAW5cLoKtZtRLU6c3k8BZ5N4P4muXR2ZR /R3YAyJd3C+tb4m7hy8/JYRapObC8/Wqq4l/vssQhEbXayX76jMvGsl3EItXX7e19UrT AdFJzdRgVe2QXDL7lUralbTmSscoSWOkj0OAjrHPwGpU08xP0cF5iZ2ApJFpCHGmIJhw yMoBQ9TX9TXwjNjJbTOszUYpVLfJVStP7AUJY7VpkLva5yXkreYlP6D3UPHbsqTG4ntK l3RRUruOjoGuJCEjndLuEZH1Psl5EaJ4/HRu3wYFC3t89hLMP0UrKLPRkeEzsuFW8Lkv NVTQ== X-Gm-Message-State: AODbwcAHLiOsbpO2mCMI6iqlTP6T+K09L+pHceUguwwmrTOV5lMJ6Ql1 DGO0tm7iUvnWXwJ4JNk= X-Received: by 10.200.52.83 with SMTP id v19mr26441733qtb.214.1496166047550; Tue, 30 May 2017 10:40:47 -0700 (PDT) Received: from Klingon.fios-router.home (pool-173-69-140-247.bltmmd.fios.verizon.net. [173.69.140.247]) by smtp.gmail.com with ESMTPSA id p20sm8901490qtf.31.2017.05.30.10.40.46 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 30 May 2017 10:40:47 -0700 (PDT) From: Kevin Mark To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2017 13:34:29 -0400 Message-Id: <20170530173429.10885-1-kmark937@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] libavfilter/scale2ref: Add constants for the primary input X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Kevin Mark MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Variables pertaining to the main video are now available when using the scale2ref filter. This allows, as an example, scaling a video with another as a reference point while maintaining the original aspect ratio of the primary/non-reference video. Consider the following graph: scale2ref=iw/6:-1 [main][ref] This will scale [main] to 1/6 the width of [ref] while maintaining the aspect ratio. This works well when the AR of [ref] is equal to the AR of [main] only. What the above filter really does is maintain the AR of [ref] when scaling [main]. So in all non-same-AR situations [main] will appear stretched or compressed to conform to the same AR of the reference video. Without doing this calculation externally there is no way to scale in reference to another input while maintaining AR in libavfilter. To make this possible, we introduce eight new constants to be used in the w and h expressions only in the scale2ref filter: * main_w/main_h: width/height of the main input video * main_a: aspect ratio of the main input video * main_sar: sample aspect ratio of the main input video * main_dar: display aspect ratio of the main input video * main_hsub/main_vsub: horiz/vert chroma subsample vals of main * mdar: a shorthand alias of main_dar Of course, not all of these constants are needed for maintaining the AR, but adding additional constants in line of what is available for in/out allows for other scaling possibilities I have not imagined. So to now scale a video to 1/6 the size of another video using the width and maintaining its own aspect ratio you can do this: scale2ref=iw/6:ow/mdar [main][ref] This is ideal for picture-in-picture configurations where you could have a square or 4:3 video overlaid on a corner of a larger 16:9 feed all while keeping the scaled video in the corner at its correct aspect ratio and always the same size relative to the larger video. I've tried to re-use as much code as possible. I could not find a way to avoid duplication of the var_names array. It must now be kept in sync with the other (the normal one and the scale2ref one) for everything to work which does not seem ideal. For every new variable introduced/removed into/from the normal scale filter one must be added/removed to/from the scale2ref version. Suggestions on how to avoid var_names duplication are welcome. var_values has been increased to always be large enough for the additional scale2ref variables. I do not forsee this being a problem as the names variable will always be the correct size. From my understanding of av_expr_parse_and_eval it will stop processing variables when it runs out of names even though there may be additional (potentially uninitialized) entries in the values array. The ideal solution here would be using a variable-length array but that is unsupported in C90. This patch does not remove any functionality and is strictly a feature patch. There are no API changes. Behavior does not change for any previously valid inputs. The applicable documentation has also been updated. Signed-off-by: Kevin Mark --- doc/filters.texi | 26 ++++++++++++++++++- libavfilter/scale.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 107fe61447..2cea6b74e6 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12429,7 +12429,31 @@ Supersampling Scale (resize) the input video, based on a reference video. See the scale filter for available options, scale2ref supports the same but -uses the reference video instead of the main input as basis. +uses the reference video instead of the main input as basis. scale2ref also +supports the following additional constants for the @option{w} and +@option{h} options: + +@table @var +@item main_w +@item main_h +The main input video's width and height + +@item main_a +The same as @var{main_w} / @var{main_h} + +@item main_sar +The main input video's sample aspect ratio + +@item main_dar, mdar +The main input video's display aspect ratio. Calculated from +@code{(main_w / main_h) * main_sar}. + +@item main_hsub +@item main_vsub +The main input video's horizontal and vertical chroma subsample values. +For example for the pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} +is 1. +@end table @subsection Examples diff --git a/libavfilter/scale.c b/libavfilter/scale.c index 50cd442849..e3a2fb5923 100644 --- a/libavfilter/scale.c +++ b/libavfilter/scale.c @@ -60,6 +60,49 @@ enum var_name { VARS_NB }; +/** + * This must be kept in sync with var_names so that it is always a + * complete list of var_names with the scale2ref specific names + * appended. scale2ref values must appear in the order they appear + * in the var_name_scale2ref enum but also be below all of the + * non-scale2ref specific values. + */ +static const char *const var_names_scale2ref[] = { + "PI", + "PHI", + "E", + "in_w", "iw", + "in_h", "ih", + "out_w", "ow", + "out_h", "oh", + "a", + "sar", + "dar", + "hsub", + "vsub", + "ohsub", + "ovsub", + "main_w", + "main_h", + "main_a", + "main_sar", + "main_dar", "mdar", + "main_hsub", + "main_vsub", + NULL +}; + +enum var_name_scale2ref { + VAR_S2R_MAIN_W, + VAR_S2R_MAIN_H, + VAR_S2R_MAIN_A, + VAR_S2R_MAIN_SAR, + VAR_S2R_MAIN_DAR, VAR_S2R_MDAR, + VAR_S2R_MAIN_HSUB, + VAR_S2R_MAIN_VSUB, + VARS_S2R_NB +}; + int ff_scale_eval_dimensions(void *log_ctx, const char *w_expr, const char *h_expr, AVFilterLink *inlink, AVFilterLink *outlink, @@ -72,7 +115,16 @@ int ff_scale_eval_dimensions(void *log_ctx, int factor_w, factor_h; int eval_w, eval_h; int ret; - double var_values[VARS_NB], res; + const char scale2ref = outlink->src->inputs[1] == inlink; + double var_values[VARS_NB + VARS_S2R_NB], res; + const AVPixFmtDescriptor *main_desc; + const AVFilterLink *main_link; + const char *const *names = scale2ref ? var_names_scale2ref : var_names; + + if (scale2ref) { + main_link = outlink->src->inputs[0]; + main_desc = av_pix_fmt_desc_get(main_link->format); + } var_values[VAR_PI] = M_PI; var_values[VAR_PHI] = M_PHI; @@ -90,20 +142,32 @@ int ff_scale_eval_dimensions(void *log_ctx, var_values[VAR_OHSUB] = 1 << out_desc->log2_chroma_w; var_values[VAR_OVSUB] = 1 << out_desc->log2_chroma_h; + if (scale2ref) { + var_values[VARS_NB + VAR_S2R_MAIN_W] = main_link->w; + var_values[VARS_NB + VAR_S2R_MAIN_H] = main_link->h; + var_values[VARS_NB + VAR_S2R_MAIN_A] = (double) main_link->w / main_link->h; + var_values[VARS_NB + VAR_S2R_MAIN_SAR] = main_link->sample_aspect_ratio.num ? + (double) main_link->sample_aspect_ratio.num / main_link->sample_aspect_ratio.den : 1; + var_values[VARS_NB + VAR_S2R_MAIN_DAR] = var_values[VARS_NB + VAR_S2R_MDAR] = + var_values[VARS_NB + VAR_S2R_MAIN_A] * var_values[VARS_NB + VAR_S2R_MAIN_SAR]; + var_values[VARS_NB + VAR_S2R_MAIN_HSUB] = 1 << main_desc->log2_chroma_w; + var_values[VARS_NB + VAR_S2R_MAIN_VSUB] = 1 << main_desc->log2_chroma_h; + } + /* evaluate width and height */ av_expr_parse_and_eval(&res, (expr = w_expr), - var_names, var_values, + names, var_values, NULL, NULL, NULL, NULL, NULL, 0, log_ctx); eval_w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; if ((ret = av_expr_parse_and_eval(&res, (expr = h_expr), - var_names, var_values, + names, var_values, NULL, NULL, NULL, NULL, NULL, 0, log_ctx)) < 0) goto fail; eval_h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res; /* evaluate again the width, as it may depend on the output height */ if ((ret = av_expr_parse_and_eval(&res, (expr = w_expr), - var_names, var_values, + names, var_values, NULL, NULL, NULL, NULL, NULL, 0, log_ctx)) < 0) goto fail; eval_w = res;