From patchwork Thu Feb 4 19:09:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25399 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 B2225448077 for ; Thu, 4 Feb 2021 21:10:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 987B568A477; Thu, 4 Feb 2021 21:10:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED9EA68A3A0 for ; Thu, 4 Feb 2021 21:10:53 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id n15so4431688qkh.8 for ; Thu, 04 Feb 2021 11:10:53 -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=Rv5NcxaruHxh6/pjT0zUgWfyd2v1ov9Q1D2DDbPg86M=; b=AqcfKhjYqGbd5inVFteWCUmWEToGPslu0rO+CtEVcYE/8LsVT3GIDZ0CECHA0cuKqK yX0Kfb1FjDxDlC9WsaGdPKUkEZqUH7iBFM78bZB9WRpUKzrTfEALbgusmMfpAt397NKY dj7nLcdAyD7no5XeLQDFO7Q7/baNtt2HKU/B7Cw8rEw1v8iy6JiG2LL9SWOjP6M3HRT+ 2wuYbe4/ucJ8glqDx9v6tNRzSJ05Q/CNseE0S0y08BBj5FiUmqB2KBzgc/EQf49txy87 dC5GQ93anIPv1dsyQGHXbqd/+9Yuc1kN/fw2a+7PM+fOq7EgyT2Ntv8rfL3SL6og9EcB vqwA== 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=Rv5NcxaruHxh6/pjT0zUgWfyd2v1ov9Q1D2DDbPg86M=; b=HlYWV2T8D00458mUX30R68uf6tMc/kl0AJQkP9RcWDYi4Noa2ncOJaQ6tMqQiCLSvT 6JAZBCxW/hNIS2ZT/r9kJ6SeR91+BB3BvszoYtkZrevG0izhLRWNYx0OBva4CdORO0mf PBHuNVsaytL/iMVmvd6do9D4MXZZtc+ZnSbqpo4vFvFLviBT43Qk6j3xCBa0J9+xs96O KZqjKLA+u4cts6UrUs2TIWgW0994euIzrNjOByqtrEorgJQW/VdWL6Z/Qh0mxe0YZ0OB Tgq6cyw5h8jt+YbU3d9clLf2S+QoAl5bWciA+PKdmGABEupOwEzRtelZl87CquEA2JtG NlJQ== X-Gm-Message-State: AOAM531I48vagZSEoZ2SKU/+t54se5X/v14xmSWrEMnASSge/LjA0sQ6 rXB/7SHoTLbDH01sR6XYAb5wItja8v8= X-Google-Smtp-Source: ABdhPJw/eUPhsLlSqL++gDKhAwol00nPq7URihZC9mdJipyHDW9G9pHB1OdBD4XKIDje7ojjUHiVAg== X-Received: by 2002:a37:78c4:: with SMTP id t187mr626056qkc.139.1612465852230; Thu, 04 Feb 2021 11:10:52 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:27 -0300 Message-Id: <20210204191005.48190-13-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 12/50] avformat/amvenc: 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/amvenc.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/libavformat/amvenc.c b/libavformat/amvenc.c index 4d4ec7a2b1..5d13b618f4 100644 --- a/libavformat/amvenc.c +++ b/libavformat/amvenc.c @@ -62,8 +62,8 @@ typedef struct AMVContext int32_t aframe_size; /* Expected audio frame size. */ int32_t ablock_align; /* Expected audio block align. */ - AVPacket apad; /* Dummy audio packet for padding. */ - AVPacket vpad; /* Most recent video frame, for padding. */ + AVPacket *apad; /* Dummy audio packet for padding. */ + AVPacket *vpad; /* Most recent video frame, for padding. */ /* * Cumulative PTS values for each stream, used for the final @@ -183,16 +183,25 @@ static av_cold int amv_init(AVFormatContext *s) } /* Allocate and fill dummy packet so we can pad the audio. */ - if ((ret = av_new_packet(&amv->apad, amv->ablock_align)) < 0) + amv->apad = av_packet_alloc(); + if (!amv->apad) + return AVERROR(ENOMEM); + if ((ret = av_new_packet(amv->apad, amv->ablock_align)) < 0) { + av_packet_free(&amv->apad); return ret; + } - amv->apad.stream_index = AMV_STREAM_AUDIO; - memset(amv->apad.data, 0, amv->ablock_align); - AV_WL32(amv->apad.data + 4, amv->aframe_size); + amv->apad->stream_index = AMV_STREAM_AUDIO; + memset(amv->apad->data, 0, amv->ablock_align); + AV_WL32(amv->apad->data + 4, amv->aframe_size); - av_init_packet(&amv->vpad); - amv->vpad.stream_index = AMV_STREAM_VIDEO; - amv->vpad.duration = 1; + amv->vpad = av_packet_alloc(); + if (!amv->vpad) { + av_packet_free(&amv->apad); + return AVERROR(ENOMEM); + } + amv->vpad->stream_index = AMV_STREAM_VIDEO; + amv->vpad->duration = 1; return 0; } @@ -200,8 +209,8 @@ static void amv_deinit(AVFormatContext *s) { AMVContext *amv = s->priv_data; - av_packet_unref(&amv->apad); - av_packet_unref(&amv->vpad); + av_packet_free(&amv->apad); + av_packet_free(&amv->vpad); } static void amv_write_vlist(AVFormatContext *s, AVCodecParameters *par) @@ -325,9 +334,9 @@ static int amv_pad(AVFormatContext *s, AVPacket *pkt) stream_index = (stream_index + 1) % s->nb_streams; if (stream_index == AMV_STREAM_VIDEO) - return amv_write_packet_internal(s, &amv->vpad); + return amv_write_packet_internal(s, amv->vpad); else if (stream_index == AMV_STREAM_AUDIO) - return amv_write_packet_internal(s, &amv->apad); + return amv_write_packet_internal(s, amv->apad); else av_assert0(0); @@ -348,8 +357,8 @@ static int amv_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index == AMV_STREAM_VIDEO) { /* Save the last packet for padding. */ - av_packet_unref(&amv->vpad); - if ((ret = av_packet_ref(&amv->vpad, pkt)) < 0) + av_packet_unref(amv->vpad); + if ((ret = av_packet_ref(amv->vpad, pkt)) < 0) return ret; } @@ -366,7 +375,7 @@ static int amv_write_trailer(AVFormatContext *s) /* Pad-out one last audio frame if needed. */ if (amv->last_stream == AMV_STREAM_VIDEO) { - if ((ret = amv_write_packet_internal(s, &amv->apad)) < 0) + if ((ret = amv_write_packet_internal(s, amv->apad)) < 0) return ret; }