From patchwork Thu Feb 4 19:09:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25427 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 972E944A4AF for ; Thu, 4 Feb 2021 21:15:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 326B368AA13; Thu, 4 Feb 2021 21:11:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFF0768A9ED for ; Thu, 4 Feb 2021 21:11:36 +0200 (EET) Received: by mail-qk1-f182.google.com with SMTP id a7so4396713qkb.13 for ; Thu, 04 Feb 2021 11:11:36 -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=OnFqkyVh2sf1/Ru9/WSbV9WS/ezJVF1oPPfoI7TrkRA=; b=ELRaoDtLbX0jVrem30yNOXiZkj4qLOySUpTqfAjJaDX200Fkz//wWdXuzXrhRrGnIV Xu/HPPKnP3VQhNA5gLQztLYCmZaUx97W9mEFn0VjIYD/Kk7LLgvErlmSf2FSNL57sp5S aD1dHHZEI3DEzXhPh/hjcIDnTu0Hg5maeelfZT0etweqiATNW/D2k/ctPpkNJNgyzRYH gFDPcoJLB/kL24+qgnq6wc+5PkrpSoaRyt95t5MEX7y26rrlIWKCaYfPu70/hl+qhkGA Q/a3ZIgvymbBBb286nUy7NkUzy50BBnx9s77Vl5Ikw7Z7yeByWpAkUrtmTUR7/yjmgMZ autA== 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=OnFqkyVh2sf1/Ru9/WSbV9WS/ezJVF1oPPfoI7TrkRA=; b=UqfcppM/e+llQSFmSp4RcuijPSrsFef4cayzcKQ5uceJeGnNBKkfmzsBHi7o5jYGZg lJweIL/m0Gx00vMzeu/ZKNG1f5UjhRksoHzhOQIWvS/towKJq4stj6jwdqJp58bqW7pD HUlSPeFxlq56hNF/Dq13BL6L8qmH8QbsZ5zvqgND0m0nu4nI4Dm+u/SE5vrAq22faODo gkWDPIwKvtXqJ8QDGqzA7OBd+dvYO7IeK/Q4CpGlBs5YRZ+c0Uo1s61uHWJgvI/tBDU6 sT8IF/3Ag5SebyMR1xh+YtR1JFOKamYIVR3pau8zvnFg7Tq4QtIy6qGXV1t6jqVUarRq KLsw== X-Gm-Message-State: AOAM533eooxzByPrBAclYS+vQHhFxiiue1c71I1heoZdkZaf/N+3R0W8 Dk6YWkc2qXB7W9WnczhlAruXjdr6+i4= X-Google-Smtp-Source: ABdhPJyUbtswoem1OMxeMNowazn8x4h40um6+iPH9WtZ+L3+NCFK1DHKPwRGoU3VV2Spj/dKY5MsDw== X-Received: by 2002:a37:9b42:: with SMTP id d63mr657970qke.216.1612465895546; Thu, 04 Feb 2021 11:11:35 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:47 -0300 Message-Id: <20210204191005.48190-33-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 32/50] avformat/tests/fifo_muxer: 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 --- libavformat/tests/fifo_muxer.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index 5127a8aadb..3458c3eefd 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -81,9 +81,11 @@ static int fifo_basic_test(AVFormatContext *oc, AVDictionary **opts, const FailingMuxerPacketData *pkt_data) { int ret = 0, i; - AVPacket pkt; + AVPacket *pkt; - av_init_packet(&pkt); + pkt = av_packet_alloc(); + if (!pkt) + return AVERROR(ENOMEM); ret = avformat_write_header(oc, opts); @@ -94,20 +96,22 @@ static int fifo_basic_test(AVFormatContext *oc, AVDictionary **opts, } for (i = 0; i < 15; i++ ) { - ret = prepare_packet(&pkt, pkt_data, i); + ret = prepare_packet(pkt, pkt_data, i); if (ret < 0) { fprintf(stderr, "Failed to prepare test packet: %s\n", av_err2str(ret)); goto write_trailer_and_fail; } - ret = av_write_frame(oc, &pkt); - av_packet_unref(&pkt); + ret = av_write_frame(oc, pkt); + av_packet_unref(pkt); if (ret < 0) { fprintf(stderr, "Unexpected write_frame error: %s\n", av_err2str(ret)); + av_packet_free(&pkt); goto write_trailer_and_fail; } } + av_packet_free(&pkt); ret = av_write_frame(oc, NULL); if (ret < 0) { @@ -135,9 +139,11 @@ static int fifo_overflow_drop_test(AVFormatContext *oc, AVDictionary **opts, { int ret = 0, i; int64_t write_pkt_start, write_pkt_end, duration; - AVPacket pkt; + AVPacket *pkt; - av_init_packet(&pkt); + pkt = av_packet_alloc(); + if (!pkt) + return AVERROR(ENOMEM); ret = avformat_write_header(oc, opts); if (ret) { @@ -148,18 +154,20 @@ static int fifo_overflow_drop_test(AVFormatContext *oc, AVDictionary **opts, write_pkt_start = av_gettime_relative(); for (i = 0; i < 6; i++ ) { - ret = prepare_packet(&pkt, data, i); + ret = prepare_packet(pkt, data, i); if (ret < 0) { fprintf(stderr, "Failed to prepare test packet: %s\n", av_err2str(ret)); goto fail; } - ret = av_write_frame(oc, &pkt); - av_packet_unref(&pkt); + ret = av_write_frame(oc, pkt); + av_packet_unref(pkt); if (ret < 0) { break; } } + av_packet_free(&pkt); + write_pkt_end = av_gettime_relative(); duration = write_pkt_end - write_pkt_start; if (duration > (SLEEPTIME_50_MS*6)/2) {