From patchwork Wed Aug 11 01:17:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp956107iod; Tue, 10 Aug 2021 18:19:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzh9wAtRntwc5kE837wwUVfb2/69fYGcta8cVj+yepY+WaoTr3u+BTkFldv7YrrQ3aRIJ04 X-Received: by 2002:a05:6402:35d2:: with SMTP id z18mr8458107edc.282.1628644748085; Tue, 10 Aug 2021 18:19:08 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q7si21116293eja.751.2021.08.10.18.19.07; Tue, 10 Aug 2021 18:19:08 -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=@outlook.com header.s=selector1 header.b=jzkB0kDi; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8C668A4C3; Wed, 11 Aug 2021 04:18:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066053.outbound.protection.outlook.com [40.92.66.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D49868A3AF for ; Wed, 11 Aug 2021 04:18:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iYBvxirvknk6290Y0OwqDZDf2pmUaKM2nmAu2pF9TjdYVtqrtTDpfqRhmnEYoTDiIrDQ9OV9YuXapfASZjA1GLEowmJVBFrzqh4F2mIG/vHhDnh0us7xQMZTPAoOjFVJqDY7pi3lV70tpuf0Mt1UgSDiT84wm8u8caxzyxg0gah6HKV7xHwgZJHn6wDCzi16Xs6X1xsi5YI/gGD7sh/SdSxGaWteADFn7aE9go5fICe7iZkQCkqAqdcMhzSKwqckwNtd8crkb3/OBpBHnVJZnB0YWDC4Ka21oFJ4yOH7xeNnM+D6cn5Y7z2Zu1vOIyl7WFGfI7z8B3ShFAgX1k4TFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ROqJc2cNTMWfSgS4aX6rlgpiJ/qjyhJPvSPRU0Po+Jk=; b=k0uK3yG77gJaXreWuc7D7rd68yZiggNuNfvz9e3P9vhmd42hFkf5prP871aOBuNTysk/OfgcWtMFbHj5sRqA75AGW3Eg828KxXj3M8ZEwC0YEa80KhM7Pzv89yfda94voAOuSwAzdNA+9mqNsYbOuNA2Xz++Pm5JrzoUUG92DO58BQJg5DqJfoeuwlu6AzKfEjekrjqVyBkOY06hBcskxft4F7T2dWvhnLXbvxe14arvltAEI1l3qmFw/p+E7ROhNLlqStxwHL4Iya6tp5FaGRKlnDh9dBo+RiK9Y+vZLZQoR6ey1b+FrkOGryl1wtgybWfYm/B5Ymsk7jGY05F1Ag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ROqJc2cNTMWfSgS4aX6rlgpiJ/qjyhJPvSPRU0Po+Jk=; b=jzkB0kDi8cAw1f7Q7bbe1mn6+B6w2xqwG/aI8FNNABc89ke8nsKxDaVyxzoxe/qirHVn/V9eWWPygeP2Ak8zX9Duo8D2CUIeDbH8Ak/mzapInjorNQGIyL5NzZpyA7Iu5vOat6yEvezfIQ0a8tpmTYHfWCmJ4GRQTawA/MOSYGVhX3677py09B4Nxwwg5VivYWBx4BeWr2jvjZkjuUVvvU9idq8BbaIelKRFsGGmVOAGln7qrFKtvrmvG2e/oVy/JSSpwqBfAgwhrAybH+S1Wt1Qwq3ypt/Yq7FBu1p3deIYtbZAR4qRlNQXEpV0xG2zxSg06LnXnfYH0SmpZKXNBA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4613.eurprd03.prod.outlook.com (2603:10a6:20b:11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 01:18:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.023; Wed, 11 Aug 2021 01:18:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 03:17:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ASqNnhF/jPTH1sJ3cYs05D1rutZ+UW/4] X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210811011753.739659-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.5 via Frontend Transport; Wed, 11 Aug 2021 01:18:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ddb2c00-d380-477e-c0d6-08d95c65e95c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvw8IrM5N7Tagt+IMR0WNbyHX9p1JBrFL8w3obZr1U82+Eqa7RowLyiVaUQumEMRCne+/DGGnfXUYEtVyS8Copvfigeyyz2BjMa1f14DZVH4srmR8n7obGpO5pUCmEBNMLVdQz12SznBIX7CX6vVfZczJVYum5I4neGESp6kOQj1PTEBUN1fy3xSjSFV5BiECtDLcHM/9nCkQcGOe1iVwwxGogGlNK4d1qa/clSn4d1I3UG245Znw3ULMzzs4+kluMFBgptIUck4vKOBedeXw3LY3ZsYmf5vwhIgzThsjJHpcJMMtlMktWXllBVT9n0U5++9beSI2m7sKRfWQG/kGlvcMeREDPtks9ZBgCrFD15lqyDMRlIdI2kTve9TvUcQz0bR7APGQ7DIj6RsyG5Fd/vFkJNip0Ys+30gtwgLvO3ENSPklEVn9uniiYqOi/XqnrDnaLt3Sew5Qyicw+yH7olZbOsKYpu11TkmRWh1jlau1x02such6S9AKMsV0ayvfR+xHNhBsuINq2MHWyOC6+V8cEWraTswLbDj4WAr4D/xduodYUHjW9uHv+xkewVHSp8tglveVOPhPRnDT6yh0sy6V8IUOAtjHqQAAyafJ7RXR6evHO8jkbwPk7N8MbvuWYXc9Df9YmroWD7309tRA/D/PkZLRcHj7A2JHaTp0dQFUbyWbj6MLjxx858FHIlRZ2dg== X-MS-TrafficTypeDiagnostic: AM6PR03MB4613: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qG2swwYPqGltpQlXdMFtfPj1lyBqpKgIWwLp/nUvQGWLf/RepVvUqduK0Xa1x9vwwk11VkhqdJkkPsgnWN7F1Tu00q7RhrV56h9fL9/AAhwezjZ6EvfMZDUMMcClqRTNZafZ3tA3y+jv/rEcfRFWEMHT1JohGuqMCKao5EMW/cKF7IHzODfyIZhz6Ui9pbS8kQA+C4XBl0ovFpU/5k2MgI9hhEVoe1rMetqiBP9TMGeqd9D//bYoTF8ZWVUsOEs4omtCgwW4BG3YOxV0Cy5JginU71f4Om8NVzlK6iNTAdkvU29Ij/gHlkQJ8BocId5uzIZ/Z3n/KxVG+SfSHlc7xeJtvWqVmZo7Lp6R8OSKXdkmU8PZ4Dnl+c6nVg3b52ztM9Z8k/GoUwDfAOUsNyIoeaik8moDLe5hqbJFhW1R4NrT2BNDi/Bj3WRf8qH1i7z2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rMBuCiL3H4srW+WEn6/J9oBK/CdbxpFpgCdo253ereK8qs5hvd4IjtU6ixSddlT1dsFnHJnEtMwDt8dAQUZGRfj/1dhrRFqGalO4jAuAYk88C/rYv0eBs9fKc4PeT4c/S9/HiRZ/Lo8yMUBKXuK50Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ddb2c00-d380-477e-c0d6-08d95c65e95c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 01:18:22.8886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4613 Subject: [FFmpeg-devel] [PATCH 09/10] avfilter/avfilter: Make ff_update_link_current_pts static 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DpFG3bIWU17k Only used here. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 10 ++++++---- libavfilter/internal.h | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6925d99659..ef049fe9b6 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -47,6 +47,8 @@ #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; +static void update_link_current_pts(AVFilterLink *link, int64_t pts); + void ff_tlog_ref(void *ctx, AVFrame *ref, int end) { av_unused char buf[16]; @@ -220,7 +222,7 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts av_assert0(!link->status_out); link->status_out = status; if (pts != AV_NOPTS_VALUE) - ff_update_link_current_pts(link, pts); + update_link_current_pts(link, pts); filter_unblock(link->dst); ff_filter_set_ready(link->src, 200); } @@ -513,7 +515,7 @@ static int set_enable_expr(AVFilterContext *ctx, const char *expr) return 0; } -void ff_update_link_current_pts(AVFilterLink *link, int64_t pts) +static void update_link_current_pts(AVFilterLink *link, int64_t pts) { if (pts == AV_NOPTS_VALUE) return; @@ -1340,7 +1342,7 @@ int ff_inlink_acknowledge_status(AVFilterLink *link, int *rstatus, int64_t *rpts if (!link->status_in) return *rstatus = 0; *rstatus = link->status_out = link->status_in; - ff_update_link_current_pts(link, link->status_in_pts); + update_link_current_pts(link, link->status_in_pts); *rpts = link->current_pts; return 1; } @@ -1369,7 +1371,7 @@ int ff_inlink_check_available_samples(AVFilterLink *link, unsigned min) static void consume_update(AVFilterLink *link, const AVFrame *frame) { - ff_update_link_current_pts(link, frame->pts); + update_link_current_pts(link, frame->pts); ff_inlink_process_commands(link, frame); link->dst->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame); link->frame_count_out++; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 040ce6dee8..505d2d4952 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -199,8 +199,6 @@ av_warn_unused_result int ff_parse_channel_layout(int64_t *ret, int *nret, const char *arg, void *log_ctx); -void ff_update_link_current_pts(AVFilterLink *link, int64_t pts); - /** * Set the status field of a link from the source filter. * The pts should reflect the timestamp of the status change,