From patchwork Fri May 11 07:52:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8921 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp374399jad; Fri, 11 May 2018 00:53:12 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo0ZqS72ekrisGXkDJgEVK1qtHwfppJypujEP8bVjLItD9Xf7Fj/UONiLysTuSs8AhIkR7D X-Received: by 2002:adf:dfcc:: with SMTP id q12-v6mr3671145wrn.68.1526025192882; Fri, 11 May 2018 00:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526025192; cv=none; d=google.com; s=arc-20160816; b=bgxS93h88dMTye2bL1crrABjOBNjwYQwuYohTQfXC3AKE8Bd3pPEcwJZR/6E8OxJ/s AMvOwK2+z0hMulKuCVP/8kABw3dq+qOzMI3OI0fvO8/7M+Pt5crgOGdst+reIENASHKp 5ns0k/bwSzJMCqaw7ECCGOvxRT6ibAM1Vvb6wdUk+XlHWKxHW7706hQBjdyX4Cm9exQJ MfWcawWu1KEPrzO1XGM2xHJ/D/yvXPC17CAAYgYEXq64vJBCzb8E9LCuH/nvF7kXuk+J +ExSz+FsxerRW2XO0iCODZ396O9x+64qjM5IYDzoQ9nJITXwYGVFWMvh7JcwRcsBwkMS C+aQ== 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:delivered-to :arc-authentication-results; bh=QsAfFl4XyGoAH7BJ8xGzuxtwsfF0YfjMxnMU3sc9n4o=; b=cryO6DOSvAxOuHnHhmOqEG4cgGQDUQ63PEyBqe75C5Q40LVVBXP8cCwqa/WF2gztCK eyDdHADvABGd4dB4UX+Go73ZJjzq4H0Zn9rKZDkaLOTAu2O20NJMY8D+Yxe1YzEU1iku wzGoae0yGse7pqUBuDXGXMZe49mrszn8hoUCcXBd8ewHJCYlmIZElNG+d1rtsMBkGuxp xGvUTLq9OINR13HWtHIMvaqEipCwNuBw3YdstGqv8oLMb4tQI7uvngJsYTJATzo5nYAw PbLEugkw4ISQ6t/+MHjV7krG+vJDdejcXuS58E6yNuoc99ydTzTV8Azfvw5gb5VAaZjN KaqQ== ARC-Authentication-Results: i=1; mx.google.com; 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 h185-v6si503834wmf.50.2018.05.11.00.53.12; Fri, 11 May 2018 00:53:12 -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; 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 E3CE968A941; Fri, 11 May 2018 10:52:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71EB768A59C for ; Fri, 11 May 2018 10:52:27 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 May 2018 00:53:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,387,1520924400"; d="scan'208";a="50001238" Received: from xhh-skl64.sh.intel.com ([10.239.159.70]) by orsmga003.jf.intel.com with ESMTP; 11 May 2018 00:52:59 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 May 2018 15:52:42 +0800 Message-Id: <20180511075242.28201-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] qsv: Use the installed mfx include headers if possibile 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: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently an extra copy of mfx include headers from {MSDK_INSTALL_PREFIX}/include to {MSDK_INSTALL_PREFIX}/include/mfx is required when using pkg-config for libmfx detection. This fix checks the installed mfx include headers first, and falls back to the legacy way if that fails Signed-off-by: Haihao Xiang --- configure | 3 ++- fftools/ffmpeg_qsv.c | 5 +++++ libavcodec/qsv.c | 10 ++++++++++ libavcodec/qsv.h | 4 ++++ libavcodec/qsv_internal.h | 4 ++++ libavcodec/qsvdec.c | 4 ++++ libavcodec/qsvdec.h | 4 ++++ libavcodec/qsvdec_h2645.c | 4 ++++ libavcodec/qsvdec_other.c | 4 ++++ libavcodec/qsvenc.c | 5 +++++ libavcodec/qsvenc.h | 4 ++++ libavcodec/qsvenc_h264.c | 4 ++++ libavcodec/qsvenc_hevc.c | 4 ++++ libavcodec/qsvenc_jpeg.c | 4 ++++ libavcodec/qsvenc_mpeg2.c | 4 ++++ libavfilter/qsvvpp.h | 4 ++++ libavfilter/vf_deinterlace_qsv.c | 4 ++++ libavfilter/vf_scale_qsv.c | 4 ++++ libavutil/hwcontext_opencl.c | 4 ++++ libavutil/hwcontext_qsv.c | 4 ++++ libavutil/hwcontext_qsv.h | 4 ++++ 21 files changed, 90 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a1f13a7109..e1f72495fb 100755 --- a/configure +++ b/configure @@ -6007,7 +6007,8 @@ enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kv # Media SDK or Intel Media Server Studio, these don't come with # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. -enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || +enabled libmfx && { { check_pkg_config libmfx libmfx "mfxvideo.h" MFXInit && add_cflags -DMFX_DEFAULT_INC_PATH; } || + { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit; } || { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 7442750029..aa6f8d5270 100644 --- a/fftools/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c @@ -16,7 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif + #include #include "libavutil/dict.h" diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 45e1c25c68..88f68d6ab5 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef MFX_DEFAULT_INC_PATH +#include +#include +#include +#else #include #include #include +#endif #include #include @@ -36,8 +42,12 @@ #include "qsv_internal.h" #if QSV_VERSION_ATLEAST(1, 12) +#ifdef MFX_DEFAULT_INC_PATH +#include "mfxvp8.h" +#else #include "mfx/mfxvp8.h" #endif +#endif int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) { diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h index b77158ec26..0116fe9422 100644 --- a/libavcodec/qsv.h +++ b/libavcodec/qsv.h @@ -21,7 +21,11 @@ #ifndef AVCODEC_QSV_H #define AVCODEC_QSV_H +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/buffer.h" diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 394c558883..f77ad63664 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -21,7 +21,11 @@ #ifndef AVCODEC_QSV_INTERNAL_H #define AVCODEC_QSV_INTERNAL_H +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/frame.h" diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 32f1fe79d7..9921158100 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -24,7 +24,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/hwcontext.h" diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index 5b7b03a48b..3b4541fff1 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -26,7 +26,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/fifo.h" #include "libavutil/frame.h" diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 831252f2d7..e2b90afee9 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -25,7 +25,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/fifo.h" diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c index 3c872dcfc2..dd0082164b 100644 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@ -24,7 +24,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/fifo.h" diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3ce5ffecd5..3dbb23716c 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -23,7 +23,12 @@ #include #include + +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/hwcontext.h" diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index d48272224c..16cd74eccf 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -26,7 +26,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/avutil.h" #include "libavutil/fifo.h" diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 7aa65e96bc..6ba85ea50a 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -24,7 +24,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 4339b316a3..a5ed2ef38b 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -22,7 +22,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c index c18fe91940..b0300faa33 100644 --- a/libavcodec/qsvenc_jpeg.c +++ b/libavcodec/qsvenc_jpeg.c @@ -22,7 +22,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index a7427d8109..ff1907237b 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -22,7 +22,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h index ff02b64c41..401bc45bd4 100644 --- a/libavfilter/qsvvpp.h +++ b/libavfilter/qsvvpp.h @@ -24,7 +24,11 @@ #ifndef AVFILTER_QSVVPP_H #define AVFILTER_QSVVPP_H +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "avfilter.h" diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index c9e76c6056..45db51b7cf 100644 --- a/libavfilter/vf_deinterlace_qsv.c +++ b/libavfilter/vf_deinterlace_qsv.c @@ -21,7 +21,11 @@ * deinterlace video filter - QSV */ +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include #include diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c index d1189942d1..f242a49f96 100644 --- a/libavfilter/vf_scale_qsv.c +++ b/libavfilter/vf_scale_qsv.c @@ -21,7 +21,11 @@ * scale video filter - QSV */ +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include #include diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 43b5c5ae0c..ab105287d1 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -46,7 +46,11 @@ #endif #if HAVE_OPENCL_VAAPI_INTEL_MEDIA +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include #include #include "hwcontext_vaapi.h" diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 250091c4e8..61e7a55e99 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -19,7 +19,11 @@ #include #include +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif #include "config.h" diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h index b98d611cfc..56180394fc 100644 --- a/libavutil/hwcontext_qsv.h +++ b/libavutil/hwcontext_qsv.h @@ -19,7 +19,11 @@ #ifndef AVUTIL_HWCONTEXT_QSV_H #define AVUTIL_HWCONTEXT_QSV_H +#ifdef MFX_DEFAULT_INC_PATH +#include +#else #include +#endif /** * @file