From patchwork Thu Jun 7 23:43:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9307 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp194239jad; Thu, 7 Jun 2018 16:46:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ9Yy/11ffVXT7hn8cACaQkwt/hcvqufUPrRViDXjNf9FReIKZ2SPkUnoSiJhUMqTvjdLA3 X-Received: by 2002:a1c:150d:: with SMTP id 13-v6mr3120477wmv.100.1528415207077; Thu, 07 Jun 2018 16:46:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415207; cv=none; d=google.com; s=arc-20160816; b=nTqn1fnLaFs8rpYJNRqOmEm/lgIzIF01b25+4LiD7KYtssiCOUDGc+tcqd3yrBJ79E 1/KJIzpJ2pnLFJ8a9LwodkcTXuGFhWka8RubAoTnF4CauphmJpGMz/VX7nlK/vQvSPKf w02R2qXbgh9nL+EEm82GXgHdIIFdAchj4mpm3GF/OE23EQ7Wt/pz/fesqeNmkpO1olfD KtbrTsqgf1DmZXUBiyt0OR/gHrRvnt+BezvY08SwGZvDboMfLwdYVkxFRmcOfh8be0FT nXX1H0ASln426XxhpLZnm6r58oqGcH4KZaa2sm7Rq7zxOTYZlimXmwREUFIdJBx9gjRl Cxaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=xzqrHKtokRoeMxu26/icduvVzRmpri/kXMxZDeyvkIs=; b=KnjOLr6F58F+APvfwpdTZDMgPU1qPCZc2pfSwVFZbDJjHM/GhIGsS1LFxawu061spQ 1iZfUnOys5wbea7N7SdSu8hn0hcFBtMP5ae+MnJVTjJm1gG6QvS1duLBq3koVaH0He8w onWFGurwY9xk01Od3XDJpHlzfbb/ShTh4xd4NMAFdPrImx31bwaWB7QTicaD+nWAZgmn T4NY75LXPOC47xq37eRKh0wbquqOad9QqMW5Aol/V+g6jOUo6KvDexQbkRqBt7WjM0CN GqbtRFzazncEhgF1dQ1UU36H2JrhlsuU/4AfjJg3uMKGuFQ6yX18xWke6VadekJUwDFC oBgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=TSmxGsVT; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e11-v6si71221wmi.105.2018.06.07.16.46.46; Thu, 07 Jun 2018 16:46:47 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=TSmxGsVT; 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 F1E1F68A81E; Fri, 8 Jun 2018 02:43:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF58668A7FA for ; Fri, 8 Jun 2018 02:43:15 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id w10-v6so11515548wrk.9 for ; Thu, 07 Jun 2018 16:44:03 -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; bh=HGnU/BzG6qPO9PYPoowdpTHC8jIIwkT6mmAbsWng3fA=; b=TSmxGsVTFuaylNpUW/7XRN5dnZh0CRNe9YEV8oU+o67Vds1xsdn1YtMYq13t91VtXB YMuRiXPMryIILf+9gfBnEzKvORyVgx/D+3FZgQ2eg+oAg+Uq62LDINbuyYtiqennrBSN QZbUpbDRIpadMw5pZORwmOv5ZU0cKo+UjjqOXw2ba9IpwXwkzjlAyjtK8/W3vRywc2Gl AqKXIGentvHvjGthp2GubatkG3hcVgF6xqWTqMz2Cer1RK5M6p7SHwtO+L2Cue+8PerA X4NHkNB4oRjJ3vaGZ099L2Xxtetlaaj9JI8m8dWqzZLXSZ5ABi3L+hhrvNsacd4f6wyK Zehw== 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; bh=HGnU/BzG6qPO9PYPoowdpTHC8jIIwkT6mmAbsWng3fA=; b=qk118cECBbAV2MKZDGbzC/smSxhUcg3jqZ7Vydr+g0sCmGeSBMwxuQme7PwHP3ikq6 9HbGbdAMy5V1Kn6hC4q9HZBCpNRBTDoaRxbmdpPwrzt7f0Hrua4KIpmqjGxja+C5CRrv 1d+Hcf0LkmUTF5n1GOG2k7fTAUk0AXu1sk4skA1WJWHHe7Y8FVyUZMWH1iRaUS0gkTAI 6WjK737LgEwTnq5zWqh70pOc7swlrCOjjpBAsK7fFTxAp2d0CqvKi1C05XYIx32JdtXJ E1lJpAjaBfjOFdYmGdwVUM1p3s5G8B1nV9Wd9HTyLfbg95bOpHuERYJ8Cgvzs/rxNQWL Eq4g== X-Gm-Message-State: APt69E0zUNdiyjkvZd2oBRvH3iq2CfwTS/T1OWn92t+yyAzvnALB8SXr O5GtD+Op6sEyaCotobYNn4XOVpOp X-Received: by 2002:a5d:4503:: with SMTP id s3-v6mr3215620wrq.191.1528415043028; Thu, 07 Jun 2018 16:44:03 -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 r2-v6sm18640545wrq.55.2018.06.07.16.44.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:44:02 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:18 +0100 Message-Id: <20180607234331.32139-24-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 23/36] hwcontext_vaapi: Improve logging around quirk detection 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Clarify that the list is the naughty list, and therefore being on it is not desirable. The i965 driver does not need to be on the list after version 2.0 (when the standard parameter buffer rendering behaviour was changed). --- libavutil/hwcontext_vaapi.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index a2387d4fc4..4088a96be4 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -279,11 +279,14 @@ static const struct { const char *match_string; unsigned int quirks; } vaapi_driver_quirks_table[] = { +#if !VA_CHECK_VERSION(1, 0, 0) + // The i965 driver did not conform before version 2.0. { "Intel i965 (Quick Sync)", "i965", AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS, }, +#endif { "Intel iHD", "ubit", @@ -344,29 +347,37 @@ static int vaapi_device_init(AVHWDeviceContext *hwdev) } } + vendor_string = vaQueryVendorString(hwctx->display); + if (vendor_string) + av_log(hwdev, AV_LOG_VERBOSE, "VAAPI driver: %s.\n", vendor_string); + if (hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_USER_SET) { - av_log(hwdev, AV_LOG_VERBOSE, "Not detecting driver: " - "quirks set by user.\n"); + av_log(hwdev, AV_LOG_VERBOSE, "Using quirks set by user (%#x).\n", + hwctx->driver_quirks); } else { // Detect the driver in use and set quirk flags if necessary. - vendor_string = vaQueryVendorString(hwctx->display); hwctx->driver_quirks = 0; if (vendor_string) { for (i = 0; i < FF_ARRAY_ELEMS(vaapi_driver_quirks_table); i++) { if (strstr(vendor_string, vaapi_driver_quirks_table[i].match_string)) { - av_log(hwdev, AV_LOG_VERBOSE, "Matched \"%s\" as known " - "driver \"%s\".\n", vendor_string, - vaapi_driver_quirks_table[i].friendly_name); + av_log(hwdev, AV_LOG_VERBOSE, "Matched driver string " + "as known nonstandard driver \"%s\", setting " + "quirks (%#x).\n", + vaapi_driver_quirks_table[i].friendly_name, + vaapi_driver_quirks_table[i].quirks); hwctx->driver_quirks |= vaapi_driver_quirks_table[i].quirks; break; } } if (!(i < FF_ARRAY_ELEMS(vaapi_driver_quirks_table))) { - av_log(hwdev, AV_LOG_VERBOSE, "Unknown driver \"%s\", " - "assuming standard behaviour.\n", vendor_string); + av_log(hwdev, AV_LOG_VERBOSE, "Driver not found in known " + "nonstandard list, using standard behaviour.\n"); } + } else { + av_log(hwdev, AV_LOG_VERBOSE, "Driver has no vendor string, " + "assuming standard behaviour.\n"); } }