From patchwork Thu Feb 4 19:09:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25402 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 934D0448077 for ; Thu, 4 Feb 2021 21:11:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C75468A5CC; Thu, 4 Feb 2021 21:11:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BF7C68A558 for ; Thu, 4 Feb 2021 21:10:58 +0200 (EET) Received: by mail-qk1-f170.google.com with SMTP id a12so4419160qkh.10 for ; Thu, 04 Feb 2021 11:10:57 -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=1m0oLs0eGGPjgYae43TRc0rWDufcTHKFKackRRIKUZM=; b=MwYys19Auioy9e6RtBglVDZgTk88Eh7GqhY+kJQ2+2dl8c5fIXhAKVpfVIHtMb59dd yI1rGJ2vN5UxbuDpS9KD5WCtOvNPklXqP6AWijJyS0Uv7mRT4aPLYUAbdd8szsAdzrIg gwJsBKASnRgsx5JzX5o1pGw40m6RrAi2larmcopYKLqAYjiWhmPjzQnyLT00ULYawx/4 DJI2V/ASDVFQm24e6Zg9cDbmoPL1lJ2GEU2DxhI4ycqILwg5za6tp7/RuezUB9v67V/N F88HxnfxRJt38TjurNYJkqDHdQp9HWDHbSfUby1sAxOBLePzHhhshbKvAfDWHAU1PW9K NhRg== 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=1m0oLs0eGGPjgYae43TRc0rWDufcTHKFKackRRIKUZM=; b=DhAxNDb5/aPU+E305KnBIXANItW9yDpFb4TnLML/Fu90+tz0ELTYWYXi6tfWsM4NGK fRBjUQKUnn0Uc2Pcr/qt18jIxLHr/ymhxa9YFyun3jzIaE1O3CRua/UZIT6TV/S2VJcO fpCsSg9fVs2MJlgfnTj0iArbRZigRkL3aS+g8VeyJATXjW/J3BUYEIYkAut3E6d3tA14 5MscIo0cfCuKS8rqXW3Cd4m6bJdjEBre8qfvxYV2OuGf6BSgtLrJfChEM2XPOFubmLSH BfEhuIReX8wVLa8g8fH1+BOEEp8eXzeiUgX/LHm2SZKBrF+bU0mPlwVSuWuhw4X/4cn6 EHVA== X-Gm-Message-State: AOAM532c5Rhonqfs7VcxsXEpFxvGhLg893jEetlq+fgsIeaVPM59RzoZ jg2BpGd1sEEDIyLKkDhzMcwdwMjD3B0= X-Google-Smtp-Source: ABdhPJyto8DX+ZKlryvE68MCndVkB0PYf1ZFy6IcyFqUqemCJXKuouPY12LOQ4mFQaHAQecoe14dSw== X-Received: by 2002:a37:63d4:: with SMTP id x203mr637951qkb.105.1612465856621; Thu, 04 Feb 2021 11:10:56 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:30 -0300 Message-Id: <20210204191005.48190-16-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 15/50] avformat/avienc: 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/avienc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 1b2cb529b9..58bd081fcb 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -85,6 +85,8 @@ typedef struct AVIStream { int64_t last_dts; + AVPacket *empty_packet; + AVIIndex indexes; int64_t strh_flags_offset; @@ -275,9 +277,17 @@ static int avi_write_header(AVFormatContext *s) } for (n = 0; n < s->nb_streams; n++) { + AVIStream *avist; + s->streams[n]->priv_data = av_mallocz(sizeof(AVIStream)); if (!s->streams[n]->priv_data) return AVERROR(ENOMEM); + + avist = s->streams[n]->priv_data; + avist->empty_packet = av_packet_alloc(); + if (!avist->empty_packet) + return AVERROR(ENOMEM); + avist->empty_packet->stream_index = n; } /* header list */ @@ -745,18 +755,13 @@ static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts) ff_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(dts), avist->packet_count, stream_index); while (par->block_align == 0 && dts != AV_NOPTS_VALUE && dts > avist->packet_count && par->codec_id != AV_CODEC_ID_XSUB && avist->packet_count) { - AVPacket empty_packet; if (dts - avist->packet_count > 60000) { av_log(s, AV_LOG_ERROR, "Too large number of skipped frames %"PRId64" > 60000\n", dts - avist->packet_count); return AVERROR(EINVAL); } - av_init_packet(&empty_packet); - empty_packet.size = 0; - empty_packet.data = NULL; - empty_packet.stream_index = stream_index; - avi_write_packet_internal(s, &empty_packet); + avi_write_packet_internal(s, avist->empty_packet); ff_dlog(s, "dup dts:%s packet_count:%d\n", av_ts2str(dts), avist->packet_count); } @@ -985,6 +990,7 @@ static void avi_deinit(AVFormatContext *s) for (int j = 0; j < avist->indexes.ents_allocated / AVI_INDEX_CLUSTER_SIZE; j++) av_freep(&avist->indexes.cluster[j]); av_freep(&avist->indexes.cluster); + av_packet_free(&avist->empty_packet); avist->indexes.ents_allocated = avist->indexes.entry = 0; } }