From patchwork Fri Mar 5 16:33: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: 26138 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 6D2A144BAEC for ; Fri, 5 Mar 2021 18:38:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBD7268AC21; Fri, 5 Mar 2021 18:35:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EE2B68AB99 for ; Fri, 5 Mar 2021 18:35:49 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id 18so2182532qty.3 for ; Fri, 05 Mar 2021 08:35:49 -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=ZfY4P8XzchbQTr36MU3lGLT7xvKlAVteopRvXa+PgLo=; b=F177qv60dI4r/USQNiad3q/4XcFeZQkiKtweQapOQgv95GNwmZqdcvB+gWG2Q/UimV T2sXe1pf4XZpB2BpX/g/ZLnnGelh99gw8fuJbTnVbIJdi6BN2vZitnB/Kf3dOWcMl2Wv KFC5Nw5f5bWzT863BgRPX5MWiUTBSqe1JXa0rL0K6WVDE5Hp5OnFxD1K+4sETBTcY4/z bQFL/pmpV7MbHbjNEwxySgwvEpwY6V67ITNMRJlgOn0t/B352soRiL3VOhw2cH8nOJvV 5MWS0vJAG9G9dh7gQWbRHRg4CKqXQhphuD2OwsbpUcfLRE0DJBoTLcaJqrrOZ4b3PxmS 894w== 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=ZfY4P8XzchbQTr36MU3lGLT7xvKlAVteopRvXa+PgLo=; b=YIUgfN/oFJ4Tp5T9/9nk6U9EZ3IKrQe6d7ZaYKSDOadE26obk7vPkuvjYCXFOUDYIo uvpNZRvk4ODFsDGfMl9ldgPqQPvQsK7mfBwAVkbd2OvowjHG0Futo5S+6gow82ddS4pU jNmbGSZAkQjjo93zgDaA8XQsW6QuoFZ8qEYx9uzd11FWsanzQ1YjUTfs+m3KgUI5iCY0 yEIUu2gVD/8MeyyX6qRigmImR4dmdOl/7lFhvCMOGF+yspyyUqoOm4MjYHLOaVtNRTdG 8oPCeYJoTlK9MfNIQ7+Yu2Cle1xFgph3WqBWSEisiwbGTgvpP5CEOQa84P3dRs3wBXZ4 ycgw== X-Gm-Message-State: AOAM530BKeZHM4VV80W/vAKy7IcD5FcOHoN8oqYljsH769yJfigqrQdP 7r5x9h1b0VGMHPKdbXnIINsknD+LUHKArQ== X-Google-Smtp-Source: ABdhPJyUOt59xh+t4/nsKhM4ypyse+fLZULkqctttU7nPiG8oHAvgZR5yAEfEH1sVCbl15Kj/V0bxw== X-Received: by 2002:a05:622a:552:: with SMTP id m18mr9795308qtx.207.1614962147646; Fri, 05 Mar 2021 08:35:47 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:08 -0300 Message-Id: <20210305163339.63164-18-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 17/48] 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 9cbf3d3349..ac11dd9cb2 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)