From patchwork Wed Jan 24 08:16:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1130261pzf; Wed, 24 Jan 2024 00:20:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmnPfwUGoVwR5skzmptdbWhd4fjH2CEONoKZmu0gnHMVHT/E70ZKwbKJvXjzQTc5Qk0cUN X-Received: by 2002:a05:6402:268d:b0:55c:7aff:b456 with SMTP id w13-20020a056402268d00b0055c7affb456mr1869004edd.17.1706084432766; Wed, 24 Jan 2024 00:20:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706084432; cv=none; d=google.com; s=arc-20160816; b=OwYCWxSslVKjG2mnOJAxqOurZlUPcyjXeSdqBZYDvO9B0DCpIpw70max+K2gTwNyEA VAzm0N66adrW0HjO+SkFGJZz556M/2/qBPRbmBBCixy1MqqTv2SJyPE61t1QiDliVOn0 lSyV2w4ap1PaQ45/p2ngYf2kHatpyjtDHblsb4ODAJGO3Q5+TeoXKh3ChPeUzx0U5vgn zubE5gRAfjNkwMZxfak1fO8RDnUsf/zxh8IHApz2DOanKhssWmXCz86u/iKbnMrIxtKb uk3TgCZ0+ePlSAcsHDR8k5P/qtqixtEVQEglH4F0aoggv0zSab7PkPEFy1xfKrHrIdpY JPgQ== 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=ERmm7xWmJWNBERvVQ7itraI9p2YirSfU5CskC15nMtw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jSJ/RXsTZchTAQsPSynSqVAPeSef/VXfTJzLQLLOLb+DSOErx/MtktwjzLR/RXWPbm TEVUdtbSMGQeebLrFivYIBw0kr+1Ji03IYqIdsuaKHfyZJWEfUpzoZqbY699X6CioKpe uw7/B+OyM1VBHuqRpb5xhert6Zx9FKEnwIGnsClDWbZygEP5hAUU4PJSyQSgkrcJn87r /Ig0XX5WfE5b/aS20Xkh26iMKsueRUUeSsM9hF4PgKb6peFUQiK9yOJouKqTpYCwUTDZ 19YSpnc5iR0Grp93ZPEVm46hSy83AO2MTo4YB1kInkCEcN1oBb1NM1IplFao00Ob463F F/mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=lNAghV3U; 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 s17-20020aa7c551000000b0055a435915adsi6234614edr.203.2024.01.24.00.20.32; Wed, 24 Jan 2024 00:20:32 -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=@khirnov.net header.s=mail header.b=lNAghV3U; 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 95AB368D1A8; Wed, 24 Jan 2024 10:17:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 816B968D116 for ; Wed, 24 Jan 2024 10:17:27 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=lNAghV3U; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3B4211BB8 for ; Wed, 24 Jan 2024 09:17:25 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id h9tVcYjpgwAm for ; Wed, 24 Jan 2024 09:17:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084240; bh=Pw9JB7p2HpVT+L35H03UXB1t7AFV+kW5RZckvej8IgY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=lNAghV3UNp2siDrQFoSdKTKrAACNFSdwoF56yqfLK1bcOrGv4ls1t4nLHiufgRQ+T EEwjZHG6/ECRYFx5LSpNPwFE3HmIPncisSImv9XvKbPJHNrUk24wYzmReh7uXgDjEQ Pyu+7UbIuH/ZgUYSdtJ5dfWb0OHLkq/Q9VWV4r48mUbtoF4Kl/3/lyWJWwIdpDlKHh X/IjqUVg5o2LYKOkeqp1Ez1H4zmV+5pebVBEfAjM0ZkT2li2twDNU/GVV0sNGWGPzs 52r4PtFrGqEGs57SLiG7ICkN6Qg0Qjm7fHm0e0I/oa1febOE99O3XA3Q2PF0XY2syg fgcOtYEkJLXKg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 65B091C07 for ; Wed, 24 Jan 2024 09:17:20 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5A25B3A0582 for ; Wed, 24 Jan 2024 09:17:20 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:16:57 +0100 Message-ID: <20240124081702.4759-27-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/31] fftools/ffmpeg_dec: stop passing InputStream to dec_open() 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: JmjTyrztlxZS --- fftools/ffmpeg.h | 3 ++- fftools/ffmpeg_dec.c | 50 +++++++++++++++++++++++++++--------------- fftools/ffmpeg_demux.c | 4 +++- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 02c614d0ff..c8cba72006 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -296,6 +296,7 @@ typedef struct DecoderOpts { int flags; char *name; + void *log_parent; const AVCodec *codec; const AVCodecParameters *par; @@ -756,7 +757,7 @@ AVBufferRef *hw_device_for_filter(void); * @param dec_opts Dictionary filled with decoder options. Its ownership * is transferred to the decoder. */ -int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, +int dec_open(Decoder **pdec, Scheduler *sch, unsigned sch_idx, AVDictionary **dec_opts, const DecoderOpts *o); void dec_free(Decoder **pdec); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 98cde0a040..3610256f31 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -110,7 +110,7 @@ void dec_free(Decoder **pdec) av_freep(pdec); } -static int dec_alloc(Decoder **pdec) +static int dec_alloc(DecoderPriv **pdec) { DecoderPriv *dp; @@ -133,7 +133,7 @@ static int dec_alloc(Decoder **pdec) dp->last_frame_tb = (AVRational){ 1, 1 }; dp->hwaccel_pix_fmt = AV_PIX_FMT_NONE; - *pdec = &dp->dec; + *pdec = dp; return 0; fail: @@ -940,24 +940,25 @@ static const AVClass dec_class = { .item_name = dec_item_name, }; -int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, +int dec_open(Decoder **pdec, Scheduler *sch, unsigned sch_idx, AVDictionary **dec_opts, const DecoderOpts *o) { DecoderPriv *dp; const AVCodec *codec = o->codec; int ret; - ret = dec_alloc(&ist->decoder); + *pdec = NULL; + + ret = dec_alloc(&dp); if (ret < 0) return ret; - dp = dp_from_dec(ist->decoder); dp->sch = sch; dp->sch_idx = sch_idx; dp->flags = o->flags; dp->dec.class = &dec_class; - dp->log_parent = ist; + dp->log_parent = o->log_parent; dp->framerate_in = o->framerate; @@ -968,31 +969,39 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); dp->parent_name = av_strdup(o->name ? o->name : ""); - if (!dp->parent_name) - return AVERROR(ENOMEM); + if (!dp->parent_name) { + ret = AVERROR(ENOMEM); + goto fail; + } if (codec->type == AVMEDIA_TYPE_SUBTITLE && (dp->flags & DECODER_FLAG_FIX_SUB_DURATION)) { for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) { dp->sub_prev[i] = av_frame_alloc(); - if (!dp->sub_prev[i]) - return AVERROR(ENOMEM); + if (!dp->sub_prev[i]) { + ret = AVERROR(ENOMEM); + goto fail; + } } dp->sub_heartbeat = av_frame_alloc(); - if (!dp->sub_heartbeat) - return AVERROR(ENOMEM); + if (!dp->sub_heartbeat) { + ret = AVERROR(ENOMEM); + goto fail; + } } dp->sar_override = o->par->sample_aspect_ratio; dp->dec_ctx = avcodec_alloc_context3(codec); - if (!dp->dec_ctx) - return AVERROR(ENOMEM); + if (!dp->dec_ctx) { + ret = AVERROR(ENOMEM); + goto fail; + } ret = avcodec_parameters_to_context(dp->dec_ctx, o->par); if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Error initializing the decoder context.\n"); - return ret; + goto fail; } dp->dec_ctx->opaque = dp; @@ -1009,23 +1018,28 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, av_log(dp, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n", av_err2str(ret)); - return ret; + goto fail; } if ((ret = avcodec_open2(dp->dec_ctx, codec, dec_opts)) < 0) { av_log(dp, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_err2str(ret)); - return ret; + goto fail; } ret = check_avoptions(*dec_opts); if (ret < 0) - return ret; + goto fail; dp->dec.subtitle_header = dp->dec_ctx->subtitle_header; dp->dec.subtitle_header_size = dp->dec_ctx->subtitle_header_size; + *pdec = &dp->dec; + return 0; +fail: + dec_free((Decoder**)dp); + return ret; } int dec_add_filter(Decoder *dec, InputFilter *ifilter) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 6216b7c684..5178bcbce4 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -933,7 +933,9 @@ static int ist_use(InputStream *ist, int decoding_needed) ds->dec_opts.codec = ist->dec; ds->dec_opts.par = ist->par; - ret = dec_open(ist, d->sch, ds->sch_idx_dec, + ds->dec_opts.log_parent = ist; + + ret = dec_open(&ist->decoder, d->sch, ds->sch_idx_dec, &ist->decoder_opts, &ds->dec_opts); if (ret < 0) return ret;