From patchwork Mon May 6 14:49:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 13012 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EC5BE448B0E for ; Mon, 6 May 2019 17:56:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA9D668AB8A; Mon, 6 May 2019 17:56:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA64268AAA5 for ; Mon, 6 May 2019 17:56:44 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id b10so16225879wmj.4 for ; Mon, 06 May 2019 07:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=631IcpCQPikVvhQy8ovx16FC6WPjqKPlUT2n+diy/F8=; b=MXHe3OkfcXLCCQ46Zg3g6WgjPGsRaBj0S+pwJMH5ftvwHAbdogjjGRTrjMRsIYaOGv tl1HI3OfRt1Fbu2dJkcLDWXTFuxumUyvZeMYd1F1uzvdS5LwTzEGsjsRuqTXJxl4TnAu cS8d9QuEJjmG3M449gQIf1gZvTzq5QKQzf2MbTCSMmUG5qkO/9cUBDeql7KBviqgp903 rccV22hV4rD4OHD0SwhCgq5Z6hPz0xf2g/g1b4TJey5y3nUI7M64CjnIAxLUEQQOHtjE nn3jkEtjV1BD4+lQ1r+mCVfwSdzcCcvMh+smA5nsNSuvpCnbHDMSYDkrAn8iXCC1TmNg 4ZOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=631IcpCQPikVvhQy8ovx16FC6WPjqKPlUT2n+diy/F8=; b=rZm64ObHGmTUQbQQ8FdKbf0QfyzrAo+PMRNEmb6PioxLwBzYtzFGtl4jObiLBjPV48 IZRwy1M0042T6Jb0cfAoYkh3fFR///XVXpEgwmkk1vlbdNW42ONmvdXO6F7saHGIJ4ge rrGDCwNwDZZXWAEe+4nKym+o28wGbNifOKiZvyC6dk4ScLoQXreX4zHgtCNir2oXTE62 aRCLs4H9F9SYxHtunECSyUAUPuIgnZofQ1ZtUWFg/DR3671QuOoYvAtkZnFTHJWyC/2T V4e9FG8o8Sx3Aq1YyZRDmkWwuWbXbYdRwaRI/ErdQ1sgINEX1WI0nw0CGmpsdDtZzh4T oxuA== X-Gm-Message-State: APjAAAWhPEGmhvEORYti/HTs+Y1XkbkwmH4zalnCL3H99v1AxVG8mJRO fOi4J7jm5JRAAYg5FP3GDmK65pvWivA= X-Google-Smtp-Source: APXvYqyMClsNTwXCS9D6gm7Btsnmh8BUZI5NQk9hLMIHrjW7RHbdVJQRvRHuIY04Iy1f23pJRvegtA== X-Received: by 2002:a7b:cb04:: with SMTP id u4mr16911951wmj.0.1557154176643; Mon, 06 May 2019 07:49:36 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id l19sm14691742wrg.29.2019.05.06.07.49.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 07:49:35 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2019 15:49:26 +0100 Message-Id: <20190506144928.28501-6-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506144928.28501-1-sw@jkqxz.net> References: <20190506144928.28501-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] hwcontext_vaapi: Try to create devices via DRM before X11 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Opening the device via X11 (DRI2/DRI3) rather than opening a DRM render node directly is only useful if you intend to use the legacy X11 interop functions. That's never true for the ffmpeg utility, and a library user who does want this will likely provide their own display instance rather than making a new one here. --- libavutil/hwcontext_vaapi.c | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 35883d7855..1219b75784 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1500,27 +1500,6 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, try_x11 = HAVE_VAAPI_X11; } -#if HAVE_VAAPI_X11 - if (!display && try_x11) { - // Try to open the device as an X11 display. - priv->x11_display = XOpenDisplay(device); - if (!priv->x11_display) { - av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display " - "%s.\n", XDisplayName(device)); - } else { - display = vaGetDisplay(priv->x11_display); - if (!display) { - av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display " - "from X11 display %s.\n", XDisplayName(device)); - return AVERROR_UNKNOWN; - } - - av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via " - "X11 display %s.\n", XDisplayName(device)); - } - } -#endif - #if HAVE_VAAPI_DRM while (!display && try_drm) { // If the device is specified, try to open it as a DRM device node. @@ -1588,6 +1567,27 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, } #endif +#if HAVE_VAAPI_X11 + if (!display && try_x11) { + // Try to open the device as an X11 display. + priv->x11_display = XOpenDisplay(device); + if (!priv->x11_display) { + av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display " + "%s.\n", XDisplayName(device)); + } else { + display = vaGetDisplay(priv->x11_display); + if (!display) { + av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display " + "from X11 display %s.\n", XDisplayName(device)); + return AVERROR_UNKNOWN; + } + + av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via " + "X11 display %s.\n", XDisplayName(device)); + } + } +#endif + if (!display) { if (device) av_log(ctx, AV_LOG_ERROR, "No VA display found for "