From patchwork Sun Jun 3 03:15:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9239 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2468132jad; Sat, 2 Jun 2018 20:16:14 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK7MKpZCd8jlv/oF/q40dqmffpjQC0Y9THealMTDihTN3K/Wb3wllGlgu4csCIVHPOnByp0 X-Received: by 2002:a1c:630b:: with SMTP id x11-v6mr6264916wmb.104.1527995774105; Sat, 02 Jun 2018 20:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527995774; cv=none; d=google.com; s=arc-20160816; b=qlPjAMUSX94iVoXJDDWThAsd2nogY5aXcOL9qoesKlnddEq4ZELZTy8RSJRofJyTs0 bx/QvhUGEYRq6lxvam4+cDy+CdyVROhh07Bz04YLwz8fNLbwtJU4vLhYK0VLvJybxXVk 0REr1cG578S+YzRxmeBpyI4ZkB0RWFRvTQqjTunPox10fKiLX+X1E2up826SMwjR5u73 IedSLZNO2EIfcSfyIYefQd/A2tYmcES92Rt3bLOd5U0p19GjuUIyN0FNXJaBxlF0iaFL TUOMCJbmtzlvxL7B04yrkQBz7K+pr6J0OcbqEBgCW6q4fGeHs3NBFzdY0COBPRHWiRP2 98Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=mgW4BhopT0L6D8KRBGbKHuY3kKr79aQ3mh5U6fxG6G4=; b=G12yX4wgBd9urtO416ODB+5kWd3W/LH2XRyH6jWDleU11HyAgCrLdjoRJSIoBk0EZm hq4Di6wwEmIAx+0HiNeqjtb4ZzTYxoRwlh5rUO6BkuN+hlSt++3ed/yjBz8k6h6FdABG uQBmYzn3MlvB4IitVnPn5oEkeDUSPOa0a6Ie8dYzW8uDkXj5X05S99Vp4Xx1Xzvb/xLK VRneMdxkdmQxHy+x5PiOgAW7RcWKUOtvaXB3IcWp3azQQ4c46BhU+o7ow0+4NqzyvimL 5zZ/xk+RzCpWL3HScFuMmqPyPE+A9hNlF6rZ/zYOLVxpvRLUpUHx2P+qoRSLXSU6AZCA qVug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OVBEzGju; 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 z19-v6si4104617wma.1.2018.06.02.20.16.13; Sat, 02 Jun 2018 20:16:14 -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=OVBEzGju; 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 BBAAB68A039; Sun, 3 Jun 2018 06:15:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 981BF68A064 for ; Sun, 3 Jun 2018 06:15:01 +0300 (EEST) Received: by mail-pf0-f177.google.com with SMTP id r11-v6so6729940pfl.6 for ; Sat, 02 Jun 2018 20:15:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=InX5pE/kugKW4VyRHKs85OQKVEfBPw14bMjsmF7B0Iw=; b=OVBEzGjuOk07W3mYS6xAcwvEeqvR3ahfXlmoXBIq/uZ5PMnAT8BHEHN/zQyM8Pl9/R 4UaNNtrvygX9e9HlUf9p21cqLQdmIqjrd50cq7OiiFr8rcGu5gKwRK7n3t+pSj3cQ9Qp NY0pytetpy/DtISeqhhp+9kmv9Ac3m6VpABCpwSWd+hufpP0qld9Q7UyBqyT5DPgU2Jy +o87nkilsAIRzhwgM80ZQO+iWDof3afzWxVGxPy8U6Dmr+0YapecI9EdNJkabQpnQMwO bu51l4hRSHnGyr7ds8NP+g7exhWmGAyzHl61hSRMvkxC/QHIOGoQdW77Q/g5QywkF0SO GCgA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=InX5pE/kugKW4VyRHKs85OQKVEfBPw14bMjsmF7B0Iw=; b=A9eM3vDJs0rCsyDuOt53i0CpYbXU9s/jpULnFq3DRZ79zTWjzsEtahSF78puU+/iZT soycW/JcQtxVo/KOrkRPECZvHCvRDM9TxKCllYKcYXQKnmfWY/6P6UPaxYEC9l7Ckfz+ K3bdGjuFU+kRmRZ6ls8RzO9vLVN4BgOg5kVkLQJD3bS/dI9snymGenhRiGQMDWdNvdL0 +QMxvJT3eYirr0zOZfPOqslLFg5xg722D4G49oi8oN+6mLtuUtJvxF2DiTWTEpm2mg5f tqHiXzdU+B7V3Pg4w+75LOZAHc378koW/eHBjeX8HT+1r0xLktE8wJGyNquKg+Hjcbs9 Yn1g== X-Gm-Message-State: ALKqPwfxceHU5uyHbe9sqt+8+yf2KuoDP1zy0Zu/bX6ed3ZTImdL9kNM c2VK2aIluFiFTGhD8zkdcZ9g8w== X-Received: by 2002:a63:3807:: with SMTP id f7-v6mr13311087pga.446.1527995746228; Sat, 02 Jun 2018 20:15:46 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id i127-v6sm75618435pfc.154.2018.06.02.20.15.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Jun 2018 20:15:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Jun 2018 11:15:24 +0800 Message-Id: <1527995724-23698-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527995724-23698-1-git-send-email-mypopydev@gmail.com> References: <1527995724-23698-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/4] configure: fix check for opencl_vaapi_intel_media. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" opencl_vaapi_intel_media doesn't depend on libmfx, OpenCL™ Drivers and Runtimes for Intel® Architectureis is a standalone release, more information can be found in the link: https://software.intel.com/en-us/articles/opencl-drivers. Signed-off-by: Jun Zhao --- configure | 6 ++---- libavutil/hwcontext_opencl.c | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ede32eb..aa17c13 100755 --- a/configure +++ b/configure @@ -6326,10 +6326,8 @@ fi if enabled_all opencl vaapi ; then enabled opencl_drm_beignet && enable opencl_vaapi_beignet - if enabled libmfx ; then - check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && - enable opencl_vaapi_intel_media - fi + check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && + enable opencl_vaapi_intel_media fi if enabled_all opencl dxva2 ; then diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 9ecc361..f9b5ccc 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -46,7 +46,9 @@ #endif #if HAVE_OPENCL_VAAPI_INTEL_MEDIA +#if CONFIG_LIBMFX #include +#endif #include #include #include "hwcontext_vaapi.h" @@ -2248,10 +2250,13 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst, cl_int cle; int err, p; +#if CONFIG_LIBMFX if (src->format == AV_PIX_FMT_QSV) { mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; - } else if (src->format == AV_PIX_FMT_VAAPI) { + } else +#endif + if (src->format == AV_PIX_FMT_VAAPI) { va_surface = (VASurfaceID)(uintptr_t)src->data[3]; } else { return AVERROR(ENOSYS);