From patchwork Sat Aug 26 15:11:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43337 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:4f0f:b0:99c:ff93:59c5 with SMTP id t15csp996068eju; Sat, 26 Aug 2023 08:13:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpvCylKodrOBQK6ayNeHx6gBD8ZBAMr7xLc6sXARV9NnA9vS7oAuAZnhbbfz0RflzpF0Gm X-Received: by 2002:a17:906:5358:b0:9a2:1ce5:123f with SMTP id j24-20020a170906535800b009a21ce5123fmr5710645ejo.76.1693062829011; Sat, 26 Aug 2023 08:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693062828; cv=none; d=google.com; s=arc-20160816; b=Ol1g6r+r3HtHnIZoEjd2j+7h8PfvkwgmRjsd+mDUieTkQFxSthOHPWoH9QGXWHyNj4 B9A0m+DOwrw78zMWTL+mc2+FK6EWjDd+s6X6UbZkbPcKespoHcoMIZSuzlOpWV+/ODYl fHvOVx7gUytBcLGf4qQrpfpDtK0cas/nruNzVp+KkmAzSsMDMcOu4tgqAYY5CeSUsqhx 5Q1poxSCFg2BIT7ZhkDnKkBrwYz7j6Mrwp1za524GCSzgpIMopBn2i/Ep1Fv9Vezk1Td BlhwrcFK5xidV2dxts64KWZ292qfo/nApRsIQFPzOoKIArhhobB/L/jN8IpNhf/zmirw uv1Q== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=LWMPxqxtwvRHTqhQwrPVRWxNMuF0wCAa0AKkPn11H6k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jSzCxdB4L5bAM+kI9goQFnvAC0aD+WGPAeEtG28d5R7D/r03qKrUeprLv2IGc5xJMr WtWcOr0C3RrRnZ/LgV6u3rbtlCsVYx0q85bUsLx7+KR47ROiJy7Zj3VcwXXLocrepSr3 jhiwJHJ2qOcK0HvbVvIN0Cx8rHNv82lk5hd9HwIllpVCsUep8FJQN0sYu9rqncWe6rtU 9xee+lkvd00CIDOe+uckbLYMdAc4bkXyQlaUWStY9Ise0Ngs4u8QvOqmjAcXrSz5WKC0 xw+PjAXS4zRzx7Jk95bob3Oe7EwMpJkgZkaHKmLPxiskpUulV0pL3O+/ij129P9Nm88t +uuQ== 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 t11-20020a1709064f0b00b009877bb42154si321920eju.465.2023.08.26.08.13.48; Sat, 26 Aug 2023 08:13:48 -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 0F44B68C6D3; Sat, 26 Aug 2023 18:13:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61DAB68C642 for ; Sat, 26 Aug 2023 18:13:11 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2D7CC2401D4 for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 0KfLTKb4Vo9e for ; Sat, 26 Aug 2023 17:13:10 +0200 (CEST) Received: from mail1.khirnov.net (mail1.khirnov.net [IPv6:2a00:c500:561:206::5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail1.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id B095B2401C0 for ; Sat, 26 Aug 2023 17:13:10 +0200 (CEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 0356D40FA for ; Sat, 26 Aug 2023 17:15:14 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id k2ZoVMfiii2C for ; Sat, 26 Aug 2023 17:15:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 3C86540F8 for ; Sat, 26 Aug 2023 17:15:01 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D24FA3A15AC for ; Sat, 26 Aug 2023 17:11:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2023 17:11:40 +0200 Message-Id: <20230826151144.24858-14-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230826151144.24858-1-anton@khirnov.net> References: <20230826151144.24858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/18] fftools/ffmpeg_filter: shorten a variable name 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: nQMhAYCMpoxK --- fftools/ffmpeg_filter.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 1343e48fab..e65e7cb64d 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1745,13 +1745,13 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush) { FilterGraphPriv *fgp = fgp_from_fg(ofp->ofilter.graph); OutputStream *ost = ofp->ofilter.ost; - AVFrame *filtered_frame = fgp->frame; + AVFrame *frame = fgp->frame; AVFilterContext *filter = ofp->filter; FrameData *fd; int ret; - ret = av_buffersink_get_frame_flags(filter, filtered_frame, - AV_BUFFERSINK_FLAG_NO_REQUEST); + ret = av_buffersink_get_frame_flags(filter, frame, + AV_BUFFERSINK_FLAG_NO_REQUEST); if (ret < 0) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { av_log(fgp, AV_LOG_WARNING, @@ -1766,26 +1766,23 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush) return 1; } if (ost->finished) { - av_frame_unref(filtered_frame); + av_frame_unref(frame); return 0; } - if (filtered_frame->pts != AV_NOPTS_VALUE) { + if (frame->pts != AV_NOPTS_VALUE) { AVRational tb = av_buffersink_get_time_base(filter); - ost->filter->last_pts = av_rescale_q(filtered_frame->pts, tb, - AV_TIME_BASE_Q); - filtered_frame->time_base = tb; + ost->filter->last_pts = av_rescale_q(frame->pts, tb, AV_TIME_BASE_Q); + frame->time_base = tb; if (debug_ts) av_log(fgp, AV_LOG_INFO, "filter_raw -> pts:%s pts_time:%s time_base:%d/%d\n", - av_ts2str(filtered_frame->pts), - av_ts2timestr(filtered_frame->pts, &tb), - tb.num, tb.den); + av_ts2str(frame->pts), av_ts2timestr(frame->pts, &tb), tb.num, tb.den); } - fd = frame_data(filtered_frame); + fd = frame_data(frame); if (!fd) { - av_frame_unref(filtered_frame); + av_frame_unref(frame); return AVERROR(ENOMEM); } @@ -1799,15 +1796,14 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush) if (fr.num > 0 && fr.den > 0) { fd->frame_rate_filter = fr; - if (!filtered_frame->duration) { - filtered_frame->duration = av_rescale_q(1, av_inv_q(fr), - filtered_frame->time_base); + if (!frame->duration) { + frame->duration = av_rescale_q(1, av_inv_q(fr), frame->time_base); } } } - ret = enc_frame(ost, filtered_frame); - av_frame_unref(filtered_frame); + ret = enc_frame(ost, frame); + av_frame_unref(frame); if (ret < 0) return ret;