From patchwork Thu Feb 4 19:09:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25432 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A8A5244A6BE for ; Thu, 4 Feb 2021 21:16:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A666468AA6E; Thu, 4 Feb 2021 21:11:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F9CB68AA1F for ; Thu, 4 Feb 2021 21:11:45 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id r20so3245227qtm.3 for ; Thu, 04 Feb 2021 11:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oN/8KkJSVaEnBIjkZzy0AgHOBNUN/KrlBqvMtygYqUA=; b=NgFkSDP1/r2PArD2XnE171dfn7JHAlzgzDat0ejeXjm3UOsMohosewZaK3OyUpBKDa amNYp32AVJJ+Cv4IpwfKDPvucRuCKZVpd1Wbj1JE/zeObVxwa16iiFnnJcBUPZs89Go+ YAn5hBlpXDbJBLo/DcHmCcWMZxRcMfPChJEImxSneI1nSO3MG0UNY6dTduho1B6VcmzT cfsMEao6rCfcvz4kYSlto7SeZTxkYOFBexKJSR5x062uHBV/cUAfok5oyElDUWIfkr+i 2DDrVHXTrM5OWYEA5oUHBl3ZvW5E40sG24k49LrikVPDDYhZ1rG100hfy5RAUE8GG9/W oPRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oN/8KkJSVaEnBIjkZzy0AgHOBNUN/KrlBqvMtygYqUA=; b=DmxXnfn/R5ARbvARtJ6A1sbuenrSPLyf1d4i8ydAz5Cj1ZU9Dq7kwadwfhswCEnnqw Z206Nrd+k5LAwlcWeRp3TXLwlXhhqlesLYTv5kJcetze1GGnzZsWWmlHC5fCJuSk39Wb /An+9tyqVyuWYjL7ur7Ij9N6GR5xIbDxEebnt9Ae0DoWP28OmT9mf2hQrMXiWVIwDZfk BYMq8G3AjBF8Unlhu2ZP/Apj2j43BUxKEcHizXtgV7n8XdrISIIEjtkiRQ6HVs9jT9PI 5wJl8tDFTYqaCADSqHTS67VoTXXKH+VCPexaI4pSD1xG7mFpEzEujUjwVJZ8iGVUE4OW tN2A== X-Gm-Message-State: AOAM531IiYLCaFkCGN3569NWNFfpySGVrU7O8tIDk2ms6Hfo5kpk1irs 6IadkJEEeVfbezgMo6o7rNfn4RY7zio= X-Google-Smtp-Source: ABdhPJwgzx0kDOq4U8JjgS/fsrvapr/Q//JJSNHAIOu0pQwN/T36WkRdkELAG/3N5SLmp8GWZ6M4sg== X-Received: by 2002:aed:3943:: with SMTP id l61mr1021431qte.392.1612465904374; Thu, 04 Feb 2021 11:11:44 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:53 -0300 Message-Id: <20210204191005.48190-39-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 38/50] tools/pktdumper: use av_packet_alloc() to allocate packets 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- tools/pktdumper.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pktdumper.c b/tools/pktdumper.c index 16a965b756..c51f5c8922 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -54,7 +54,7 @@ int main(int argc, char **argv) char fntemplate[FILENAME_BUF_SIZE]; char pktfilename[FILENAME_BUF_SIZE]; AVFormatContext *fctx = NULL; - AVPacket pkt; + AVPacket *pkt; int64_t pktnum = 0; int64_t maxpkts = 0; int donotquit = 0; @@ -101,30 +101,35 @@ int main(int argc, char **argv) return 1; } - av_init_packet(&pkt); + pkt = av_packet_alloc(); + if (!pkt) { + fprintf(stderr, "av_packet_alloc: error %d\n", AVERROR(ENOMEM)); + return 1; + } - while ((err = av_read_frame(fctx, &pkt)) >= 0) { + while ((err = av_read_frame(fctx, pkt)) >= 0) { int fd; snprintf(pktfilename, sizeof(pktfilename), fntemplate, pktnum, - pkt.stream_index, pkt.pts, pkt.size, - (pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); - printf(PKTFILESUFF "\n", pktnum, pkt.stream_index, pkt.pts, pkt.size, - (pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); + pkt->stream_index, pkt->pts, pkt->size, + (pkt->flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); + printf(PKTFILESUFF "\n", pktnum, pkt->stream_index, pkt->pts, pkt->size, + (pkt->flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); if (!nowrite) { fd = open(pktfilename, O_WRONLY | O_CREAT, 0644); - err = write(fd, pkt.data, pkt.size); + err = write(fd, pkt->data, pkt->size); if (err < 0) { fprintf(stderr, "write: error %d\n", err); return 1; } close(fd); } - av_packet_unref(&pkt); + av_packet_unref(pkt); pktnum++; if (maxpkts && (pktnum >= maxpkts)) break; } + av_packet_free(&pkt); avformat_close_input(&fctx); while (donotquit)