From patchwork Thu Feb 4 19:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25421 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 9493F4482EE for ; Thu, 4 Feb 2021 21:13:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14A5368A8E2; Thu, 4 Feb 2021 21:11:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 804D268A82A for ; Thu, 4 Feb 2021 21:11:08 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id u20so2251011qvx.7 for ; Thu, 04 Feb 2021 11:11:08 -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=9XS139Fjcw+7jb5e9J/n9hPNwbkduXin3TnhOFjfBpk=; b=d/iEGTWOsKeNIsbRD8y5lE9SfoCsJNwp0HBTFG/EwF8I5hGl4IqOo0TWXscT0Gj356 OU2nPeRYsXQM05iuMEVXCCP9W20jlCLUKZDwezntkHsqS1Uh5FM9HcC1Jpwem9vBnkuN syFBU325J1AZ6MvwRLO9zFeKnrQ4ig75Ioqj+SrShc7Y4BV4oi1btA7v8mLN+gAqq2vI Wgb6rlDVJz85/fy0fjMlRJ4UoaLeWhpJFcVqt93WOztMs1FHKKxXS8TFwsOyKtmNZE69 EN3Z+kSjdPU2xeRJPrObVY9DtizWoBUgUcgQE6nxTp+7VLIK/JBUsDn3JwZyeV+HyYp3 MMow== 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=9XS139Fjcw+7jb5e9J/n9hPNwbkduXin3TnhOFjfBpk=; b=FLmVkHbmila41y/O6VgV24XhY4qxsh/hfK8e5xR85r8GT1RCAiyI+5LwUyeCnjGDLi NqhBVSxsNR3uITBvtdP1Fxdazd37nmuHSLnsfN0ZdUqLCdmhyC7CItILLYj2ApVwtBS5 YMT6PmwN80RGj5EDxgbXXppSAGBi8Upac/T711qiPGI5hpO1J7Jwpw1h0/jPwbN29tEA 2XA9gmE1oxeVN14ukyUNauMpc2jePM+k9mmZT8syKbPlxGdSh5SlqpO85WaHk/JsxCRV 9V23MeDafXQ9+5d6yEouXLc/iUdKLO8YlBXz1id/3A+8tTlGOn59N+kw6PXM7uWbp2gh WlJw== X-Gm-Message-State: AOAM533YLUanoIJ8d+JL/LKhWmtmSXb98RjJU+RKEEqSbWKvk6tJnJ9y AGCrxDoqlrt5E8TW4jJYOUe7PFWqdi4= X-Google-Smtp-Source: ABdhPJwvGlMTZ3M2/VEeAr+FcJRp9HKZeNDLrhZdRnPfp48jNyf/QXb9GhQ7qwlA5ij4vjDr5Smlfw== X-Received: by 2002:a05:6214:c8a:: with SMTP id r10mr706217qvr.13.1612465866902; Thu, 04 Feb 2021 11:11:06 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:37 -0300 Message-Id: <20210204191005.48190-23-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 22/50] avformat/matroskaenc: 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/matroskaenc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 233c472b8f..012442f7f2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -137,7 +137,7 @@ typedef struct MatroskaMuxContext { mkv_cues cues; int64_t cues_pos; - AVPacket cur_audio_pkt; + AVPacket *cur_audio_pkt; unsigned nb_attachments; int have_video; @@ -451,7 +451,7 @@ static void mkv_deinit(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - av_packet_unref(&mkv->cur_audio_pkt); + av_packet_free(&mkv->cur_audio_pkt); ffio_free_dyn_buf(&mkv->cluster_bc); ffio_free_dyn_buf(&mkv->info.bc); @@ -1919,8 +1919,6 @@ static int mkv_write_header(AVFormatContext *s) mkv->reserve_cues_space = -1; } - av_init_packet(&mkv->cur_audio_pkt); - mkv->cur_audio_pkt.size = 0; mkv->cluster_pos = -1; // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or @@ -2414,9 +2412,9 @@ static int mkv_write_packet(AVFormatContext *s, const AVPacket *pkt) keyframe && (mkv->have_video ? codec_type == AVMEDIA_TYPE_VIDEO : 1) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT); // check if we have an audio packet cached - if (mkv->cur_audio_pkt.size > 0) { - ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); - av_packet_unref(&mkv->cur_audio_pkt); + if (mkv->cur_audio_pkt->size > 0) { + ret = mkv_write_packet_internal(s, mkv->cur_audio_pkt); + av_packet_unref(mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); @@ -2428,7 +2426,7 @@ static int mkv_write_packet(AVFormatContext *s, const AVPacket *pkt) // keyframe's timecode is contained in the same cluster for WebM if (codec_type == AVMEDIA_TYPE_AUDIO) { if (pkt->size > 0) - ret = av_packet_ref(&mkv->cur_audio_pkt, pkt); + ret = av_packet_ref(mkv->cur_audio_pkt, pkt); } else ret = mkv_write_packet_internal(s, pkt); return ret; @@ -2460,8 +2458,8 @@ static int mkv_write_trailer(AVFormatContext *s) int ret, ret2 = 0; // check if we have an audio packet cached - if (mkv->cur_audio_pkt.size > 0) { - ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); + if (mkv->cur_audio_pkt->size > 0) { + ret = mkv_write_packet_internal(s, mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); @@ -2685,6 +2683,9 @@ static int mkv_init(struct AVFormatContext *s) } else mkv->mode = MODE_MATROSKAv2; + mkv->cur_audio_pkt = av_packet_alloc(); + if (!mkv->cur_audio_pkt) + return AVERROR(ENOMEM); mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); if (!mkv->tracks) return AVERROR(ENOMEM);