From patchwork Mon Jul 3 19:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp4589495pzh; Mon, 3 Jul 2023 12:34:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlFsNayQFNSi1pVP1IMO2DKOSd0vA5H/eN69KT3QmBMr3DG25Ieah+Clx3mzuRPMJ9AA7J4r X-Received: by 2002:a05:6512:1196:b0:4fb:8cd1:1679 with SMTP id g22-20020a056512119600b004fb8cd11679mr9531669lfr.44.1688412842261; Mon, 03 Jul 2023 12:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688412842; cv=none; d=google.com; s=arc-20160816; b=qnyLX4GZDKalHJMODMrvx4XLjkvk1VXH+OD0Cou/fmSEsHmKGmsPQEFyd5bNevWYBa HY5eqYEVRvu1cL7QGzhNb7za692TEa/idvqg4Q6LMcQiibzfTyeCkEE37QxWgNEZLnVB IVr7AGhMIocA6Rr2tc5aoAW/qSEk32DIfpO2TgXAgaC5c6F5UBfm2nAu09/2viqgzfdO cbs78Bz3+vG3Srh3eYM3T63p7Re95KH51OGCTgSqIHpcj87mbvEcr1a3ha2ydyQiweOV FK9S5vLefFjWc0deO/ykiAxCkV4kptALzsSOnqXen70OXNsa9HOyYBNEXPM7BLG9ZjX0 FRxg== 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=4u2HR6N+/zCH4DM543jFq+nD09Gp5Dpd9Fl3I3mYFwo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mZVwxtXiCM1lFKFl89szN25bDpn186mDPSk02Vkjltye/Tl+8OEMsfnjSb7e68NMLz HM6sKsDrJCTg/QNF91aR+aJKrPxFSM2y6EIL6otcerFCyl+uoFFOVamQ2yMNv+OhwyYg G4QDpCgcwQvzTQnKOTRawTEaMS5D1XPLE3+Sxt080oClBCAv75sYPx4xjCsjMT2G4xR2 Phad9rUXxsj/iRMbhyESBvniEVVvmOAGB3Xq0lHqRnyw9D1bjJZkPra70VAvpP1hRDsa kmNpWSBn/JA2Rn65F6ubCkc2nm1TgMDpWZmDkoqrT3sKihZPrNwwREave3MybBwgmr6g JXcg== 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 k3-20020a05640212c300b0051be9f09bf8si12225327edx.9.2023.07.03.12.34.01; Mon, 03 Jul 2023 12:34:02 -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 51E8F68C5C6; Mon, 3 Jul 2023 22:33:06 +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 E650868C5B3 for ; Mon, 3 Jul 2023 22:32:57 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3DDE92404F8 for ; Mon, 3 Jul 2023 21:32:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 5KQWfyz5q_zx for ; Mon, 3 Jul 2023 21:32:54 +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 mail0.khirnov.net (Postfix) with ESMTPS id 12FEB2406CA for ; Mon, 3 Jul 2023 21:32:52 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C572F3A1786 for ; Mon, 3 Jul 2023 21:32:45 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jul 2023 21:32:27 +0200 Message-Id: <20230703193229.8593-9-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230703193229.8593-1-anton@khirnov.net> References: <20230703193229.8593-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 08/10] lavc/bsf: move IS_EMPTY() to packet_internal() 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: ga0toyyYJ5cQ It will be useful in other places. --- libavcodec/bsf.c | 11 +++++------ libavcodec/packet_internal.h | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 42cc1b5ab0..1e710f7d4a 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -31,8 +31,7 @@ #include "bsf_internal.h" #include "codec_desc.h" #include "codec_par.h" - -#define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems) +#include "packet_internal.h" static av_always_inline const FFBitStreamFilter *ff_bsf(const AVBitStreamFilter *bsf) { @@ -205,7 +204,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) FFBSFContext *const bsfi = ffbsfcontext(ctx); int ret; - if (!pkt || IS_EMPTY(pkt)) { + if (!pkt || AVPACKET_IS_EMPTY(pkt)) { if (pkt) av_packet_unref(pkt); bsfi->eof = 1; @@ -217,7 +216,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) return AVERROR(EINVAL); } - if (!IS_EMPTY(bsfi->buffer_pkt)) + if (!AVPACKET_IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); ret = av_packet_make_refcounted(pkt); @@ -241,7 +240,7 @@ int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt) if (bsfi->eof) return AVERROR_EOF; - if (IS_EMPTY(bsfi->buffer_pkt)) + if (AVPACKET_IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); tmp_pkt = av_packet_alloc(); @@ -261,7 +260,7 @@ int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt) if (bsfi->eof) return AVERROR_EOF; - if (IS_EMPTY(bsfi->buffer_pkt)) + if (AVPACKET_IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); av_packet_move_ref(pkt, bsfi->buffer_pkt); diff --git a/libavcodec/packet_internal.h b/libavcodec/packet_internal.h index 92a0d4e6d5..52fa6d9be9 100644 --- a/libavcodec/packet_internal.h +++ b/libavcodec/packet_internal.h @@ -23,6 +23,8 @@ #include "packet.h" +#define AVPACKET_IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems) + typedef struct PacketListEntry { struct PacketListEntry *next; AVPacket pkt;