From patchwork Mon Jun 18 12:26:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9438 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp3767591jad; Mon, 18 Jun 2018 05:55:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIuWDBjr4+tc4Nd9sW0lUgR6IbLXAuhDG0SI5Wci1dKOWYcP6Tx0hwWl5OJnTIxtjrZ9HoL X-Received: by 2002:adf:b02b:: with SMTP id f40-v6mr10730609wra.75.1529326529449; Mon, 18 Jun 2018 05:55:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529326529; cv=none; d=google.com; s=arc-20160816; b=i/66T3POqpDbnDZp4mhueXHI0QxyOfa8AyF2Ytr0kEzgwaLgNG7XUsxCUI+NIBM7E2 z8on60awuNWZSVdizkZ9t1ANSJ7mSMKWH8X/Mghoa4yOtIbv5kUAtEDQxs8P571xfMhQ TUuRwd7zFNBsrIE0GIio6b1PPiz4gFhzFGKxriv8GlAOf7c1M0cJbJBHgKHx/Y7UeV0G gnX2cY16pxAAiLEI0ZM7Rj1oMP3DgDsqiH9+/XzjF3TrgoNTAZrFEF3/OlHDjMoznYr3 1cJAGFvJrw58vjGa1FHpOU/3GCEtmi36tNfPK3aYtjUfzpt4U+SzOTMFVHcsa8Y/yRcp TNag== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=3p3G+tq/290XVIkIvsvDP7ydzncBd+LToISYPnsGPIE=; b=QYj8Sarmobk9sL76yI0SIwjtV2sKvkmS5uZ23rnb/SrWEQVdhu4dBbqPYqR+9Lb5l8 OWa1mzlc7FKiNT/seDg85NMyJN87h5YXAupOhNBTfgYcX+4ioyIQk97d1sjDJQbQrwTW yBIX3PBb7iblabHlLbdjmMtiQ6oZZ2VYBY6C6s/AhYX9kGOS691lCotPEj40XfpL9Y4X u5D0Vr7Sjao1OTJSzbQwMd9jv48JtKM8HkARLZkQY4pp2T7rUy2Xm7Al6oDT5VfeGXMB nt78omsTc7WCjIEfHXy0x8RY2rDwfAxGEIPebXzdRZsJq6zyRr64gk33gy8kUW3f/wdB qIDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mCrFB5GE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 130-v6si1408181wmo.86.2018.06.18.05.55.28; Mon, 18 Jun 2018 05:55:29 -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=@gmail.com header.s=20161025 header.b=mCrFB5GE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 980FE6898B2; Mon, 18 Jun 2018 15:54:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E95FA68087F for ; Mon, 18 Jun 2018 15:54:27 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id r21-v6so7495267pgv.4 for ; Mon, 18 Jun 2018 05:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=i78+Le19CAXHjZCvP8sOXRhJqmL7C/0hqG3Bl0RhpJg=; b=mCrFB5GEwv+8rKn2yQcpWssrjYhqaCyfOmgbKel0xDXV/k5G/iUqx4MK3CpxXrBsvk F2LsvgOEllTCUPsLFdm04nMP2NHt3nvoFa7ytzqYXEvpZItDAfFHxcOA2PAKUI5/j16Y yv40MJQhq5ELe/nTekjp1p2C8nLCGlxXvNDSz2/VQCDdRWHnqgJ/m1u+YDxlEejDXoJb PNw6469jrc5EmZLdXCKdztMu1BvsAYvTOn2cmObUxlN+NbjX+mOJdJ2OBwC0ympugOAC 7mu3imm0A0rD+KkgUroAxrRTIHI2OoDiWg5P8P4/F2bMgM22C31ZFpu6gcjN/Y4bi5/y PcNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=i78+Le19CAXHjZCvP8sOXRhJqmL7C/0hqG3Bl0RhpJg=; b=RD4uVSDa0DXZTuo92Ip1kO+w1VG20WGQcT0qiTqFhMAriY507Cpj3dRwhf6RVzy3jv Ck4PLXe2lPQuRduqfbhTF/ASD7KSR/f968X9fjpkzWUEV5N+njYUM6TBSIivpxsUXKOu bSaTNzhRRB5ZmcffKMCfiOx/mPrh9mCHy8LgGDsy+9nFB2hFs3VSOB3iilsw713HFBfa xTWD+WPtd6eEu0JedG1yhl+bnXAfpqwmDJ0CZz6s5s/qxlu6iZKWZsdN3/YNPeGWnGzk nsjyIId4pRA9gXMhMsSubl49/dOiu2+r1qzr3PjFXfVj6bm8vRCOyISCiiuPMvOKGzSJ fDgA== X-Gm-Message-State: APt69E311kzt31+RzZAUBHOBW+onUzm5YPPCdzixZ8YATz+zNUczKK2f zfz5xWAXgofWRo0EGQ+/oN9GRQ== X-Received: by 2002:a65:4e09:: with SMTP id r9-v6mr10614539pgt.369.1529324805424; Mon, 18 Jun 2018 05:26:45 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id j23-v6sm3710494pfi.137.2018.06.18.05.26.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jun 2018 05:26:44 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jun 2018 20:26:35 +0800 Message-Id: <1529324796-25679-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] hwcontext_opencl: improve the debug log in multi-platform/multi-device system. 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" after the change, use the cmd: ./ffmpeg -init_hw_device opencl=ocl:,device_type=gpu -loglevel 99 in a multi-platforms/multi-devices system get more clean log like: 2 OpenCL platforms found. 1 OpenCL devices found on platform "Portable Computing Language". 0.0: Portable Computing Language / pthread-Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz "pthread-Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz" does not match device type "gpu". 2 OpenCL devices found on platform "Intel(R) OpenCL". 1.0: Intel(R) OpenCL / Intel(R) HD Graphics 1.1: Intel(R) OpenCL / Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz "Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz" does not match device type "gpu". Signed-off-by: Jun Zhao --- libavutil/hwcontext_opencl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 07458c2..65b4a0c 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -428,7 +428,8 @@ static int opencl_filter_device(AVHWDeviceContext *hwdev, } if (!(device_type & match_type)) { - av_log(hwdev, AV_LOG_DEBUG, "device_type does not match.\n"); + av_log(hwdev, AV_LOG_DEBUG, "\"%s\" does not match device type \"%s\".\n", + device_name, param->value); return 1; } } @@ -550,6 +551,9 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev, else device_name = "Unknown Device"; + av_log(hwdev, AV_LOG_VERBOSE, "%d.%d: %s / %s\n", p, d, + platform_name, device_name); + if (selector->filter_device) { err = selector->filter_device(hwdev, devices[d], device_name, @@ -560,9 +564,6 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev, continue; } - av_log(hwdev, AV_LOG_VERBOSE, "%d.%d: %s / %s\n", p, d, - platform_name, device_name); - ++found; platform_id = platforms[p]; hwctx->device_id = devices[d];