From patchwork Fri Feb 9 14:53:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 46138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp982430pzc; Fri, 9 Feb 2024 06:54:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IEt0xXPVjC2zEtl7lrz7QznxWaDZ+poRZFwMv4usXuMaA93z48g9QEsLfmrgcWawD21O5K1 X-Received: by 2002:a05:6402:517:b0:560:c77f:a11c with SMTP id m23-20020a056402051700b00560c77fa11cmr1796588edv.10.1707490481768; Fri, 09 Feb 2024 06:54:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707490481; cv=none; d=google.com; s=arc-20160816; b=BRBG9QCfO8FNDRSezcwiV6xS0+NrRQIW2dWSc7UCgFA3U9Dzw8AnBfxaqGXOaAsXBB Elaa5nANrYDOxbke2hiVqdfh6hwzCni82XJtIJak0VNv5iYYz5w+o2k2ijRhXWwhnGmc eVnK+kK4pWR8IFSEqtgX+LSFccHYnM4CsYZDfvQENXW75JbfLfRuXo/U0We9jl4lERrJ SXpfiRDmtf+qyKJxUERNInMFXcsfHg0cp8bXetMpOqW8DG+aSsO4XLjRcuF4/QSnR8nW w3T9hiAARBWsaNJpmqqR/JK438PfNGuaUjetXTfB09C/DY5UzYl8iiPfqXc0iv8YmaSc jpeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=Pb+kIzwCo6fXPuK26YDOTCxCB3fAN6ePhRB1mkZD588=; fh=nAZlSrFjlbHRcjkFjD0UidgBwqr5JoErVupLcqyNk3M=; b=rH2mHLo0VldaqxoYKhL8lwRQh9OfUZyKinUwlShgn6zSVdZN0pS8pYYrHchd6Xpdvk ssXsCQu1FClvGGZUuDagEiL/yr58e6oj4PDv8LWAcE0ms2m+gp82bRApuSSYlzmp3tfg nTDgyymoZHAOSxN6LPq56X9dFIPAjbdfwCELQtLIRLeOGq8XF3RcOzH6+W2+9Ons7IML OrAHmn1XjOD3n1os6jbyaa1EHxBQhWHL/BsbllAZkss7ZCS/7CQOJgbt+fu1U3luAB0y KSGeOOE/f/Mxn9SYvQu6kHB/PoiFuuFqqm0UfyHNYovjVcx2JLWSlGuzu4rFG7rF30yK eSvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=OZSq0Uhb; 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 X-Forwarded-Encrypted: i=1; AJvYcCWW2tUS5xM6enefhSA/34csTvSxSc7Xux6PZajjeilMfhsLkeKH+z/MVMNDaS3ZH/XjFTC6u5okJeCQhyulnK3quYHF0SNi6jvvv0yt0QOoQw5+j2yQiwjHO+55t65COS0tOlIVNY6xQEL800zpH9BwFI0LbjEUel4o6REqIOOSrpI3xdLW8Ntd7IDQb/Wbj0p9di+cBJWgyb70fm4+eLqoxmu+ttG4RoZxf49mYoBxTIZn4lDYVQK1o/1wQ6egcEAALUandP+t1cVTQlARDxVLdevdy5h6g74jh9xA+PkoJzo4sNFximrFVxwGHi837IlAEbUfTqpbrkncLcI37zryoXQ+LrpUhDxIjV3wEyGDklAH5yObLgiK/BbToYScuTwJcrBOp5L7rVg3xDY6hHtWdPbIEKUtpJ3nDZiLp+b0P8fDS3DnvgRin02H1EQ33z76n+0DQ//UH7jMfRuRXQRbXYeBXZ7hB5vSAVBY+wMoWNDHXSe3KE8ixrBcBWh4MLPM1OXE5B5Gg8srVTRARHAutrDSJZ+4yP48+RnhGwFFQmlAOZyOs08fY5dPYMKAZjDKfvbC+L+aP9CIEQwH6+A1SQ8Wet/L/5QWygsrSsJf2GZ7CF2S/L2JshAcTW9mwsJw/bvwBBbUGBmksudI6E6fdoJU0WSaNvpDs3laZ1iUQkGBpz4GiuRSP5o9wPaYotjiRZ/PaQGw9srbm7iDkaVggzcTQOT65+x3xx+bFGqD9wG9HJ9WZUgwq9Kxhc0LFaZX0RXWdCEZvGwgVXOZYpD27Dv4XUinrSq56loAiHiD2ZmocwlBrm5ediC2uyG3Ih/yDPUV9SbS9tNMe8TPZ1I9yockBRbkOM7Nqk6Dfc9Wz1XHH66R6UJBVUH2bzZQxGZThu/wvEIRqtD3qvPi34RZajV141mdBPb/YIdeQlkbo2NxGZwrGOJZJdK2s0nmqw+yt5 fhpGdwmE/Soe3mQ2pny5tiFT5RcGARq+I/5B0ITLcoac5iuGLQEDve0am5Bc+AazhjXlQH1jDwKrIYp6+V2ewJPnLGtfG/BDIwBBRrUp3pPf+nILt4vJ310K64pZI4ObXmRLJPu7iINSuX6c7t1sr5FaOxbj3/yjCR/C5pukARJ7CXG4Ytjc75xGYamiWW/WZMML1fUij58Y88nzzrfYw9Oho7yrVzGjSeI98G7of6OShHZGFT7Ki9LJp+tTl+XJaukW0+xnxf/rqRZNJ20Xnyi0MZSsslsDhlCWQp0TUbKkZqsNCrJiRoZMvI5iUL+KOMEXBUmZ14yyjGkBWJmu4WobdnSpZC1MsToLbK2uXj6eTwj8BEFO56AznBNpbJiQIlHz+8Ciy6tYYGFNy9Clvgnl4AJfTNzDc8a3OJ2q4grU6Q7uC2Eqd/Cz6XecPVqT37KkUQpKgan2yOLuaOIBnBX+JvqfLrkTA3fOk67f/u2uTwAANRfTLwBBR4RDTkvOBAXpiG0RorJTuIWauATdiGT3xU94TTT4EkY0fsR3znTyVWCVjlvAxV8rT2qGE3CSqzs30ILRzobHVPbR3IeQfS5NeUpX4Z7woEcXmwfNRanBsvuADBoO9lYEyK/H7V Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y3-20020a50bb03000000b005601033ea51si928034ede.426.2024.02.09.06.54.41; Fri, 09 Feb 2024 06:54:41 -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=@haasn.xyz header.s=mail header.b=OZSq0Uhb; 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 4056768D137; Fri, 9 Feb 2024 16:54:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: z+lpWfQk0Js1 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);