From patchwork Fri Mar 5 16:33:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26149 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 7B69744AB0A for ; Fri, 5 Mar 2021 18:41:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D12268ACE3; Fri, 5 Mar 2021 18:36:10 +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 8EC3E68AC53 for ; Fri, 5 Mar 2021 18:36:06 +0200 (EET) Received: by mail-qk1-f182.google.com with SMTP id 130so2512748qkh.11 for ; Fri, 05 Mar 2021 08:36:06 -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=axp7pGQAVpTZGgynpXC5JJd1pLE1RACyv3abDFljkyQ=; b=ofZc/xmY+upCObsm5CVquv0l3aXxMF8D9XVISZ9y/jJyjdckwMHn5LsIVIryeH3QKV aeP+anbDBB1miNMOVbfOh9eVvR2BiVYGObr3VaYZtzFM3lO9ClQBTdsTfUdK2RkIe+Bi 5F78gxpHYxbo2ORkr1l/JJbj4CUvIM+Xdlj4YvKHwwNbAeJsU2eD4xcixlGjSFQyXzqY 4m2NvyBZrI+CWS+zoLW5SahMeiHSpNrXvn5Xj1fPUZ8sL56Uz5QC874+WivqTzY7KGgq d7tHtJulKSWvoWcYS11ABcS0yvtPtH2itC6RTj06TtPZQvmjuo3XISrZEoqvw3lSNOXr NZmg== 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=axp7pGQAVpTZGgynpXC5JJd1pLE1RACyv3abDFljkyQ=; b=fi2QAcg6HZms6qnB1g4nirNGKGMpWsD12NmXQWKlzSYyYtSMxqt39HCo2Yg26WsrX0 0FplafPA/cHoCNzVzsaqySn+1zWue2CY1CA4hhRtWeASuneEhLDtQ/5AR7JPYTA0cUFN D9VdYgpd8mRVxtPwXSo3b+ekWz4oRyAofbXl7GUh6ZmG+rmwIuWeGctM6nTMTbOwwdmG ZqRpm0uOZTXC5T2Q9HhFyqJNdoiG4zjib5aqK0B+yFeAj2yqAnY3+if8/ryWMWKxB8IN aGYuMPbhVky6DWY6KaL0tCzx4JzPNYsciJvdc44CUbMWa3owXQNkIeLXfjfDELk+HQT3 2Gug== X-Gm-Message-State: AOAM531rfo9oret6QlHbcyLYx9VgvAs/1gBkFsMppL75vdpc19GuTpts hFjNfeUl1OpX41Jpw7dF3HffInMF8bx3cA== X-Google-Smtp-Source: ABdhPJzq3gxX4nqk96Gfoymq72RQ3pipQpdtDauka4pxDa/wXMTQ6zUPWwSMulaeRKtU/SWH4A0ErQ== X-Received: by 2002:a37:4986:: with SMTP id w128mr9533241qka.313.1614962165054; Fri, 05 Mar 2021 08:36:05 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:22 -0300 Message-Id: <20210305163339.63164-32-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/48] 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) {