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 7F5A34954C for ; Mon, 12 Feb 2024 22:04:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61FF368D0CF; Tue, 13 Feb 2024 00:04:39 +0200 (EET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30AB768CAEC for ; Tue, 13 Feb 2024 00:04:32 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33b2960ff60so2706809f8f.1 for ; Mon, 12 Feb 2024 14:04:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1707775470; x=1708380270; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=BJc2JAEsRgdXFu+0asQKbDa07OB5MP+o2gSTGHrG3vs=; b=Y1sv/NaQFRkcO8PHB/SDQWkyylbnpyoXVomJGrta8TZX1lf/CMQZNPsq3y2tdLSfyu crkGE68cSUKcYyEmx+fU46+SUcWvB2WqgziiJbPVRbcwgYx+CrJDsPzctoToOy5tsHGX x37rAPA2kqq5nyF1KD6mCumIowv+DJTDvlBS14mR3wHOU2LmU7696N2Is1gpSKdLm/+x 0G4iBFQY8gXGlu9pYZW3JgOovX5NHntELU9f9bMtK1cJK371NcZEXTg85ovjiRZb59d3 hv56mv2x9XxDUqrnGlA/zO+2RWb+dO1ztBmdzoxgp/YA4VF2xo0/fXrfWvuL9nYKO24x lmnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707775470; x=1708380270; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BJc2JAEsRgdXFu+0asQKbDa07OB5MP+o2gSTGHrG3vs=; b=qUbOlkjC6QGN02Z6SF6qlQx02QYIA83+zNx7f2AsZLDRlqj9rMibydEj5DD2Fr3d0o Xz09kdZqXwQ+HxbS4buXMAW+XTZvCr1r7pIl66qfFQiWyR+rXNsGi867jbaZCVGhuqBJ cIMQ+x0ftlOsZ6Jl7DHhPEFo/HS+GWY74fL31/q++ZuREEjUjzlNxrJty6+XhdLvnmFA 6PRPhLv9DcGLTUu3Wpka3MphWoQZMeuVl+q64uJtbwAopou46hJ5zqtAEnO0xq8Xn6BW RuEzRmagQchG7j/NDepL9WTY1kVLPVaE67iOQvnu5TZn3CelNdFt5tqNBXCYG2aQqCo/ xIHg== X-Gm-Message-State: AOJu0Yxcl9Pi7iy9mndhSerIbeNlCjOIOR/rJwo4UAnnG/YuQvr+quFp P+9CmGdQYx7z+xGIzwiOwDm6WcOYAI0V4v2X4mkIYBMzbvBmNSDAD3cNzzFUWjazpy6dOe5gnIE 5 X-Google-Smtp-Source: AGHT+IEcVudpVClGp6MVHUWoI/rp7Lhk/IuBA3lIjvj2BOObEfIofy40tfZhUl+PJUqPNozdaCMnZQ== X-Received: by 2002:a05:6000:8b:b0:33a:ead3:6438 with SMTP id m11-20020a056000008b00b0033aead36438mr667343wrx.33.1707775470237; Mon, 12 Feb 2024 14:04:30 -0800 (PST) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id t22-20020a1c7716000000b0040fe308ff25sm9731657wmi.24.2024.02.12.14.04.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Feb 2024 14:04:29 -0800 (PST) Message-ID: <39911d5e-b839-407c-844e-39d940c7e887@jkqxz.net> Date: Mon, 12 Feb 2024 22:04:54 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Mark Thompson In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 01/23] avutil/hwcontext_opencl: Use proper OpenCLFramesContext 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 12/02/2024 00:01, Andreas Rheinhardt wrote: > The currently used pointer when unmapping DXVA2 and D3D11 > actually points to an OpenCLDeviceContext. > > Signed-off-by: Andreas Rheinhardt > --- > 1. I'd appreciate testing of this. DXVA2 mapping tested and working on AMD. D3D11 mapping doesn't work on AMD for unrelated reasons. D3D11 mapping tested and working on Intel. DXVA2 didn't work on that test machine at all (old laptop, I think Nvidia was causing the problem). > 2. Most of the patches in this patchset can be applied immediately; > only those two patches that remove AVHWDeviceInternal and > AVHWFramesInternal need to be applied at the bump. > > libavutil/hwcontext_opencl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c > index 247834aaf6..c1764ed098 100644 > --- a/libavutil/hwcontext_opencl.c > +++ b/libavutil/hwcontext_opencl.c > @@ -2346,7 +2346,7 @@ static void opencl_unmap_from_dxva2(AVHWFramesContext *dst_fc, > { > AVOpenCLFrameDescriptor *desc = hwmap->priv; > OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv; > - OpenCLFramesContext *frames_priv = dst_fc->device_ctx->internal->priv; > + OpenCLFramesContext *frames_priv = dst_fc->internal->priv; > cl_event event; > cl_int cle; > > @@ -2511,7 +2511,7 @@ static void opencl_unmap_from_d3d11(AVHWFramesContext *dst_fc, > { > AVOpenCLFrameDescriptor *desc = hwmap->priv; > OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv; > - OpenCLFramesContext *frames_priv = dst_fc->device_ctx->internal->priv; > + OpenCLFramesContext *frames_priv = dst_fc->internal->priv; > cl_event event; > cl_int cle; > LGTM, good spot. Thanks, - Mark _______________________________________________ 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".