From patchwork Thu Feb 4 19:09:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25410 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 892E74480C6 for ; Thu, 4 Feb 2021 21:11:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E8DC68A8F1; Thu, 4 Feb 2021 21:11:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCA206809EB for ; Thu, 4 Feb 2021 21:11:30 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id j13so2242121qvu.10 for ; Thu, 04 Feb 2021 11:11:30 -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=0epvoKDu2DBJ30HkcCtbSFrFPepxAb7V0rHFUAwEkvo=; b=acgUCMc+9i6obnBMuKMLmB49BSlXiAv2QpBEwk5JhrAYLdKR93fgLrofMXJ7oEWpBT 7Hcerq1wtj+hIJMa3fRlS8uwnnQewDrb3oL2H7DpnC9Lw81AZOGOvZCSXZUnwRVRxM5z Y4dD90kjybrjWx73xV8HL97g8deKRFGMBgOO/WeUS7HqL7uaItxANdFw6sbZqmkIRP9C DAzNcghnYb9F/ey0Fb3QUi7TmiIya6Mt1MqWSlcW6Q7D40pocXxywJ+W6z+QEa+ibgpj xpVGaohCNf9KL8gy5N+HV2cd6i3XYh1CmmLEZ0IJFM4n4hneCeSB+mbEH2UIVBSAL9ZV 5TfQ== 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=0epvoKDu2DBJ30HkcCtbSFrFPepxAb7V0rHFUAwEkvo=; b=rTapESL2VYpiqyHH7NTmk7ZJ52cMGNgxOsEMnwR9V7aZ3Cs3cw0OkdpZaeB/IoLbia jOpiBSD9MXm4WMj06Ogoec1kIuU/Oy7/6gqcxc90hRXzxYksSUYEfgVSSYFOdXwdJuVo BoAe/7Pe1FafvPDTSrkAkV8/bcZDnED11mhV+6oiyJc4XFYTI1U1D3a3pz6WkFxHNgQa n7f4al2p5ZPWZHOQp5ZVIhmJtNbuBq199Ur8cY4EkWy2z4z7lWp7HCO78ToRYCogIPEW 4hVmvRh+yLWn4O/buqA2xDBytpHHwESGlG7bo2OSrq9zsGjXhyf1YoL0GYmekdst42/f J6dQ== X-Gm-Message-State: AOAM533Th0gaG7QJJEHq08+2G4su5X+wlAd/KV4EaOHfIO5DKiYkhbhw VXApnmMIkb7K22RlcqCJRYeBkyzydDY= X-Google-Smtp-Source: ABdhPJxzegAji/WqhbOpQIPnjDSI6Yixzv358ORWeGtVhrd36xqTnElxDnVt3IaVyza+qHYtsbP0DA== X-Received: by 2002:a0c:b4a8:: with SMTP id c40mr719042qve.60.1612465889327; Thu, 04 Feb 2021 11:11:29 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:43 -0300 Message-Id: <20210204191005.48190-29-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 28/50] 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" 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;