From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E91A9493DA for ; Fri, 9 Feb 2024 14:54:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F94068D135; Fri, 9 Feb 2024 16:54:06 +0200 (EET) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFE1968CD10 for ; Fri, 9 Feb 2024 16:53:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1707490435; bh=CtagyGptHiPnSFxnYkY2/MUsxw6U0L4TJJTaAwE/tuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZSq0UhbAoDyMWkptJ/zKdmBTsiL+um1wAUm1IebWyYU+gEiOCsuQOjDDLqxgmuqg npRuYUyU8dlxuiHW+Onb6JcMapTqN7p/jmYFekYRoM1B7K7554Yx0DA5nxYtHOxnHr XIJoRs6uNlBSSr70wymH6oaXC6mio+Oj1Pg9H1+Y= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6CBAD419F6; Fri, 9 Feb 2024 15:53:55 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Feb 2024 15:53:49 +0100 Message-ID: <20240209145349.104511-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209145349.104511-1-ffmpeg@haasn.xyz> References: <20240209145349.104511-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/vsrc_ddagrab: move hwctx init to init() 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 Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas Not as strongly motivated as the previous commits, but there's still no reason to do this from config_props if we can avoid it. --- libavfilter/vsrc_ddagrab.c | 99 ++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c index 51e928d785..c89eff6e5a 100644 --- a/libavfilter/vsrc_ddagrab.c +++ b/libavfilter/vsrc_ddagrab.c @@ -445,7 +445,54 @@ static av_cold int ddagrab_init(AVFilterContext *avctx) dda->mouse_x = -1; dda->mouse_y = -1; - return 0; + /* Init hardware context */ + if (avctx->hw_device_ctx) { + dda->device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; + + if (dda->device_ctx->type != AV_HWDEVICE_TYPE_D3D11VA) { + av_log(avctx, AV_LOG_ERROR, "Non-D3D11VA input hw_device_ctx\n"); + return AVERROR(EINVAL); + } + + dda->device_ref = av_buffer_ref(avctx->hw_device_ctx); + if (!dda->device_ref) + return AVERROR(ENOMEM); + + av_log(avctx, AV_LOG_VERBOSE, "Using provided hw_device_ctx\n"); + } else { + ret = av_hwdevice_ctx_create(&dda->device_ref, AV_HWDEVICE_TYPE_D3D11VA, NULL, NULL, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to create D3D11VA device.\n"); + return ret; + } + + dda->device_ctx = (AVHWDeviceContext*)dda->device_ref->data; + + av_log(avctx, AV_LOG_VERBOSE, "Created internal hw_device_ctx\n"); + } + + dda->device_hwctx = (AVD3D11VADeviceContext*)dda->device_ctx->hwctx; + + ret = init_dxgi_dda(avctx); + if (ret < 0) + return ret; + + ret = probe_output_format(avctx); + if (ret < 0) + return ret; + + if (dda->out_fmt && dda->raw_format != dda->out_fmt && (!dda->allow_fallback || dda->force_fmt)) { + av_log(avctx, AV_LOG_ERROR, "Requested output format unavailable.\n"); + return AVERROR(ENOTSUP); + } + + if (dda->draw_mouse) { + ret = init_render_resources(avctx); + if (ret < 0) + return ret; + } + + return init_hwframes_ctx(avctx); } static int create_d3d11_pointer_tex(AVFilterContext *avctx, @@ -814,46 +861,6 @@ static int ddagrab_config_props(AVFilterLink *outlink) DdagrabContext *dda = avctx->priv; int ret; - if (avctx->hw_device_ctx) { - dda->device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; - - if (dda->device_ctx->type != AV_HWDEVICE_TYPE_D3D11VA) { - av_log(avctx, AV_LOG_ERROR, "Non-D3D11VA input hw_device_ctx\n"); - return AVERROR(EINVAL); - } - - dda->device_ref = av_buffer_ref(avctx->hw_device_ctx); - if (!dda->device_ref) - return AVERROR(ENOMEM); - - av_log(avctx, AV_LOG_VERBOSE, "Using provided hw_device_ctx\n"); - } else { - ret = av_hwdevice_ctx_create(&dda->device_ref, AV_HWDEVICE_TYPE_D3D11VA, NULL, NULL, 0); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to create D3D11VA device.\n"); - return ret; - } - - dda->device_ctx = (AVHWDeviceContext*)dda->device_ref->data; - - av_log(avctx, AV_LOG_VERBOSE, "Created internal hw_device_ctx\n"); - } - - dda->device_hwctx = (AVD3D11VADeviceContext*)dda->device_ctx->hwctx; - - ret = init_dxgi_dda(avctx); - if (ret < 0) - return ret; - - ret = probe_output_format(avctx); - if (ret < 0) - return ret; - - if (dda->out_fmt && dda->raw_format != dda->out_fmt && (!dda->allow_fallback || dda->force_fmt)) { - av_log(avctx, AV_LOG_ERROR, "Requested output format unavailable.\n"); - return AVERROR(ENOTSUP); - } - dda->width -= FFMAX(dda->width - dda->raw_width + dda->offset_x, 0); dda->height -= FFMAX(dda->height - dda->raw_height + dda->offset_y, 0); @@ -861,16 +868,6 @@ static int ddagrab_config_props(AVFilterLink *outlink) dda->time_frame = av_gettime_relative() / av_q2d(dda->time_base); dda->time_timeout = av_rescale_q(1, dda->time_base, (AVRational) { 1, 1000 }) / 2; - if (dda->draw_mouse) { - ret = init_render_resources(avctx); - if (ret < 0) - return ret; - } - - ret = init_hwframes_ctx(avctx); - if (ret < 0) - return ret; - outlink->hw_frames_ctx = av_buffer_ref(dda->frames_ref); if (!outlink->hw_frames_ctx) return AVERROR(ENOMEM); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".