From patchwork Thu Feb 4 19:09:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25406 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 5AAA8448077 for ; Thu, 4 Feb 2021 21:11:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 431D068A878; Thu, 4 Feb 2021 21:11:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29C2968A857 for ; Thu, 4 Feb 2021 21:11:07 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id k193so4436786qke.6 for ; Thu, 04 Feb 2021 11:11:06 -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=Xf57ueLbPT0kwtq6oHF447nePynFG/3nVdWO2mbbueE=; b=bM1+kog+8OjESVXPIlvtlLD94nj4yQeJmIun7zmOTPxcsVXXzQnCUBBNLQc5pjGq5J a3ZJl3UFKUJPdyFyqKNZY9bKV8Cm/ImobeNY8gsj9VBB8miIgDPKIYhNlqwAEM76H9RX 0yZ73+AYD+MYnHMO23ObdH0HOCxhBCdjtVVeLzJrRtltgoWjOWZJxbju4w8ogFWoh7Sg 1SCujC92dfvYU+aYMNXVxINeAsFXlA2J6/fNFJGtI4DLdqyBF+QbLqNf2kUU3Y+byJGz 0YhCRvplcEIcj2CfeGQHmf4kc8zWKumlB2euIVIIXWpMoUYs3H3yPuL0MPFglwNIXGDY 6K+A== 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=Xf57ueLbPT0kwtq6oHF447nePynFG/3nVdWO2mbbueE=; b=rMVUj1NZrTGFol4rbS5u17dh/sM05BEkyWWqZKFL1dbdcz1YB+7CDQPzU/z62/6J94 xICYyhz2x8xOaJcScXfyQPAes8iyCStCOMog+9rJZur36vfx4DhR8p4OFHF6lhhgS06J iVF5vWB0FYzrHyB62YOAAIO6Y1KRyx9VWOChj7gwGm3q2PhKyCGx27dfCdCvzrjnBIfy 7DC8Vm0xOck/5VbjYaT6mo4uyqkUYAoS3bFs/QQSIJ1Pdo5bEfwekzOSDuEbyHyUnYDA dR9F/5PchErez3qX5+OaFZ5RV04szpQ7xZQRdv3oVejFPRyluN3SH5a0RPMfuJ6uphDB bmWQ== X-Gm-Message-State: AOAM533cMJUCK/gJTz2w0OrZ7LHocX0NXE990iNR/L0IsBqVIrZFYAzY E4vXBxoGE7yGz+zn4kT35Gvg7gZ1Y8o= X-Google-Smtp-Source: ABdhPJwEXvVM8jh6yJuwVLN1Bz/jaQv4VprhPqK4bQNHFIjlx2QxxMJ1fLEGk8psqboHcWhgukFV+A== X-Received: by 2002:a05:620a:24c:: with SMTP id q12mr613251qkn.203.1612465865490; Thu, 04 Feb 2021 11:11:05 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:36 -0300 Message-Id: <20210204191005.48190-22-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 21/50] avformat/matroskadec: 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/matroskadec.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 374831baa3..9fad78c78b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -365,6 +365,8 @@ typedef struct MatroskaDemuxContext { /* byte position of the segment inside the stream */ int64_t segment_start; + AVPacket *pkt; + /* the packet queue */ AVPacketList *queue; AVPacketList *queue_end; @@ -2885,6 +2887,10 @@ static int matroska_read_header(AVFormatContext *s) } ebml_free(ebml_syntax, &ebml); + matroska->pkt = av_packet_alloc(); + if (!matroska->pkt) + goto fail; + /* The next thing is a segment. */ pos = avio_tell(matroska->ctx->pb); res = ebml_parse(matroska, matroska_segments, matroska); @@ -2947,7 +2953,7 @@ static int matroska_read_header(AVFormatContext *s) st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - av_init_packet(pkt); + av_packet_unref(pkt); pkt->buf = attachments[j].bin.buf; attachments[j].bin.buf = NULL; pkt->data = attachments[j].bin.data; @@ -3180,7 +3186,7 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, while (track->audio.pkt_cnt) { int ret; - AVPacket pktl, *pkt = &pktl; + AVPacket *pkt = matroska->pkt; ret = av_new_packet(pkt, a); if (ret < 0) { @@ -3317,7 +3323,7 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, uint64_t duration, int64_t pos) { - AVPacket pktl, *pkt = &pktl; + AVPacket *pkt = matroska->pkt; uint8_t *id, *settings, *text, *buf; int id_len, settings_len, text_len; uint8_t *p, *q; @@ -3434,7 +3440,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, { uint8_t *pkt_data = data; int res = 0; - AVPacket pktl, *pkt = &pktl; + AVPacket *pkt = matroska->pkt; if (st->codecpar->codec_id == AV_CODEC_ID_WAVPACK) { res = matroska_parse_wavpack(track, &pkt_data, &pkt_size); @@ -3464,7 +3470,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, if (!pkt_size && !additional_size) goto no_output; - av_init_packet(pkt); + av_packet_unref(pkt); if (!buf) pkt->buf = av_buffer_create(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE, NULL, NULL, 0); @@ -3838,6 +3844,7 @@ static int matroska_read_close(AVFormatContext *s) int n; matroska_clear_queue(matroska); + av_packet_free(&matroska->pkt); for (n = 0; n < matroska->tracks.nb_elem; n++) if (tracks[n].type == MATROSKA_TRACK_TYPE_AUDIO)