From patchwork Tue May 23 13:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp601377pzb; Tue, 23 May 2023 07:00:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6UraOnXxJVF2er0TJGh+5WO4eb+Fh7JLWuZVvxJYD1iut4nOPFq/8Sf4vch6n9v5hGtHuC X-Received: by 2002:a17:907:9620:b0:96f:87ae:49eb with SMTP id gb32-20020a170907962000b0096f87ae49ebmr13710740ejc.16.1684850451202; Tue, 23 May 2023 07:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684850451; cv=none; d=google.com; s=arc-20160816; b=R0ZWZYVKhp5zFE7dwkYUpxSXSdzzL+IOZdFiIr4mLuR0BmrM/a1gO2CwztSBYbpKeb k/KDmFYeMnEPrRTf723zZBqolfEq8813MKD05HB0y8hrqWGKmfD49aEiEYTR/MP0GPDG eeo5NSSXmpPMcN3QvtxzPDKizYZQF3kB4TMD+kEzcYUAaRJ7xVwa+QRxnaoPWRTGxI72 2KRs999MkOMWbesdwle9UKvK/+k+veM/YEBnXkOcjrvPCIpUN2U/GABRlygRgDFN9hFh xV2/mqRYQeobnke7XLWwveRxH1P1xGnrl/UeQTRmUk9lkVIII06EeQ4lUlSRjcT8ymm8 9nGw== 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=VgnvZEqD6ZZm+JKOVkI8wR6FMQVrqM/aGLe324ISF4I=; b=B8zTv11Ku7X7aB08NFqx+mO8m7u+1RmAE2HCZ1l2Krfv1607YaDexS2l9z7L6wnVXZ hq8DFAHZ2xV+MUeg2MnQUe+dxKZ+fWJDvivBW2CVXaYksLaOqIHfBdgymfj8amFT3JTA MtbgDNTdHO5etEjNjZCJbcFRpeENbfOR7mb2tHLLEAvC7+5c1lYYRpEwRvNS78kiUg4m wAJpzGouN3XLTlHPp1eV2/veHf8hId1dIAj6Q6qD2cJBKbJra0Tf1M9vG8DP3qbWwkPI C/x33JVCpfYvThh+90cOWNgfcHPKoiTJ+eBiK0niyrwx3ovoljo0GIKrgj6cOnR5Qv1K tooA== 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 d24-20020aa7c1d8000000b00510de433475si5914508edp.635.2023.05.23.07.00.50; Tue, 23 May 2023 07:00:51 -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 D5BD668C168; Tue, 23 May 2023 16:59:14 +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 094BB68C0CD for ; Tue, 23 May 2023 16:59:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2A35C2406CA for ; Tue, 23 May 2023 15:59:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ZdB3J6desXfK for ; Tue, 23 May 2023 15:58:55 +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 8A88D2405F9 for ; Tue, 23 May 2023 15:58:48 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7D0FC3A048F for ; Tue, 23 May 2023 15:58:48 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 May 2023 15:58:36 +0200 Message-Id: <20230523135842.20388-9-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230523135842.20388-1-anton@khirnov.net> References: <20230523135842.20388-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] fftools/ffmpeg_dec: add decoder private data 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: 72XL0YX2s3Ev Move InputStream.decoded_frame to it. Analogous to what has been previously done for all the other major components. --- fftools/ffmpeg.h | 5 ++++- fftools/ffmpeg_dec.c | 46 +++++++++++++++++++++++++++++++++++++++++- fftools/ffmpeg_demux.c | 7 ++----- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 927e402f7c..92e56ee80c 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -324,6 +324,8 @@ typedef struct FilterGraph { int nb_outputs; } FilterGraph; +typedef struct Decoder Decoder; + typedef struct InputStream { const AVClass *class; @@ -343,10 +345,10 @@ typedef struct InputStream { * concurrently by the demuxing thread. */ AVCodecParameters *par; + Decoder *decoder; AVCodecContext *dec_ctx; const AVCodec *dec; const AVCodecDescriptor *codec_desc; - AVFrame *decoded_frame; AVPacket *pkt; AVRational framerate_guessed; @@ -812,6 +814,7 @@ AVBufferRef *hw_device_for_filter(void); int hwaccel_decode_init(AVCodecContext *avctx); int dec_open(InputStream *ist); +void dec_free(Decoder **pdec); /** * Submit a packet for decoding diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 0a470c4854..f4531684d5 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -31,6 +31,45 @@ #include "ffmpeg.h" +struct Decoder { + AVFrame *frame; +}; + +void dec_free(Decoder **pdec) +{ + Decoder *dec = *pdec; + + if (!dec) + return; + + av_frame_free(&dec->frame); + + av_freep(pdec); +} + +static int dec_alloc(Decoder **pdec) +{ + Decoder *dec; + + *pdec = NULL; + + dec = av_mallocz(sizeof(*dec)); + if (!dec) + return AVERROR(ENOMEM); + + dec->frame = av_frame_alloc(); + if (!dec->frame) + goto fail; + + + *pdec = dec; + + return 0; +fail: + dec_free(&dec); + return AVERROR(ENOMEM); +} + static int send_frame_to_filters(InputStream *ist, AVFrame *decoded_frame) { int i, ret; @@ -373,6 +412,7 @@ static int send_filter_eof(InputStream *ist) int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) { + Decoder *d = ist->decoder; AVCodecContext *dec = ist->dec_ctx; const char *type_desc = av_get_media_type_string(dec->codec_type); int ret; @@ -402,7 +442,7 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) } while (1) { - AVFrame *frame = ist->decoded_frame; + AVFrame *frame = d->frame; update_benchmark(NULL); ret = avcodec_receive_frame(dec, frame); @@ -685,6 +725,10 @@ int dec_open(InputStream *ist) return AVERROR(EINVAL); } + ret = dec_alloc(&ist->decoder); + if (ret < 0) + return ret; + ist->dec_ctx->opaque = ist; ist->dec_ctx->get_format = get_format; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 33322ac565..29691cf68b 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -815,7 +815,8 @@ static void ist_free(InputStream **pist) if (!ist) return; - av_frame_free(&ist->decoded_frame); + dec_free(&ist->decoder); + av_packet_free(&ist->pkt); av_dict_free(&ist->decoder_opts); avsubtitle_free(&ist->prev_sub.subtitle); @@ -1196,10 +1197,6 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) exit_program(1); } - ist->decoded_frame = av_frame_alloc(); - if (!ist->decoded_frame) - report_and_exit(AVERROR(ENOMEM)); - ist->pkt = av_packet_alloc(); if (!ist->pkt) report_and_exit(AVERROR(ENOMEM));