From patchwork Thu Oct 3 19:31:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp587685vqn; Thu, 3 Oct 2024 12:39:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVF5KN39xA4rmko1Qxc3Uhr0AwrGBC5m6zRxpdF+nBOVvkq9CPQSskM9/NNuNpHl+UZTjQO/K1NMQwlwg+yXg7K@gmail.com X-Google-Smtp-Source: AGHT+IGljBRH05o7PzfCYhBTe1xZPnTEHHo52h/U36Cep++gtQ+aVk9v+GT8qO49niRzhvZQZZGk X-Received: by 2002:a05:6512:281a:b0:535:3ca5:daa with SMTP id 2adb3069b0e04-539ab862484mr296485e87.7.1727984354170; Thu, 03 Oct 2024 12:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727984354; cv=none; d=google.com; s=arc-20240605; b=b+QAg8GI3L5visjkM0l0swll2w8dLyLnPZpn4QhqnIs/wYooyEx3RB9HPprG9/K7rd 4WJcYjvudvRqk5LFqEDLHyNiOG7XnppKJnYRvZGtkswQr80/NaztO1s/DcRePqK0f2ME +nOkt2gk4hNc+nTSKVCxbg0lJRL7hUIySY68CKQ58xreg+wdAlvuMQQB3UokyrRMwPs/ G7wBJSbmbzL4nWkWBO0qHLMX3yk+SFNQrcnnqz5GJ0yHP75MpkrpnltXw9AgLAdcSMxr 5mQqq/ZsH37K3sDtIf0UD8V7xWqmniTThNo9wzg8rA7Q/YtofLm95TCJUG5h711TE046 R3lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature:delivered-to; bh=JSDcNJF5ZMFl3mLEhwpMPJKecbcKX1MctwpIo3Wlapo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GgvEf0Cujrj7+7cCDHwJ/bC5kFJwAC7mJ0mtyWBHxEw6bT8cl6gV5hl4iJQgnqjcqB 1KH2M5mU7NmKX1FkOSTgLOtiber/iumtVl9Y8B9tV1qn+adyM+3lovC8U8+M2eBIYySl ySfryXCWXHxCHO9Xjj2dfMEL2dtvVJL7cbKUYZJyWrJztdDoVtpTHPl/+PDYd3pd8ei2 DT0da8b4vaxqS0Ub5nMTprGYEOrLzh14hiQZoNMvoYk/RSNzzHOCGmWBKlk7Ae6I4pmP BpFxIWyWH8qayFFrBi4u/BobyVamYwVVU30mBKbhjE9QXn8Uaab1ky3DeirC34LfxwhA nLFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=CGidR6Vr; 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 2adb3069b0e04-539a824e860si675736e87.83.2024.10.03.12.39.13; Thu, 03 Oct 2024 12:39:14 -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=@khirnov.net header.s=mail header.b=CGidR6Vr; 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 BC43468DA9B; Thu, 3 Oct 2024 22:32:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4867E68DA68 for ; Thu, 3 Oct 2024 22:32:24 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=CGidR6Vr; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C6CAB4E11 for ; Thu, 3 Oct 2024 21:32:23 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id YKC0B0liaCQ3 for ; Thu, 3 Oct 2024 21:32:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727983942; bh=28yQ4+4/qH42Stmnhu0dkHpEqxu97pGc4OocMHkrj+k=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CGidR6Vr1P8Je38/K/qth0kNg7c3tF57kKLhtjCx8/bXyvMTkzLClk3/1OaIzrO4Y lzebgt/2GkdxBHk6bE/8pLn49oJgG3iAhkT72AT9nMN028yHUWrIGopEt0TzevMfBO ZFMdLAnqV2sSRnooZFarajdDjP9D9n2mvR/y+h3UIAuy+Jrhd5VokgzHmajvu+V2Dr xGTEBUG1f08E5ZnIxuyizWmsYYfgriwZI42y4LAHtYHM9XewiPlkCAn8iEbpZV2pyX wBCJfVGOTQFlJBnnC4QA7T0tyampsGClO7FD+dBcXM6EhvQ9DFiEitiCsffIF5A5Q3 HkkyHnnymfBUw== 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 3506D4E16 for ; Thu, 3 Oct 2024 21:32:22 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D96A23A1DFD for ; Thu, 03 Oct 2024 21:32:15 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 21:31:26 +0200 Message-ID: <20241003193127.15818-6-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241003193127.15818-1-anton@khirnov.net> References: <20241003193127.15818-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] lavfi/avfilter: drop ff_ prefixes from static functions 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: qWdXpmqTbhTF --- libavfilter/avfilter.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 3295ffb18c..f7ab908599 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -522,7 +522,7 @@ static int64_t guess_status_pts(AVFilterContext *ctx, int status, AVRational lin return AV_NOPTS_VALUE; } -static int ff_request_frame_to_filter(AVFilterLink *link) +static int request_frame_to_filter(AVFilterLink *link) { FilterLinkInternal * const li = ff_link_internal(link); int ret = -1; @@ -1027,7 +1027,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return fabs(av_expr_eval(dsti->enable, dsti->var_values, NULL)) >= 0.5; } -static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) +static int filter_frame_framed(AVFilterLink *link, AVFrame *frame) { FilterLink *l = ff_filter_link(link); int (*filter_frame)(AVFilterLink *, AVFrame *); @@ -1181,7 +1181,7 @@ static int take_samples(FilterLinkInternal *li, unsigned min, unsigned max, return 0; } -static int ff_filter_frame_to_filter(AVFilterLink *link) +static int filter_frame_to_filter(AVFilterLink *link) { FilterLinkInternal * const li = ff_link_internal(link); AVFrame *frame = NULL; @@ -1201,9 +1201,9 @@ static int ff_filter_frame_to_filter(AVFilterLink *link) produce one or more: unblock its outputs. */ filter_unblock(dst); /* AVFilterPad.filter_frame() expect frame_count_out to have the value - before the frame; ff_filter_frame_framed() will re-increment it. */ + before the frame; filter_frame_framed() will re-increment it. */ li->l.frame_count_out--; - ret = ff_filter_frame_framed(link, frame); + ret = filter_frame_framed(link, frame); if (ret < 0 && ret != li->status_out) { link_set_out_status(link, ret, AV_NOPTS_VALUE); } else { @@ -1230,7 +1230,7 @@ static int forward_status_change(AVFilterContext *filter, FilterLinkInternal *li if (!li_out->status_in) { progress++; - ret = ff_request_frame_to_filter(filter->outputs[out]); + ret = request_frame_to_filter(filter->outputs[out]); if (ret < 0) return ret; } @@ -1249,7 +1249,7 @@ static int forward_status_change(AVFilterContext *filter, FilterLinkInternal *li return 0; } -static int ff_filter_activate_default(AVFilterContext *filter) +static int filter_activate_default(AVFilterContext *filter) { unsigned i; @@ -1267,7 +1267,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) for (i = 0; i < filter->nb_inputs; i++) { FilterLinkInternal *li = ff_link_internal(filter->inputs[i]); if (samples_ready(li, li->l.min_samples)) { - return ff_filter_frame_to_filter(filter->inputs[i]); + return filter_frame_to_filter(filter->inputs[i]); } } for (i = 0; i < filter->nb_inputs; i++) { @@ -1281,7 +1281,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]); if (li->frame_wanted_out && !li->frame_blocked_in) { - return ff_request_frame_to_filter(filter->outputs[i]); + return request_frame_to_filter(filter->outputs[i]); } } return FFERROR_NOT_READY; @@ -1429,7 +1429,7 @@ int ff_filter_activate(AVFilterContext *filter) filter->filter->activate)); ctxi->ready = 0; ret = filter->filter->activate ? filter->filter->activate(filter) : - ff_filter_activate_default(filter); + filter_activate_default(filter); if (ret == FFERROR_NOT_READY) ret = 0; return ret;