From patchwork Wed Mar 6 11:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp314482pzb; Wed, 6 Mar 2024 03:08:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUUbcN+5w9kZSKMluF3Zl2Agsoe5/BqlAjzbOJ9GQYA/ug9bWWQqq+ESkabZIj5FbJb0CTa0Db7itpPB63LUBDz/mH3AK5n80QTGg== X-Google-Smtp-Source: AGHT+IF74LPqBXsR6FAH8ovXRjcPtofqKHHZ3j3t2irCJvqcFNYkdR59c8/gA4dkkB7fVzj3Pqgo X-Received: by 2002:a05:6402:5c1:b0:567:6a66:d0fd with SMTP id n1-20020a05640205c100b005676a66d0fdmr4726902edx.0.1709723312210; Wed, 06 Mar 2024 03:08:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709723312; cv=none; d=google.com; s=arc-20160816; b=dVcOMAbmh9tkhsa3pVFBKyiMdMlK7mFtXqkQ90JoeXxHzb/1DZ+b/wyL0//eYrO8RO GjD06WdTRfSGT+l5QsQqnPZf3UMArD+VVhOC+lJBKuLK3ksCO4KbZsB0+iQ4Ykmpnz8w LHCFOQvgNsRLglrx+D5fVOTPzT0x7sHL+LMnVVZsZ/50Ar0p54Tad19VCyqKVjeJAAoq IpuYUN3rPkjeMmn0uY4ZlJjTqKUMdT6CS/zEyFNPfKAgSvnznKSzmkqk+m/qix/ec5v3 n0SuHE8fMzyE2KvNYb0UdAb3mSYsIQ7tKLX8oFYuANiIJCbVDx1huF0umRwiSKtODE0a ozyA== 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=XRRsDYcuLAfCUTWUqgPeEwS1jYiUE1MPYczvrxuwsuc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=p7oIHcI6mxDZFMTpTlImmhmXN3h2UsIOLJK6mbrN4XksquJ114fan0HmS6ciFeRgZd /+nCGgULqTHmwbxpmYN5M9pUpCcD+UWPme2zxzFwGBlOyprP7msR+hlng5UsI/PPcuat PHB5YfiPF8FIWl4m/42X8NkYwhC+dxC8izNQ2JCXZlnMgvGFy9ZRq1GaO4DWrnOQ2mN1 zSisDDL8TGCw0ygiCpLG5DBowo5SwgxHZXTdh18w/Mx0jyoRexx41M+e7uzyYGTQkuiL /ZIQ9l1AiGRe2dunh5jkxx54PrnQFud+FvagUO9BbZMGjxTByJMdcjewe34Q4yRV/cWv S79w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=GkF28R6J; 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 w22-20020a056402269600b00566c329e3b0si5425565edd.459.2024.03.06.03.08.31; Wed, 06 Mar 2024 03:08: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=GkF28R6J; 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 0F02668CF68; Wed, 6 Mar 2024 13:05:50 +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 90CF968CDB9 for ; Wed, 6 Mar 2024 13:05:29 +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=GkF28R6J; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id A18C54D4C for ; Wed, 6 Mar 2024 12:05:25 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id a6fqaeFQ3YKP for ; Wed, 6 Mar 2024 12:05:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709723122; bh=2ZZJra8tUeCn6pLScHwPscvF9pWEvqUYJi8gzOztkSs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GkF28R6Jq7eADArudtgrugABYSIEje6cc9T4b2dz5KFES+HjVBDkAr5723+DLxQf6 9JYhlFrEi18evPzqtvIWvVI24Cv2YTth2vgSnxeu0O4mgDJOzDZN7LCGRmFGD+luYD XVacNsOw/4mHS6GSomTKE9v8FjHy+N6j83+kuyqAyD8Af0aZOzchg854LehA5GocV8 ADQEHovaNN3t+1FTZhpWGGuX/oUihuUgU9Nluyfsm1dQS5X5YxOyKpBK4kDugwgoZZ cYVmI1GKeWGntcyL2C5vLSADWn8QhT1nfKYR7GQZ0lMwOsy5j7jHbY47h8ssCt5ChQ +FKgtdnJs5uHQ== 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 C5DDD4D48 for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AF1273A0B9C for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 12:03:06 +0100 Message-ID: <20240306110319.17339-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306110319.17339-1-anton@khirnov.net> References: <20240306110319.17339-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/18] fftools/ffmpeg_dec: factor opening the decoder out of 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: hLDP8SMANgXa Rename dec_open to dec_init(), as it is more descriptive of its new purpose. Will be useful in following commits, which will add a new path for opening decoders. --- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_dec.c | 61 ++++++++++++++++++++++-------------------- fftools/ffmpeg_demux.c | 2 +- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 1c5ebcb43f..6b049e329b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -740,7 +740,7 @@ AVBufferRef *hw_device_for_filter(void); * @retval ">=0" non-negative scheduler index on success * @retval "<0" an error code on failure */ -int dec_open(Decoder **pdec, Scheduler *sch, +int dec_init(Decoder **pdec, Scheduler *sch, AVDictionary **dec_opts, const DecoderOpts *o); void dec_free(Decoder **pdec); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 98c4a0c83c..af57b2bb9d 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -1066,19 +1066,11 @@ static int hw_device_setup_for_decode(DecoderPriv *dp, return 0; } -int dec_open(Decoder **pdec, Scheduler *sch, - AVDictionary **dec_opts, const DecoderOpts *o) +static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, const DecoderOpts *o) { - DecoderPriv *dp; const AVCodec *codec = o->codec; int ret; - *pdec = NULL; - - ret = dec_alloc(&dp, sch, !!(o->flags & DECODER_FLAG_SEND_END_TS)); - if (ret < 0) - return ret; - dp->flags = o->flags; dp->log_parent = o->log_parent; @@ -1091,39 +1083,31 @@ int dec_open(Decoder **pdec, Scheduler *sch, 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) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!dp->parent_name) + return AVERROR(ENOMEM); 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]) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!dp->sub_prev[i]) + return AVERROR(ENOMEM); } dp->sub_heartbeat = av_frame_alloc(); - if (!dp->sub_heartbeat) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!dp->sub_heartbeat) + return AVERROR(ENOMEM); } dp->sar_override = o->par->sample_aspect_ratio; dp->dec_ctx = avcodec_alloc_context3(codec); - if (!dp->dec_ctx) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!dp->dec_ctx) + return AVERROR(ENOMEM); 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"); - goto fail; + return ret; } dp->dec_ctx->opaque = dp; @@ -1140,22 +1124,41 @@ int dec_open(Decoder **pdec, Scheduler *sch, av_log(dp, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n", av_err2str(ret)); - goto fail; + return ret; } 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)); - goto fail; + return ret; } ret = check_avoptions(*dec_opts); if (ret < 0) - goto fail; + return ret; dp->dec.subtitle_header = dp->dec_ctx->subtitle_header; dp->dec.subtitle_header_size = dp->dec_ctx->subtitle_header_size; + return 0; +} + +int dec_init(Decoder **pdec, Scheduler *sch, + AVDictionary **dec_opts, const DecoderOpts *o) +{ + DecoderPriv *dp; + int ret; + + *pdec = NULL; + + ret = dec_alloc(&dp, sch, !!(o->flags & DECODER_FLAG_SEND_END_TS)); + if (ret < 0) + return ret; + + ret = dec_open(dp, dec_opts, o); + if (ret < 0) + goto fail; + *pdec = &dp->dec; return dp->sch_idx; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 29f4a26224..ae0f635d8c 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -935,7 +935,7 @@ static int ist_use(InputStream *ist, int decoding_needed) ds->dec_opts.log_parent = ist; - ret = dec_open(&ist->decoder, d->sch, + ret = dec_init(&ist->decoder, d->sch, &ds->decoder_opts, &ds->dec_opts); if (ret < 0) return ret;