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 88F754407A for ; Fri, 23 Jun 2023 13:18:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB00C68C156; Fri, 23 Jun 2023 16:18:51 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 412D068B6C6 for ; Fri, 23 Jun 2023 16:18:45 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 7546C401C9; Fri, 23 Jun 2023 15:18:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1687526324; bh=EQ04WjtmDgTMI1w1sBNKvm6b93zRimWPT/crrFfEdAs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=E4EXGL8LydS6YIfi/LmGhhV15V663bi8aaP/BWNUMCLNH6Gv0rNI6YSkLTXiRr+or 14wJa/vuyVH4VidxzdN/39dACALatQ58GJfyNmbAWXlA7dVRFHzEJAKy9067pQr2q+ M/gUJa7OjKA4wJBqB8lqzTzEMxNKImli1UiRl7bc= Date: Fri, 23 Jun 2023 15:18:44 +0200 Message-ID: <20230623151844.GB116437@haasn.xyz> From: Niklas Haas To: ffmpeg-devel@ffmpeg.org In-Reply-To: <20230620151248.21755-1-ffmpeg@haasn.xyz> References: <20230620151248.21755-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: simplify SAR normalization 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: Niklas Haas 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: On Tue, 20 Jun 2023 17:12:48 +0200 Niklas Haas wrote: > From: Niklas Haas > > The old logic was trying to be excessively clever in "deducing" that the > user wanted to stretch/scale the image when ow/oh differed from iw/ih > aspect ratio. But this is almost surely unintended except in > pathological cases, and in those cases users should simply disable > normalize_sar and do all the stretching/scaling logic themselves. This > is especially important in multi-input mode, where the canvas may be > vastly different from the input dimensions of any stream. Also, passing > through input 0 SAR in multi-input mode is arbitrary and nearly useless, > so again force output SAR to 1:1 here. > --- > libavfilter/vf_libplacebo.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c > index 0f7c6481925..e58183a5caa 100644 > --- a/libavfilter/vf_libplacebo.c > +++ b/libavfilter/vf_libplacebo.c > @@ -160,7 +160,6 @@ typedef struct LibplaceboContext { > // Parsed expressions for input/output crop > AVExpr *crop_x_pexpr, *crop_y_pexpr, *crop_w_pexpr, *crop_h_pexpr; > AVExpr *pos_x_pexpr, *pos_y_pexpr, *pos_w_pexpr, *pos_h_pexpr; > - AVRational target_sar; > float pad_crop_ratio; > float corner_rounding; > int force_original_aspect_ratio; > @@ -795,9 +794,9 @@ static void update_crops(AVFilterContext *ctx, LibplaceboInput *in, > target->crop.y0 = av_expr_eval(s->pos_y_pexpr, s->var_values, NULL); > target->crop.x1 = target->crop.x0 + s->var_values[VAR_POS_W]; > target->crop.y1 = target->crop.y0 + s->var_values[VAR_POS_H]; > - > - if (s->target_sar.num) { > - float aspect = pl_rect2df_aspect(&target->crop) * av_q2d(s->target_sar); > + if (s->normalize_sar) { > + float aspect = pl_rect2df_aspect(&image->crop); > + aspect *= av_q2d(in->link->sample_aspect_ratio); > pl_rect2df_aspect_set(&target->crop, aspect, s->pad_crop_ratio); > } > } > @@ -1188,7 +1187,6 @@ static int libplacebo_config_output(AVFilterLink *outlink) > const AVPixFmtDescriptor *out_desc = av_pix_fmt_desc_get(outlink->format); > AVHWFramesContext *hwfc; > AVVulkanFramesContext *vkfc; > - AVRational scale_sar; > > /* Frame dimensions */ > RET(ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, > @@ -1198,20 +1196,15 @@ static int libplacebo_config_output(AVFilterLink *outlink) > s->force_original_aspect_ratio, > s->force_divisible_by); > > - scale_sar = (AVRational){outlink->h * inlink->w, outlink->w * inlink->h}; > - if (inlink->sample_aspect_ratio.num) > - scale_sar = av_mul_q(scale_sar, inlink->sample_aspect_ratio); > - > - if (s->normalize_sar) { > - /* Apply all SAR during scaling, so we don't need to set the out SAR */ > + if (s->normalize_sar || s->nb_inputs > 1) { > + /* SAR is normalized, or we have multiple inputs, set out to 1:1 */ > outlink->sample_aspect_ratio = (AVRational){ 1, 1 }; > - s->target_sar = scale_sar; > } else { > /* This is consistent with other scale_* filters, which only > * set the outlink SAR to be equal to the scale SAR iff the input SAR > * was set to something nonzero */ > if (inlink->sample_aspect_ratio.num) > - outlink->sample_aspect_ratio = scale_sar; > + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; > } > > /* Frame rate */ > -- > 2.41.0 > Merged as 5fdb12d6a06. _______________________________________________ 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".