From patchwork Fri Mar 5 16:33:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26144 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 E1FCF44BC27 for ; Fri, 5 Mar 2021 18:39:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6696068AC45; Fri, 5 Mar 2021 18:36:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3817A68ABEF for ; Fri, 5 Mar 2021 18:35:55 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id t4so2584417qkp.1 for ; Fri, 05 Mar 2021 08:35:55 -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=zCu922ckKYAY3qQQ28vIPyQejhpN6IID6JWoH+ED5pc=; b=nV1PV903xqvgLj70BMq3Hs24Zkw9NYTQZzwbHq0mMw9vVTA3Rq0YssYGDxVmqOc4xS VCU714Cc0Eci0ONEi0CNdJg4F8eKJPG9GZkLSclbovUo6w9TKcxDWEcDtjYpRHLcPwKL DILcUbKR7fCC+myBpSwA7UnPxBxUn1lrXuCIBQFj1UXGyHD5U9dE00xjX8tkP5DNy257 Rvo2G6VIHlr3OwFXfIgdok0SpZE3R9Hq73ElAMdrwEMIB/xQRSm6sg4ORRALIkJroVhu Xwj6PxtuPE6NZ8gSKiNq3Zjz4bCJFWkLEmg70+JuY3JtVZZJzug0vcud6sf/rhghMyL2 zSgg== 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=zCu922ckKYAY3qQQ28vIPyQejhpN6IID6JWoH+ED5pc=; b=CbFgxlPym1OkAhOYhULliZBet/BtJAmT87qGRvRb83QRTkyrqGpJQWTK4PJ7xJxMfH 6RxKuCNPpp0HJFD9BnpR7EQOKT4C5/ZnTc/ATASFKegAWIp52tHlDPAkL1uTl80yoT2O huZZQdzv4Tt6jqaM76PlBveGWYKGWVk5/JqTatFBCArtlUD8kw9uF3kIG8tny+voMWS4 1T2Ex+U0DueITL6rnNMPvDSRyH+3iNiQlJelr8dYvLfwXwZekjZUYegDYb9f22hc9Q/z d6v1pueqfVsEoLEIzyv67pfn7ueglO57YhL9fLO+S7vKBHV4GyUbeHQqAfA+k+HePU0h xNQQ== X-Gm-Message-State: AOAM5317GEf9xJ0vjjHRq5MyumQxLhjfnO2a0uvDP9ua4pt+59cLnCh0 tv5m72yASJ7HKR+xuNUyq6ylKPAT6H+/Kg== X-Google-Smtp-Source: ABdhPJx8A76aKhlwnShP4leXyrO8JL6WkWsC9YaQw5/82hgNGHjEdgqUwsw5NLoCN1Vgx4CRh0CYPQ== X-Received: by 2002:a05:620a:b02:: with SMTP id t2mr10101974qkg.128.1614962153713; Fri, 05 Mar 2021 08:35:53 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:13 -0300 Message-Id: <20210305163339.63164-23-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 22/48] 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 9a65774464..3ee28a447c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -381,6 +381,8 @@ typedef struct MatroskaDemuxContext { /* byte position of the segment inside the stream */ int64_t segment_start; + AVPacket *pkt; + /* the packet queue */ PacketList *queue; PacketList *queue_end; @@ -2943,6 +2945,10 @@ static int matroska_read_header(AVFormatContext *s) } ebml_free(ebml_syntax, &ebml); + matroska->pkt = av_packet_alloc(); + if (!matroska->pkt) + return AVERROR(ENOMEM); + /* The next thing is a segment. */ pos = avio_tell(matroska->ctx->pb); res = ebml_parse(matroska, matroska_segments, matroska); @@ -3004,7 +3010,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; @@ -3236,7 +3242,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) { @@ -3373,7 +3379,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; @@ -3490,7 +3496,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); @@ -3520,7 +3526,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); @@ -3894,6 +3900,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)