From patchwork Wed Aug 22 23:44:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10095 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1444719jap; Wed, 22 Aug 2018 16:51:47 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYWB7HnVmZtYAjrak9HiNKj0/9hVoT/PtroVjaJHrT34+1y7BRteL1MiaeVwXBDX3/N8lvN X-Received: by 2002:a1c:b213:: with SMTP id b19-v6mr3427040wmf.141.1534981907161; Wed, 22 Aug 2018 16:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981907; cv=none; d=google.com; s=arc-20160816; b=tQS5hKtlSkC6t8KpTPa67awHiPi/GZHhOJJHyXYDveK0jNAYt5J3fVhxxL4X8Hnmr3 5kFYYyUypyIyvxWxR2EAv2HtX+8vvz3pUUS9fpjFqS1hG0nuS+/c1pG+vRRui2vkuSiT iYFCG4O8ZpQQWlCDbMNIVYvC8PkhAm2VKxuaYhjJoQYQmqdAVm3rlUHJmiK3VCJQnDm1 I/RNmGulmbn+KYDPL8F0uzUmcsUXcylHOkUK4Pke39G/aMhVwOgKPIuoOW3MWIP7cdSE KnQYNcRrlqYGPhAG8qW09vgnifT0xFPWc34almEm96QxDr2BpL957lakY1w/ktl9hgmX z1ig== 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=aGV/WplSJgsodUdsAuPBJ+HoZvM3qNdrMYdHpbcEQAI=; b=CLOi3BC7dFKQCC9FDgPnSXs+DtmdmZMLeVvIJslnXDabctEAS5w+TUzC503UjZekRw gwdvEPNyNoa9/lBlhMDgVcjrLJnkQQZu/oJGJKJuzsHyUxJ/Mi5AtPyJXD2qPYZ9m9i7 lqpvMy0I0h1tXjJwE9EPFnY/s9aoXCTTvEvL4p1hfIJh7yOjcDApYmqPYaXb5RN/58Xi uuTDTLTPHZWfTSudHt8A26Lz8PJHEbQXxRWGxS6ceULfbyJZhvjpLXmzD0+tQEDYQywv fNi4S2ISpK/QLYh3HdEjGfsZXOCS+SJC9jjiS6JsnNYIkNB6kZnBANLnPm2oYKCsaUrS 6rrA== 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=zCpy3I0R; 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 n11-v6si2416823wmd.213.2018.08.22.16.51.46; Wed, 22 Aug 2018 16:51: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=zCpy3I0R; 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 DBDCC68A0B3; Thu, 23 Aug 2018 02:51:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4128B689FBC for ; Thu, 23 Aug 2018 02:51:37 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a108-v6so2973858wrc.13 for ; Wed, 22 Aug 2018 16:51:38 -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=6MaozRJfUX1RPxLfC825ysxbaA0rRueM95xSNKB7AaU=; b=zCpy3I0RJFmnNdBIgYTAvObNUHAlmebXkmx5+9SDvBs80Fcjoe27JqK5Wx8hXL3XTm oSK/WmJoM0jThKc26WXG0DQSLmq+E4udZXBbdfVPlQUG8joHDCy9OVwz0bxeXOVNARda 8tQxdZuwdrkqQjWb5dXUOWrH0/CtJgFsAWZAfEoy04s5V6X1rAEtPZGGiFS2S++aplrk 2/ZfjR4XWQw6A8obseF1vXpaZC9zICsQlyfprK0MT9F5bI5Hf88lXcahGsKDPthDd4DK pSjxq8Q/lTF3MHQ3LJ8BLd7UPsukR5cADXPKF5+o18LG+TkynGZtB8Wa5lXAInwB5OkP LJpg== 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=6MaozRJfUX1RPxLfC825ysxbaA0rRueM95xSNKB7AaU=; b=mXakGEa6JL4cSHd5YBPzHlvkgM/Y9mfs/lONqwDT/vd/nAiI8nqmj8/UDOvDTo44I2 WaQJatKNz6h1JazIhSmKIzkgAr9UkseOLWqc3/P8naxVVLuiMtu9LCjTUiuvdFItPJq4 gGzwh+L2VZElo+jaIqNrzxcr684X4ux/IM7WJt/se+g92zJkgtYeQQVr5GKMPW6mgIbW FhRumuKBk885iCWXiL6va+p/ug0IeN6bXBqt48oHdRQ1itr5v+d6JbvqtSNOMAQSNGCp l5MU2Ef+cxdsN7xCDtu4GXeAgYDdSJsR4ZApIGtq8EhpFJqFLvYLtpyoCeb1/3P1hgvB E3wg== X-Gm-Message-State: APzg51DM/SUorpCPTagZWwM2ecpdLu/sZ1j7eHuUHHpV7u9Sg/eGhR+4 UDgvcwnWu6Vmf8tdif5Ppsd4iYw7BJo= X-Received: by 2002:a5d:6604:: with SMTP id n4-v6mr655918wru.281.1534981542967; Wed, 22 Aug 2018 16:45:42 -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 x82-v6sm8184537wmd.11.2018.08.22.16.45.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:42 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:55 +0100 Message-Id: <20180822234514.10571-23-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180822234514.10571-1-sw@jkqxz.net> References: <20180822234514.10571-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v3 22/41] 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"); } }