From patchwork Wed May 31 14:54:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp3328925pzb; Wed, 31 May 2023 07:58:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WQTMFZjit4Qd77h9PU1UJj3bx/O1IwYAlZb0cew8ZbZdoHbN0RtFd3d/n5vANfUJkxMBH X-Received: by 2002:aa7:c902:0:b0:514:95ce:fb24 with SMTP id b2-20020aa7c902000000b0051495cefb24mr3883685edt.40.1685545097831; Wed, 31 May 2023 07:58:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685545097; cv=none; d=google.com; s=arc-20160816; b=BwJlTHVjttt73U8bqmtgMTiGc4UMJGab6jvZ7FSN7ezocLfRDyZ99CgtEIj+3nzhN1 7AXZFSf5wV3AjpjkJiU4UZX7x+r+aeDU0qESZFXwf/3aTEQMMZPcmrHp8su3V4pQtICS e7WqvSfNyCyfRWN8xF8UYFZkdM1xqS7cVnAiJzCnpjR+/aCe263DwI2zju7vMLRwaMU3 4XarVSVC0AqHYvAThiqpSD9RJNfw1mbLi4ilN0xNPnYqSdBjo5i6Zl7S4QikYHkrYw7o HgBlp2x45riBXrXXnyHG9YkolMIitUINK3AV4cAL2SH1WGT6XUeQWwA60IMgxzF7ATYX w9uA== 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:delivered-to; bh=TW6kS2odAN8S2QtjKf9j6IfGy4e9x7L+XDX2rte1XK4=; b=0hvS8OXxtxsYQXVGRXMpSlKrmvGvyBT5Pw9rE4QxbibPljZsORAFgL/Va1sajfWjHY Z9f1zlF/Z7ryHMR7/xW/2pMqERr7ZUjAkSOvMVozAx4eKXkFpIknYfHXMIBRvmIMRcry 4AKEJuVS4yh4m78QaMYjcBymsa6kY+UcFgQ4npKsILndGhafoPkrvvhLcdQq/Nil1q1J 6tq47REzKLnfDYmiFs4sH2z2NvgyN57WmU5XqlK+6CVEt+5ym9VFK0URthUrhiE2J0Pv tqZDCwfbXnys8wKMP3/HXoCgrlDpAGZ+wK9RvD9mep4Uzk0mtzV7HgtVdgzIu8qVLrUu STUQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o26-20020a056402039a00b0051494c50054si2383196edv.537.2023.05.31.07.58.17; Wed, 31 May 2023 07:58:17 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5D268C319; Wed, 31 May 2023 17:55:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81BDA68C2A6 for ; Wed, 31 May 2023 17:55:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 05D622404F5 for ; Wed, 31 May 2023 16:55:13 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id M56D7C8Nc3xc for ; Wed, 31 May 2023 16:55:12 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 4011E240D1C for ; Wed, 31 May 2023 16:55:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D32D53A0DAB for ; Wed, 31 May 2023 16:55:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2023 16:54:53 +0200 Message-Id: <20230531145453.20994-23-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531145453.20994-1-anton@khirnov.net> References: <20230531145453.20994-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/23] fftools/ffmpeg_mux: make OutputStream.pkt private X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: FbEG8ioqcJty It is no longer used outside of muxing code. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_mux.c | 4 ++-- fftools/ffmpeg_mux.h | 2 ++ fftools/ffmpeg_mux_init.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 890081edb4..88e3516243 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -551,7 +551,6 @@ typedef struct OutputStream { Encoder *enc; AVCodecContext *enc_ctx; - AVPacket *pkt; uint64_t nb_frames_dup; uint64_t nb_frames_drop; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 879a291ba9..66b2324bb3 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -389,7 +389,7 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) MuxStream *ms = ms_from_ost(ost); int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase); - AVPacket *opkt = ost->pkt; + AVPacket *opkt = ms->pkt; av_packet_unref(opkt); @@ -862,7 +862,7 @@ static void ost_free(OutputStream **post) av_bsf_free(&ms->bsf_ctx); av_packet_free(&ms->bsf_pkt); - av_packet_free(&ost->pkt); + av_packet_free(&ms->pkt); av_dict_free(&ost->encoder_opts); av_freep(&ost->kf.pts); diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index ad7b1df8a7..7f34b86548 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -46,6 +46,8 @@ typedef struct MuxStream { AVBSFContext *bsf_ctx; AVPacket *bsf_pkt; + AVPacket *pkt; + EncStats stats; int64_t max_frames; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index c49f906dc7..a18320fa9b 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1064,8 +1064,8 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, else av_assert0(0); av_log(ost, AV_LOG_VERBOSE, "\n"); - ost->pkt = av_packet_alloc(); - if (!ost->pkt) + ms->pkt = av_packet_alloc(); + if (!ms->pkt) report_and_exit(AVERROR(ENOMEM)); if (ost->enc_ctx) {