From patchwork Sun Apr 22 15:29:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8573 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2855440jad; Sun, 22 Apr 2018 08:33:00 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+lSX1Y7EV7C9EYq39C8EM0rYwlQQj9aQkxGDkQULDMtjhiB7DaXwzrOrtETZWaFi4LZTkb X-Received: by 10.28.39.195 with SMTP id n186mr7855980wmn.1.1524411180843; Sun, 22 Apr 2018 08:33:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411180; cv=none; d=google.com; s=arc-20160816; b=ipBH7LucIlf5zJ2196GOaosvWUVEpTUE8HWegbMioZldetJ9ntUs1XLMGyMQTHT/qO piFRwJf30IfUmMP1a+64AVtK16XI6yV+jKBt/pi/v94lYwvngdAcY0i9iLFbK/Do7WDL +RIsvhsKxn8//VVytpspr7WQ54ZJu9qPkPLpauUDSrDvLGD/plLEc3/acin5K3RcOI3X FWcjEzbWiXSGJkD3zOOQcHiNITBNGlgEQVcleD3lkeBnF54aNxqOKn9qHykMtX8iVS/G qETwNG1FePUQ+VxFk1K6TJFdcvY9NqzfQ1HpdVJ0MMwgRITU+c0iaKHqv5rIhuSWHeeI 8qSg== 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=rrT/9ByXNDJjKNT0K39mSMWmNdhWUkZKQ5AgDpIhMjk=; b=ad60Vb/cKfvujT6+V0z6trx68kCa62BVGJh4PcPCKy+bgYycxav6GnI7kiWs02ttN7 tpgTk7xnLxo5R82JKkJtapfo50ptmsdumnChOq2MQjl1N3am9N3RXI4GZ3z5MXqkwI37 ImfK2Eey+4b714jn9V5TL4ZL2uXjmEj8tniFQ2q5cBzv5G03ajGxVZtZGkYqgu58YI1H iP+1WJtaO9E2t3AeWEQyB4cWsl1viYOFAjBsdJyhx6BTAXAzk6RKxKj3h11VOS7KfVVA p2zZjXNhDDdtk3SEeNshfO5TRl9bSfaMJU2ZUVrn8zI/R/03fJzhuiiIPPTr8vngGBtN dflQ== 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=ustl7876; 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 l6-v6si5094920wrm.388.2018.04.22.08.33.00; Sun, 22 Apr 2018 08:33:00 -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=ustl7876; 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 D1B1B68A3B0; Sun, 22 Apr 2018 18:29:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CB5968A38D for ; Sun, 22 Apr 2018 18:29:22 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id g21-v6so7127539wrb.8 for ; Sun, 22 Apr 2018 08:29:51 -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=LHUz5bdNavqmIU2x3I3E8b5+J8bRynOv7/VuRAzaErY=; b=ustl7876Vb2WBpxXQMUlrph4PjOw1yp9Go3EPBLKcjAH5xi7EWmgWh8eV3AJ90J59a hi06tD5b4X2CVRL1W1lN+d7cqQxlYUZHMgGH5HgW4yG9DxdroXNx7ImC/sVvsVKi9xiu WsUKhidIlROYnfU26nhXcQtonRtgtr+RABWq2O/XXYIaOV3e0rZdaM5uPP8SBs4/6I56 MwHLP8tWm0gZLEYgSKrrfkHBDrsc2W9K/THprhZOcDZvbEkU0UninzbiYJyMn/vxHhQO rsbNSefUlSbZz9C6b8RSN8vRnLfu3W28cyqkZ2Yerxhe2eYYv+3A+oXL1VWOv9jQkvOs IDOw== 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=LHUz5bdNavqmIU2x3I3E8b5+J8bRynOv7/VuRAzaErY=; b=qALMpBMbIC0BgeasFDLHN99tEb8gEgJZ7LSoF06l3KUKkAczZKTWpf+HQSxZXDm3kJ PpS1UGt/lH5oqIUNRHvuVr30DqTuO+N2Jbjnyh05SYYn6JPnesByueM8AtcskMXxjcsi CLebM5CxkeTHfujj8JpCnje4Pzhl7QN1M23vyuwYUa5sw8JBX6IhCDqjsRPspIAlcugs OC++gUofxzDNZPGSuqyLRUXf9pZ5Q2qgpl9TkpJfWee+DdiykvFsQy0H872e5LIf7zy/ tCxqZh1KklVZftqMoQgouJXQbLDuyyIOt0T1EVIRw/2XkAqRev2+7NfvIf1vX5S3RZqx yBDg== X-Gm-Message-State: ALQs6tAf6S47n/QLz6DEuiZ/KOHUj9xn8SCyT7nHUCX2SKgg3JOT5AXC nYOPkf5dCXOmK+ycnC6CYjimoMnI X-Received: by 2002:adf:9ae5:: with SMTP id a92-v6mr14209950wrc.180.1524410990633; Sun, 22 Apr 2018 08:29:50 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:49 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:17 +0100 Message-Id: <20180422152921.32510-23-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 22/26] 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 53a5b02822..89e4396901 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"); } }