From patchwork Thu Feb 4 19:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25408 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 864514480C6 for ; Thu, 4 Feb 2021 21:11:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AC6F68A87F; Thu, 4 Feb 2021 21:11:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A91D7689F27 for ; Thu, 4 Feb 2021 21:11:27 +0200 (EET) Received: by mail-qk1-f172.google.com with SMTP id s77so4462461qke.4 for ; Thu, 04 Feb 2021 11:11:27 -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=eCJIFux/iOaxrK1tJaGSIrgU26dFOo4cPEvsQu+3/TA=; b=cAoroxzev/8EdxRRDumo6WbB8H1PiqcYii2q9N3tU8anuV3YrJeSWs5hpjSaq1Jm+b kKDFDGV0j9mLOrYBOiHVLF89dNAex7C0KDW7EUI6Nz2eeRrQuoabvtACIQrPDeH3r7fn 6RzsvOW5iv7o2LeZ6HthTr8aXVliNjTkLhRyjQU8pwRzb5ZkHI4Sf8hZomDv3iwW7zje xNJnQs7tcET5kT0d0ZtH2nEw8zd0H8rn9ymLeLpWWDgdE7DeA6trGc+G42GR/S+jk1Uu xNFxeyPuG2N6vXK83bd42oI46dO2pLRcMefTziM4VTLBKuM0Jk33gNV1Ly3vwV3ogE6Q ocFQ== 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=eCJIFux/iOaxrK1tJaGSIrgU26dFOo4cPEvsQu+3/TA=; b=CA+QsMoXoAVF/ONklsCwcMq/MH1vmZjXj6KzcZxHQBPZiNEUWexzAmiKJUY0yMfrHD wqlPaK6Dr2Y/Lcmth7XIIw2nECtrRz865XQ8GdcM4N7MCxk0dbbqnDT4vViWv2hnul5T CzLAONVQHMIU2r/GcI1jLiGFQhLV1BJCNwp8YyOTVTZA8L5NIPZPClaln8Z5bLhprP8n zgpGykrZmJ6Yl3eMUMefQco/Kqzm8mhMDR7M7bqS2oObFTCGcBmchCgoJU4zHFaI8Jin Rt0z8Sc/RUuj/rK4h4U5Gf22/3CfG2XJGDdZQb3/1PwcMJGRrxxttP2qw+uWvzrNioIk ZAug== X-Gm-Message-State: AOAM531UZKTsUUu7zH5jfSQidK8knUiqGV0HdFqMG5LAqkpi0ZiLCRv+ 8C5GXmU8Va4Ws5vAlHOrLINBopxiyig= X-Google-Smtp-Source: ABdhPJzH9iPLrFsgH+g9N1sknyRLWzNxaCDUJFjnlIPWsaY/nMGmvyXtGDRVKAX0Lfvwhvy7rY9SBQ== X-Received: by 2002:a05:620a:1090:: with SMTP id g16mr622222qkk.147.1612465886214; Thu, 04 Feb 2021 11:11:26 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:41 -0300 Message-Id: <20210204191005.48190-27-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 26/50] avformat/mpegtsenc: 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/mpegtsenc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 45f8d5f373..baf303dc60 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -77,6 +77,7 @@ typedef struct MpegTSWrite { MpegTSSection pat; /* MPEG-2 PAT table */ MpegTSSection sdt; /* MPEG-2 SDT table context */ MpegTSService **services; + AVPacket *pkt; int64_t sdt_period; /* SDT period in PCR time base */ int64_t pat_period; /* PAT/PMT period in PCR time base */ int nb_services; @@ -1022,6 +1023,10 @@ static int mpegts_init(AVFormatContext *s) ts->sdt.write_packet = section_write_packet; ts->sdt.opaque = s; + ts->pkt = av_packet_alloc(); + if (!ts->pkt) + return AVERROR(ENOMEM); + /* assign pids to each stream */ for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; @@ -1745,23 +1750,23 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) { int ret; - AVPacket pkt2; + AVPacket *pkt2 = ts->pkt; if (!ts_st->amux) { av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format " "and extradata missing\n"); } else { - av_init_packet(&pkt2); - pkt2.data = pkt->data; - pkt2.size = pkt->size; + av_packet_unref(pkt2); + pkt2->data = pkt->data; + pkt2->size = pkt->size; av_assert0(pkt->dts != AV_NOPTS_VALUE); - pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); + pkt2->dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); ret = avio_open_dyn_buf(&ts_st->amux->pb); if (ret < 0) return ret; - ret = av_write_frame(ts_st->amux, &pkt2); + ret = av_write_frame(ts_st->amux, pkt2); if (ret < 0) { ffio_free_dyn_buf(&ts_st->amux->pb); return ret; @@ -2020,6 +2025,8 @@ static void mpegts_deinit(AVFormatContext *s) MpegTSService *service; int i; + av_packet_free(&ts->pkt); + for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MpegTSWriteStream *ts_st = st->priv_data;