From patchwork Tue Sep 18 22:30:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10370 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp12425jap; Tue, 18 Sep 2018 15:33:37 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZmq8t/03LyJZfNd5Cl1R5Tg7bVnt0KdpqZOyCqL4df0BbsXl1q6L84azEgLKg/x+KWpWSW X-Received: by 2002:a1c:a386:: with SMTP id m128-v6mr16509781wme.139.1537310017738; Tue, 18 Sep 2018 15:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537310017; cv=none; d=google.com; s=arc-20160816; b=dnl+okuxuBWYhwoF4mhCwVy8IbTKXybZamh2IV3EnE8gfwhhipMFfmwcur/v+0FtIl YEEwqDmTy8t+aEhDyvnACoGb8PFXDU4klnO24wPCYkWEuD8n58tVrAyHwG4PlMeUnWiz rLoBI2tbf/na59ecUYpq6F42CLuBfXO0zwx+gbT44LU9sFICbQtqpgckwG5MzgQUWkgG TT3Yl4YPd3BMYPIZmV9fIHDAbEQPNS35xhUb4v+COzWQrsPU2JxCxlEf0jMTEvlmWHRT oJgnoo6M842ZlAAczZ/boC1kMExIlAub6/Qhm/zC+OEQxA8+hQwoy3Q2r0anfmQO3yxP LJ4A== 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; bh=aGV/WplSJgsodUdsAuPBJ+HoZvM3qNdrMYdHpbcEQAI=; b=CkDB52njdHtmlCWIxsxdmmjhwCWgTM/0STFOEjSTk1NOqlZA52AMFfB80nQ3cn5TZ6 DsEZYhXHRmQaaUiYJZzmjKlrLLrW41qjyzTAzPaf62/wUekfgJomXzaeV0ravxBdLCGQ UDbGoYBVTR/Q2VLOi3EbNcIjVgI0cFkSs7as8Xl383WW1B+SGhj6cVY1f7nqDhmkGVz0 i9ud46eyyEMNpeb6sbWrBDRkRwGDq8mkzcdO8n77aWz0bSxSD+PjeMUHAMo+EFLd/ilr aushfcae9EhqlqCX2vzFg3JmcAT4ZCfrpb1w36ScTtOhkcB7WVA+xZTk8qt0nODHKu+k 7Z1w== 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=HrzrHwQt; 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 o199-v6si11749434wmd.170.2018.09.18.15.33.37; Tue, 18 Sep 2018 15:33:37 -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=HrzrHwQt; 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 931A368A54F; Wed, 19 Sep 2018 01:31:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B94B68A45E for ; Wed, 19 Sep 2018 01:31:23 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id n11-v6so4605427wmc.2 for ; Tue, 18 Sep 2018 15:31:36 -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=HrzrHwQtqDfNyIFFa9bT+6p5eeYs83+9Icz6ImiTIOpq6IQg3Yi2KpgAhsd5/Ij1kq 5A3GRwu7XDeITcPSGNeMn/owQr0PjUg0AjqmtTKbHKUEQPUzaULsRqg8wNn3bCXEaUES 8evT2WiNthc7XV8Dy81ySAf5hI7KUm6wOhcsmVWkbzgLBt+ytEawrooZE3mux4RDvVAL aZprlhyq7R36IiqeLYGqP9zFIurbzFu9u4YZBZ10tr0q79I6tEmvVdbwi3ilXjzU5t2s SVQLcxf1W67Q/DqiE0ST98/PktbLBHcaDSnU2OJFJG/P1gh3FK13SHx/6iAoJslOXSCO Ohjw== 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=iSOMfMF8+e+tW02keS+vPQZc9PCz1RAOBp6/ujeXu9O3V58XNdoSHODg/NBY6Dx+Ea QafPgP8uAfMz5OEHdlOWOGbz3y2HBOCa19jhQ+V1j6Dv+bUXHk7nm0mygCHYuYn8BaPL x2QwkKRP3Uzjpxenq8lb1WUo/+FuXpHTOn3gyqb0QUpbF3M4mOHPqEh0sD7xg5LxrYNn A/8NPUEdEWkUVJ01SgZm4svHZJxsIEBs6GseFdIO/HLqOPdeQRZBTdioM1Y4eueAaabV OYphYVh2wZ+PLnnPRv1ZMku6h8IBl/x2u5i5j2wZpy5Bij0OJ9gPOX14moPTx7wq+dl9 1J9Q== X-Gm-Message-State: APzg51CmnzZR6PVIZCw9MiPPz115EQ+xcVsFGZO2xN7cseGmuHL8WZPK a5SI7KtPwlviPm7tvIjpwKBo10sydEE= X-Received: by 2002:a1c:230f:: with SMTP id j15-v6mr18591569wmj.124.1537309895817; Tue, 18 Sep 2018 15:31:35 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:34 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:52 +0100 Message-Id: <20180918223116.14322-15-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 14/38] 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"); } }