From patchwork Mon May 6 14:49:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 13009 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 0B78B4482AD for ; Mon, 6 May 2019 17:49:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA07268AD4C; Mon, 6 May 2019 17:49:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7725868A772 for ; Mon, 6 May 2019 17:49:34 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id w12so4179138wrp.2 for ; Mon, 06 May 2019 07:49:34 -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=HMoyBgYkCCagF2pz+2QXIKQfmbl2WIFaQMl988oM30g=; b=Thup1LBDooIwGFjTg2GmPwM6xmzJ8fWZYwtJC5B/WUDRMWIhGfkDB8h1SlbPz54ri5 7L+G/Diazx4wi3mAK43gJBRlPjgTRO6nh7isuWbnH9GuaY9iY338F5+yVVPel5Ja6+UX EPzDzEtdyQT4KxUpfSj8NNuoexhi11knOulxII/W56oiZ0dgQ4CM2A5gQzTyOuxqkqOf ypw+7iQubVu6oE9M7CIPP1rzRwA9EmNSNlW74SH37TEzopNb9K3firjmwOZkkbVgmuFJ 7CGKAxELx/hCFn6YXdKlAAUE/UQVUnojmsU2NGCWksQuc95X02XscBzaEqHai/PNzGvf v0RA== 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=HMoyBgYkCCagF2pz+2QXIKQfmbl2WIFaQMl988oM30g=; b=nC9rtdsHp1BfC4wARu2Wrd9zvzGvLUFggYZMRGcarFMCudw4qTpMlGQ83WImJe2jrq NwcweffUVS2P0wnMDrw/R4b++CImHuNS6WnxVajlDLQHJtEiaD9xBOKTiCvhTZ2Qih6M X3YuZ2itVMODmf4rPEQGPyXKyVojcXElGbqwe8okBnIhvMlGMdZ4kdEixwi1tXhXQLHc E3AFjoUa2Hggv/5pWbZXvueqf7HkorUsBhC18/FfqkHhuMLIKeyTs//v6cpL4VhbudpC CXT2ZBNP6aX2R+93mCFKXn5hV9q2TCdZ5yq+WZ8bjf9uoEoEoyzKLurExNCHDUXhkjX0 241w== X-Gm-Message-State: APjAAAVicU+0Khw/jD+0MdOT2DrHdaPsNVxofgL38ZIHSAbeQLBk9l6+ jcSW4eDXGzgyYK149FIsuIJfz9FT7H4= X-Google-Smtp-Source: APXvYqxn79OvstNiBG9XaSG8m/nv/wN1ujJbCVwpkjEKdGBg0SztMzCBH5Nf3Aa4FD5IPKkZ3twarw== X-Received: by 2002:adf:f2c7:: with SMTP id d7mr2755434wrp.320.1557154173768; Mon, 06 May 2019 07:49:33 -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.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 07:49:32 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2019 15:49:23 +0100 Message-Id: <20190506144928.28501-3-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 3/7] hwcontext_vaapi: Add option to specify connection type 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" Can be set to "drm" or "x11" to force a specific connection type. --- libavutil/hwcontext_vaapi.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 8624369bb9..561b82fcce 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1469,6 +1469,8 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, { VAAPIDevicePriv *priv; VADisplay display = NULL; + const AVDictionaryEntry *ent; + int try_drm, try_x11, try_all; priv = av_mallocz(sizeof(*priv)); if (!priv) @@ -1479,8 +1481,26 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, ctx->user_opaque = priv; ctx->free = vaapi_device_free; + ent = av_dict_get(opts, "connection_type", NULL, 0); + if (ent) { + try_all = try_drm = try_x11 = 0; + if (!strcmp(ent->value, "drm")) { + try_drm = 1; + } else if (!strcmp(ent->value, "x11")) { + try_x11 = 1; + } else { + av_log(ctx, AV_LOG_ERROR, "Invalid connection type %s.\n", + ent->value); + return AVERROR(EINVAL); + } + } else { + try_all = 1; + try_drm = HAVE_VAAPI_DRM; + try_x11 = HAVE_VAAPI_X11; + } + #if HAVE_VAAPI_X11 - if (!display && !(device && device[0] == '/')) { + if (!display && try_x11) { // Try to open the device as an X11 display. priv->x11_display = XOpenDisplay(device); if (!priv->x11_display) { @@ -1501,7 +1521,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, #endif #if HAVE_VAAPI_DRM - if (!display) { + if (!display && try_drm) { // Try to open the device as a DRM path. // Default to using the first render node if the user did not // supply a path. @@ -1525,8 +1545,12 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, #endif if (!display) { - av_log(ctx, AV_LOG_ERROR, "No VA display found for " - "device: %s.\n", device ? device : ""); + if (device) + av_log(ctx, AV_LOG_ERROR, "No VA display found for " + "device %s.\n", device); + else + av_log(ctx, AV_LOG_ERROR, "No VA display found for " + "any default device.\n"); return AVERROR(EINVAL); }