From patchwork Wed Nov 14 21:25:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11026 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 E9D1B44CC14 for ; Wed, 14 Nov 2018 23:25:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C746A68828C; Wed, 14 Nov 2018 23:24:31 +0200 (EET) 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 B7ECD680D20 for ; Wed, 14 Nov 2018 23:24:25 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p2-v6so15994976wmc.2 for ; Wed, 14 Nov 2018 13:25:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=+EHAtQyHu+UqcVTKMUJGm9CBWNzZ7egU6apxjnw/pwY=; b=D5zAQJtByCtd2KQDkCVoZCzjusMxnkSzWsgSgvZKYhu3RJ/wifjw0PscqMkNWcMsS9 0JBzxUzmW9VulS7vAceJzLaq6u7zwZA0/eUHHneNtICe3eVWZLMghTxyS+qkmr6qbE6G CsKWmHqvGZi8El/0bzPrYH58pt8EiIC4dNAAO1CHNn1qBVHdzO+ekfB6EDsq8NWh6hPY C2ANGDUp001T2AGLX//QYr13rYN+0gPVmEAUzful0F8yU2yfBfhOCXsnW6Y1MPbXPMfL HHv9R3hMP2IPBg11+ZIZv7LLXrvA4F54cm/wb99IrsUGXbvF8kxxY0tqXhivVXA6EDy0 KLCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+EHAtQyHu+UqcVTKMUJGm9CBWNzZ7egU6apxjnw/pwY=; b=nHtSo0/0YjgnWHgz/EEmY/n8ysW050BmplV0RDWctgXVSkfIJc5d+grIoTbJ9EfaIh zGNodXRT3aLQbSVaAJy1aaBRict6bsHOuIEZZnh1UKjLhtLzhcq+73eKMOfWVKI3xwlU HxnjNTUZDHjuJFH9gim49fyG4yeXDzDW+ZIdq6A8mjFN/3+MtlfLhBtBZYTlTrIsG7h5 xy5letfIWTJ6Ovu3aPMqYiAxOmQ9BqvBr/LsDgk/WNk+xMp8DtpKr0uu0og+ccEydSrf JL+Sp/Aw+jWLt/7FzC0sYc6pskC/eVAAtQxCq8DZlVEQ5JRYdChxWAn18imyBfInh6E2 oqIA== X-Gm-Message-State: AGRZ1gIacP7JR3tdmTKl+u1YuSg0kFPU6S495fO6yY2NTX0fQ8jn1teF nBs5P+0WL+0d/0Ol7v7bOPBXlzKfB0k= X-Google-Smtp-Source: AJdET5fHLrln8mOxyojBfVESBA2PF6tc/QpF8m6ka1aHbSivVgC+MxXmzyJgS+50AxxraGaU0c4pyw== X-Received: by 2002:a1c:7ec9:: with SMTP id z192-v6mr3407399wmc.43.1542230702836; Wed, 14 Nov 2018 13:25:02 -0800 (PST) Received: from [192.168.0.4] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id o62-v6sm15999739wma.1.2018.11.14.13.25.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 13:25:01 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <04a7eb97-a5ae-f630-bdca-b3e268549692@jkqxz.net> <20181114120551.GT3343@michaelspb> From: Mark Thompson Message-ID: Date: Wed, 14 Nov 2018 21:25:00 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181114120551.GT3343@michaelspb> Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v2] hwcontext_vaapi: Add option to set driver name 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" For example: -init_hw_device vaapi:/dev/dri/renderD128,driver=foo This may be more convenient that using the environment variable, and allows loading different drivers for different devices in the same process. --- On 14/11/18 12:05, Michael Niedermayer wrote: > On Wed, Nov 14, 2018 at 12:21:07AM +0000, Mark Thompson wrote: >> ... >> + vas = vaSetDriverName(display, driver->value); > > this breaks build here on ubuntu: > > CC libavutil/hwcontext_vaapi.o > libavutil/hwcontext_vaapi.c: In function ‘vaapi_device_create’: > libavutil/hwcontext_vaapi.c:1537:9: error: implicit declaration of function ‘vaSetDriverName’ [-Werror=implicit-function-declaration] > vas = vaSetDriverName(display, driver->value); > ^ > cc1: some warnings being treated as errors > make: *** [libavutil/hwcontext_vaapi.o] Error 1 > make: Target `all' not remade because of errors. Ah, apologies - that API is newer than I thought. Here's a new version with suitable guards. Thanks, - Mark libavutil/hwcontext_vaapi.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 8624369bb9..4a4ecc44d7 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1469,6 +1469,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, { VAAPIDevicePriv *priv; VADisplay display = NULL; + const AVDictionaryEntry *driver; priv = av_mallocz(sizeof(*priv)); if (!priv) @@ -1530,6 +1531,25 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR(EINVAL); } + driver = av_dict_get(opts, "driver", NULL, 0); + if (driver) { +#if VA_CHECK_VERSION(0, 38, 0) + VAStatus vas; + vas = vaSetDriverName(display, driver->value); + if (vas != VA_STATUS_SUCCESS) { + av_log(ctx, AV_LOG_ERROR, "Failed to set driver name to " + "%s: %d (%s).\n", driver->value, vas, vaErrorStr(vas)); + vaTerminate(display); + return AVERROR_UNKNOWN; + } +#else + av_log(ctx, AV_LOG_WARNING, "Driver name setting is not " + "supported with this VAAPI version.\n"); + vaTerminate(display); + return AVERROR(ENOSYS); +#endif + } + return vaapi_device_connect(ctx, display); }