From patchwork Sun Apr 19 19:22:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19099 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:3c87:0:0:0:0:0 with SMTP id j129csp2960641yba; Sun, 19 Apr 2020 12:23:09 -0700 (PDT) X-Google-Smtp-Source: APiQypLsJSosYBKuaBwFbJJVYqqSwMdN/yZKtDvRFfwcpc3E1Sgmy0JYFLMIZPOvHaDcIenEaPhk X-Received: by 2002:a5d:438c:: with SMTP id i12mr14884563wrq.14.1587324189318; Sun, 19 Apr 2020 12:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587324189; cv=none; d=google.com; s=arc-20160816; b=kD9mU1jM12mhb6AtnCHZp2XwJPNjYiSBmv48lAuKw0hFfa5WThwd9AOkdH64u6smgQ kyoCeKG8Zm27bfjyML5Dz+C/r0O5epU866czpuLANVnAQnc74TY3fsrBUWmhto85v9JN dY/vW/5e5C1GCUNnIGgHBgtO7a+vGbWhTllJcbogtz7gazOqDKkPUb38+iVRcM1IMrMl 3dSTA/XHsbYq+4wBiogal7AZQAERUaFHtdFalW2gyJFw4PDariE/NIsHKjyUjsXoJuBm g9HmaGIIsFnkiqDE8OyLcmWQlxSqYhQYXsq8dB8+xIkMytUdo7gPPY5/O9JBXNPGt+GU BjEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Ra6iZJn4BSwYqOxosdk3DPaBQraYJCmhfLNRPYMbUSw=; b=q3/mYqAqUH6eKfqYmxuJTdpKGoRKe/9IjW7l1pv3qbJGgtNBbmdoGXzkONKI6amA9M 52VVzmGG9VZ+enXbPrG4E3j2ZPBZyu98oRr6/mWUrJVCFli/XkMxIfbnbrvfl/nqySSl GQsK2TNJfmGwfnZLLfyHVXp9qHjT/ffwIesWRt1EpZvDRq1BsbKhWG3d2O0lWA5I9OE4 miOxCjhOQlVn13Nzy74dGc2+S6NatVGPZQSkvTxTby0U03Y2BtI+ucevyTdH1RGj1xUP 5Vky0o+F8eLeSGOfGxEt3aTsLLjSGtmq/e7Cc2g3fw9Ky/vXKCYTSGlzLdwk4FZdoNqO j/Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gI0pjMrT; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z12si28264882wre.358.2020.04.19.12.23.08; Sun, 19 Apr 2020 12:23:09 -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=@gmail.com header.s=20161025 header.b=gI0pjMrT; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1163268B937; Sun, 19 Apr 2020 22:23:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A8BD68B7A9 for ; Sun, 19 Apr 2020 22:23:00 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id t63so7549598wmt.3 for ; Sun, 19 Apr 2020 12:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yMkiZsIrOH0ofDyoMDN592CwPH9cysWLVweCpUyiuRM=; b=gI0pjMrTe+zTyXsEVvAV8ZQgULbLZWWtVEyg9VYkYhNmgYBx+LHsKvmEBmUy2CMFrU Gy25QTMv6vSTY9byw3/wJpikzI5CEd2mUQ+X2zU0E6ZOvjOySnppziGAOKJdvmWl2YoL r/00FuSKK7YCCejyGsXHdCBzLZF0lmZh8iojFzQYluecwFFVQG2mR8OyaBJS6cn9EpPp BHuD1WshKmAPOWQGvDjtb02w9uyrDUZgzJQ5Xdoam8e3rnraNjTy44JfuYe06E37EDFd ve4xvPUb1yExCCtqVd0okBpZzFy03O9ysiT1nPabJgQ9JKc25Efi8QtRJIJErprg00Ux zM4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yMkiZsIrOH0ofDyoMDN592CwPH9cysWLVweCpUyiuRM=; b=X0+5UfRELmlyq81DTRgiq+SR8jvpmDO2vsldHYNskahmlQcOeD1DZvYprpArH3NYJc lBKQvelotyJ+NjjPyvM3FSHVryncGTwqDp2jHJU8nxnmp/gQGBDHW7tQh7ClA+7OSPRt ucKGGbHBceSTuD8ld7sv++mg6c3gxKDTs0Wszza/H4A3NYIEuQpUcppSq4dHvb+B3E9E 3ZhzKhhR3FFPA4/G4kwEJ7kTl0joaIG/GEyX2BB7TSmjQnP0rBOtoo0kPmKNCsDwu1wk uTrNlw/2C2nPDvk/tCMnangjdQLmgQz2b5snEzWpuJA42mXJUj5FcIP90bG1Am+AulzQ Shxw== X-Gm-Message-State: AGi0PubJtA5PUD7mwhRu+O+tOQf1oPTLVS/rAquEHqjr3j2gns6IAlPp VF05NyTeOPPZIED1GgxS7VdM2vuh X-Received: by 2002:a05:600c:4112:: with SMTP id j18mr13681981wmi.69.1587324179619; Sun, 19 Apr 2020 12:22:59 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q184sm4557211wma.25.2020.04.19.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 12:22:58 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 21:22:52 +0200 Message-Id: <20200419192252.14405-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/bsf: Use macro for packet is empty X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: 7S7uqM7dHgGM Content-Length: 2675 Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index b9fc771a88..68fee82e0d 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -28,6 +28,8 @@ #include "avcodec.h" #include "bsf.h" +#define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems) + struct AVBSFInternal { AVPacket *buffer_pkt; int eof; @@ -195,7 +197,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) AVBSFInternal *bsfi = ctx->internal; int ret; - if (!pkt || (!pkt->data && !pkt->side_data_elems)) { + if (!pkt || IS_EMPTY(pkt)) { bsfi->eof = 1; return 0; } @@ -205,8 +207,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) return AVERROR(EINVAL); } - if (bsfi->buffer_pkt->data || - bsfi->buffer_pkt->side_data_elems) + if (!IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); ret = av_packet_make_refcounted(pkt); @@ -230,8 +231,7 @@ int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt) if (bsfi->eof) return AVERROR_EOF; - if (!bsfi->buffer_pkt->data && - !bsfi->buffer_pkt->side_data_elems) + if (IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); tmp_pkt = av_packet_alloc(); @@ -251,8 +251,7 @@ int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt) if (bsfi->eof) return AVERROR_EOF; - if (!bsfi->buffer_pkt->data && - !bsfi->buffer_pkt->side_data_elems) + if (IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); av_packet_move_ref(pkt, bsfi->buffer_pkt);