From patchwork Tue Feb 9 14:24:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25523 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 0C54144A49F for ; Tue, 9 Feb 2021 16:25:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D54D5688188; Tue, 9 Feb 2021 16:25:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C88A688137 for ; Tue, 9 Feb 2021 16:25:23 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id p6so2717399qvm.12 for ; Tue, 09 Feb 2021 06:25:23 -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=hP7nb4XrZVCd4YQJBQzFwLoVdZlJSO3w0aLvSXvnyOQ=; b=m+4Xy9H9dpWtH14yUPAn5Z1/U4FgVmMOaHbHAY4XmGPx2M8QbUK31kYUIJIjEzqqfN ri/H7bBw/5q3TOjCZw2q/IDwmNctSp/0WjeeLLelrJ2fwoop1d/Q8g/Fk/Fn8qvsswF7 UvXOXywItFQqey3dzTCNSfBpCUDG/Un2SeBgL0UZiM94UIUdBIwURzvNNSQSdmNm3h+o Si3GxYkjrq67PKLdIychZGh96LY0Fc5rkRGL7jjwgyc5ugYCCisn3M38nIJ1W/FxPrJn B1Cb+onM2LmKKJZLVtQkC62iIpvHj7LDdD1UTGX9dkE03cOJoE3LmHnegnCYEeq9Z5Ku f/Tg== 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=hP7nb4XrZVCd4YQJBQzFwLoVdZlJSO3w0aLvSXvnyOQ=; b=rYOXsarY5TE5eGlV5O0SPnkuD9dQ29nWB4XTjrV7BlzAMijWrIyUyW5vcEV6ECPhOg Nx5wwIAISbkGf4KfQtBEZ589opEw7aiAqlzznL/2eR4nQX9WnSSXEfcUOYaLTHtNDM3e iOmte83AYyqF/KpKz/8v+FaQta7m841Fb6dURLAgMfdMYQqGdLmfHlTflfQg2W7Jkl9U qDJpzGVaT08jRclhoHcHGQ5sphsTQwo72YLCJLnwrlQk1MZ3PTC9MrhUHDWTYqF+yQxG qObqOnBjoXQqQ9888TNjpvNKB+lCeP112Dc1tj/9FAHbyTrAEmUMcVdzAIJVVM1NHamc kwSQ== X-Gm-Message-State: AOAM530nM4PnsrcQ+wJ6YQyHezi8jT3X11B4aRWI+twIjNr8IbHuqff4 PjSGLwLDUdTt3UDXHRE5DExJOASwlgY= X-Google-Smtp-Source: ABdhPJw8Hz/OV5JHx+qN2IQ4Ycdcci8MpdrdE68MmbqDT+caqe6jPBreYTohdxh6LL1aGFirRioiWQ== X-Received: by 2002:a05:6214:14e2:: with SMTP id k2mr20769367qvw.24.1612880721862; Tue, 09 Feb 2021 06:25:21 -0800 (PST) Received: from localhost.localdomain ([181.23.72.162]) by smtp.gmail.com with ESMTPSA id 199sm19771676qkm.126.2021.02.09.06.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 06:25:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Feb 2021 11:24:08 -0300 Message-Id: <20210209142408.311-1-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/50 v2] 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..aee168dd96 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -66,6 +66,7 @@ typedef struct AVIIndex { typedef struct AVIContext { const AVClass *class; + AVPacket *empty_packet; int64_t riff_start, movi_list, odml_list; int64_t frames_hdr_all; int riff_id; @@ -274,6 +275,10 @@ static int avi_write_header(AVFormatContext *s) return AVERROR(EINVAL); } + avi->empty_packet = av_packet_alloc(); + if (!avi->empty_packet) + return AVERROR(ENOMEM); + for (n = 0; n < s->nb_streams; n++) { s->streams[n]->priv_data = av_mallocz(sizeof(AVIStream)); if (!s->streams[n]->priv_data) @@ -739,24 +744,21 @@ static int avi_write_idx1(AVFormatContext *s) static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts) { + AVIContext *avi = s->priv_data; AVIStream *avist = s->streams[stream_index]->priv_data; AVCodecParameters *par = s->streams[stream_index]->codecpar; 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->empty_packet->stream_index = stream_index; + avi_write_packet_internal(s, avi->empty_packet); ff_dlog(s, "dup dts:%s packet_count:%d\n", av_ts2str(dts), avist->packet_count); } @@ -978,6 +980,10 @@ static int avi_write_trailer(AVFormatContext *s) static void avi_deinit(AVFormatContext *s) { + AVIContext *avi = s->priv_data; + + av_packet_free(&avi->empty_packet); + for (int i = 0; i < s->nb_streams; i++) { AVIStream *avist = s->streams[i]->priv_data; if (!avist)