From patchwork Sun Jan 29 10:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp2663938pzj; Sun, 29 Jan 2023 02:18:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYI6X/C8WC2HJkclOGy2Dfcn49Jk5rGuQGaYUW7JwCjxlxspqaxDxYjCzCVN9KKsYkzD0N X-Received: by 2002:a17:906:b14b:b0:864:1902:7050 with SMTP id bt11-20020a170906b14b00b0086419027050mr45852772ejb.69.1674987497194; Sun, 29 Jan 2023 02:18:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674987497; cv=none; d=google.com; s=arc-20160816; b=WYmi2B9RYM6/LWQfAbVFhBOQmub7jINL62NTUTGJFifGDhw9od7qNOP+Rd09almMW/ GBail3dWeteZCNrgRTs7fdRGehqWEuLNTHxvWryOHIPBZheF8/NJEFfaTvAsbr3e2Ovi 2dnWAbQAf0vRQSIVXjAuSVUJ9xI+tDLmsZ5T3wWNnQ82iDe3IHq7oyTnkJW9y9l1tuPX G8wvbqFwTnzsofJ+T4eF33FGEz6ek7NQNWmBUmIUQdgLbnH1eb5N0tOq0vdcQheqgivc uoT28CFVV2BObUYfZ9gjBk3u07zpObywttdzxpxucYhc7sZ5QZDf87rSjAMw5pLjwYRF 5jmg== 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=w5jyyOOwyVFYyqb68f8nEYUXIa2pcwPZEd3/BM9HiWo=; b=fAvE0flrR+sjhq/JLdBP9KXSATDVGlAExlA6qR+od48ILKbAe9rKhO4svfFqnrIwOu JIfRKX7+JRPEhlnqqAoqsxffh8QIRO54JkQ699YhvaWLOco36zIs8Yh6yhCScgkXlvZN Hcomx95N1YnO+U/3gVn/dv71MMcoGs5+WBJEqPQpwfvV+BdSwF2nvRW2qfF8vvo7UEEO AEGkACBhkCMpHTXkASp1H3eEmfhcn+PFiVSSFdPpbkjx3kqAuPS0t6gRRo/FhhDx3/UB iJfbUTLYpiz6Z1dOgaX2zxB1L1O3kJmkFFwqIkY87EB4bIz+IrX7Pdz5pMt4x7iYc5tw tHEw== 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 uo7-20020a170907cc0700b00877a7ce0ec4si11462648ejc.252.2023.01.29.02.18.16; Sun, 29 Jan 2023 02:18:17 -0800 (PST) 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 CAFE168BC94; Sun, 29 Jan 2023 12:17:57 +0200 (EET) 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 20AE368B1E4 for ; Sun, 29 Jan 2023 12:17:49 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D37AE2404EC for ; Sun, 29 Jan 2023 11:17:48 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id CotaLd5ZVDam for ; Sun, 29 Jan 2023 11:17:48 +0100 (CET) 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 mail0.khirnov.net (Postfix) with ESMTPS id B9DE82404EE for ; Sun, 29 Jan 2023 11:17:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5D8CF3A0344 for ; Sun, 29 Jan 2023 11:17:47 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Jan 2023 11:17:34 +0100 Message-Id: <20230129101735.14173-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230129101735.14173-1-anton@khirnov.net> References: <20230116133840.512-1-jamrial@gmail.com> <20230129101735.14173-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavu/fifo: uninline deprecated av_fifo_peek2() 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: I9dlhaCy6uQr Will allow to mark AVFifoBuffer fields as deprecated without triggering spurious warnings. --- libavutil/fifo.c | 10 ++++++++++ libavutil/fifo.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 51a5af6f39..5b114fc808 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -506,5 +506,15 @@ void av_fifo_drain(AVFifoBuffer *f, int size) f->rptr -= f->end - f->buffer; f->rndx += size; } + +uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs) +{ + uint8_t *ptr = f->rptr + offs; + if (ptr >= f->end) + ptr = f->buffer + (ptr - f->end); + else if (ptr < f->buffer) + ptr = f->end - (f->buffer - ptr); + return ptr; +} FF_ENABLE_DEPRECATION_WARNINGS #endif diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 0a1ea70a60..ed86800da4 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -428,15 +428,7 @@ void av_fifo_drain(AVFifoBuffer *f, int size); * @deprecated use the new AVFifo-API with av_fifo_peek() or av_fifo_peek_to_cb() */ attribute_deprecated -static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs) -{ - uint8_t *ptr = f->rptr + offs; - if (ptr >= f->end) - ptr = f->buffer + (ptr - f->end); - else if (ptr < f->buffer) - ptr = f->end - (f->buffer - ptr); - return ptr; -} +uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs); #endif /**