From patchwork Fri Mar 5 16:33:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26201 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:6d42:0:0:0:0:0 with SMTP id i63csp530025ybc; Fri, 5 Mar 2021 08:41:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBRxDhO2wdiZpdvZOgxYN500G2ufQwjYZ/4g/cx/UiHY49+YaFLqMM7Mq86KBO/2E1opFa X-Received: by 2002:a17:906:b0d8:: with SMTP id bk24mr3060768ejb.252.1614962472125; Fri, 05 Mar 2021 08:41:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614962472; cv=none; d=google.com; s=arc-20160816; b=D/EgLbyUj0yN7o+gfPpohr9GOtMnvnGaSGGg+5VjYD7jVh0gN7wTtFiqxDQ5i3l9pb uYulXZCElqGIDiWg2AhRH8neZ7K9wXiLQsbbh0S5k+nwdvdk7YdRYEz0WIExMY5MXc6v 0kkA0A5f9bmLJ4W0v/UThtlua0LSNrvluH1et7zk9W2k8KVuMa4T/PNNUNQzjkOlmlLH 7qTrF0fK/bA1S+Z271BYGabeBlso9KNP6z/9QCTMN64iNPAOhMHE7AznblOaFTkptYwH dY/LFw3K/wB0LQ9IBPsjBPPsJ0tVMVMLZudfRAJXnnt0aTHJ5l8tAHadSm6IVDT7X5EP 4GEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pJ4WsMUs1tK84K2v47mlgAy4nzrmnblup9CigOi5QMk=; b=uK/Ul2k+sgwLi2ZXnJaHQBBdXxWQ6tkhJScTKPxQSui23OJdaMTffT9nupT/weF+a2 obcDUgAImY9F6y3S/nvA0OLtRifb+7+pi2xkJmtV8rMOdVH489jaO38/IcKPpEH2Yr4p UT1br0epaeaQhCc9u6uLVzr+StFQF0z4DC1KW7x7uCR7JrDc/LjwGL/do1+1ICzWR6Vb vXvD8E9iNUUiNPLAx1CUqo2SqTX3ncs8RsVada2zRxSP9ds47m2ElT4LAvBDtThTed7v GVA7a/vG6NMOfwis2kzJXCVojKXyLpsZf8VvI7Hi3sNnweUI+DsfOqPTG37MDfAhEcUt bgvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="UiDZ/sZD"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay21si1576660ejb.527.2021.03.05.08.41.11; Fri, 05 Mar 2021 08:41:12 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="UiDZ/sZD"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23FE168ACD7; Fri, 5 Mar 2021 18:36:08 +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 AA7CC68AC5F for ; Fri, 5 Mar 2021 18:36:02 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id r24so2146559qtt.8 for ; Fri, 05 Mar 2021 08:36:02 -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=3gzFVkfs54kHG2mzYJn5r+2TYpHuqkhhiIJiFD6br6o=; b=UiDZ/sZDW204wyecBxejk7UIEr1TtkiBkhwMcgwUqagTfZW2wFGvFYqiwRueyLKbqo TEB40u44nCzDkiCQ3DYOulm11sKUVG06fWjtYIZg/QMyZZF3XWxJbsL38t0T0JZF11zk zPc2nJdQc1dZAivgB+C67V1bZv+UNuoT9GshwbxyobnfCv/Q1ZYXVBjGMaA2GUHbBVbX iI5lZWzFA0MhSUkxkZrXUbLoTRjpitPy5fLg1sKXBFOSDtAUl6IPzHVMZGLaOVLFvjn1 dTO8OPIQWDZWMS5KVbVw/Yt0Zc05DCAYAt8MRfrzHqCcXBMRJ3FIXKwP1IpMYGOwe6PJ LwJg== 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=3gzFVkfs54kHG2mzYJn5r+2TYpHuqkhhiIJiFD6br6o=; b=Bs3V2rjimsbB3+cUay4R2/nGKM955CQL3KSkUG6IWYx4iliYVXbPopGXa80ItavY02 tAc3d923A/aiVqxczebPhtoK9/56lwzcQo9dVYBRcA+rNRzPJYNK8Pufcv8Da35K3hmj y0DtZYLUbm+z/WYF7xxDIL7HLh0pzUCxs8T4zsgtLIH49h5Ixr+H6D0l9xZ1SZDmWKEe XVw0+miy24fQFahS2ZPF3mU1ajhjZniy3Lzgp0n6DXY9RUnNl9yCZW4wA563zycqSeWf v+X/sPtmHaiZXiD2xAO0mO2Ogk0qVbs8p3ZDpmnankdPf9KRSX7fLKcPoes8TTWyGzbt roOQ== X-Gm-Message-State: AOAM5319zgSqiImgKOimKXGZyhFx45bk4wjXX45R0fPHCYJEJsQtFQ4B 6jhNwbj1/TiYaPbgof55VNfHWJFH8jN0hg== X-Received: by 2002:aed:2b61:: with SMTP id p88mr2389630qtd.360.1614962161275; Fri, 05 Mar 2021 08:36:01 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:19 -0300 Message-Id: <20210305163339.63164-29-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 28/48] avformat/rtpenc_mpegts: 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" X-TUID: +QEIDopr6Eml Content-Length: 3919 Signed-off-by: James Almer --- libavformat/rtpenc_mpegts.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 7d7377db7a..50cebf68a3 100644 --- a/libavformat/rtpenc_mpegts.c +++ b/libavformat/rtpenc_mpegts.c @@ -26,6 +26,7 @@ struct MuxChain { AVFormatContext *mpegts_ctx; AVFormatContext *rtp_ctx; + AVPacket *pkt; }; static int rtp_mpegts_write_close(AVFormatContext *s) @@ -41,6 +42,9 @@ static int rtp_mpegts_write_close(AVFormatContext *s) av_write_trailer(chain->rtp_ctx); avformat_free_context(chain->rtp_ctx); } + + av_packet_free(&chain->pkt); + return 0; } @@ -58,6 +62,9 @@ static int rtp_mpegts_write_header(AVFormatContext *s) mpegts_ctx = avformat_alloc_context(); if (!mpegts_ctx) return AVERROR(ENOMEM); + chain->pkt = av_packet_alloc(); + if (!chain->pkt) + goto fail; mpegts_ctx->oformat = mpegts_format; mpegts_ctx->max_delay = s->max_delay; av_dict_copy(&mpegts_ctx->metadata, s->metadata, 0); @@ -116,7 +123,7 @@ static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) struct MuxChain *chain = s->priv_data; int ret = 0, size; uint8_t *buf; - AVPacket local_pkt; + AVPacket *local_pkt = chain->pkt; if (!chain->mpegts_ctx->pb) { if ((ret = avio_open_dyn_buf(&chain->mpegts_ctx->pb)) < 0) @@ -130,19 +137,19 @@ static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) av_free(buf); return 0; } - av_init_packet(&local_pkt); - local_pkt.data = buf; - local_pkt.size = size; - local_pkt.stream_index = 0; + av_packet_unref(local_pkt); + local_pkt->data = buf; + local_pkt->size = size; + local_pkt->stream_index = 0; if (pkt->pts != AV_NOPTS_VALUE) - local_pkt.pts = av_rescale_q(pkt->pts, + local_pkt->pts = av_rescale_q(pkt->pts, s->streams[pkt->stream_index]->time_base, chain->rtp_ctx->streams[0]->time_base); if (pkt->dts != AV_NOPTS_VALUE) - local_pkt.dts = av_rescale_q(pkt->dts, + local_pkt->dts = av_rescale_q(pkt->dts, s->streams[pkt->stream_index]->time_base, chain->rtp_ctx->streams[0]->time_base); - ret = av_write_frame(chain->rtp_ctx, &local_pkt); + ret = av_write_frame(chain->rtp_ctx, local_pkt); av_free(buf); return ret;