From patchwork Fri Mar 11 08:16:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 34675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1484946nkb; Fri, 11 Mar 2022 00:18:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDRC/nz8SJIiZhrdObAtM9Z1p1uOLwaXHgJ7Ro0h4nb7saOrXIDR4+W3V6+cAyWxucyTX3 X-Received: by 2002:a17:906:1411:b0:6da:f354:fb83 with SMTP id p17-20020a170906141100b006daf354fb83mr7318182ejc.539.1646986682571; Fri, 11 Mar 2022 00:18:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646986682; cv=none; d=google.com; s=arc-20160816; b=lFzKKWA9i9Teby9niPF4ycWPPlIqg0khH68GslPfyQE2jSGJxU0DI21aQ2yKDiO5nq ob7PwqqGMHkHbUnTJhUL8u95zwwDLlYDBwNjde0Mgr6QfVSDPO7EHnIsTSA/6brVKys7 0VIl0lkW2kg+R5l4kA+TtrcHUn1wz5xkPiGiBeZ5HgOCg1cGe819dlrBd1pX52aoGSO8 3LnYDDg0OLBDjiVzG4QqW+9r7y2GfNHTP8eC5rlA1q2nuMkQ/9bmcqRbhnylODug22jE 0SANmwh315go3fMBDHT0r+YF2Pq6qeu4VRjaOfMBdYLLsgw/RfCYTXOcwplRq/kqRQzt a9Jg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=LJOS9pGCM8xvbNM3VTCMJbfS17ghBjnpoj0HmcxtN/Q=; b=RtOVqfDTnr76BUz2zuwC0idwllMAQlv2C6i50zZhCyp+k/FnS0CcXAsYYPYkHIvOXv udSaAlZ1dwgVMupezCUS3aV7W60YdAi2SILHAe2W/GOgSqZ2SDc+AurKeRAmnxU90OZR YS+CgDQXMIt2AVc1RC3pNRmJlsuCL6RpGQNKVcWg+rFrqGPMQfGI6/JKjEmkJnxx5us6 dyaQ8VCNkXfLVoj/h9yd/tDCuvSAj8Edv0pfH/Bt0sIHI9pGa6Ym/t2XvIRe7O+g/tJy r+1lmwj79qMPDxGNK/4rMU3Vxf/EMpUkGEmUcj1IsVbS3+2gmm+tJ2IOfnLVKS6C4l0a /cnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=atchAeyC; 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 b7-20020a056402084700b00416b19d0ba7si3044606edz.58.2022.03.11.00.18.02; Fri, 11 Mar 2022 00:18:02 -0800 (PST) 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=@intel.com header.s=Intel header.b=atchAeyC; 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 24D0F68B276; Fri, 11 Mar 2022 10:17:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D28C368B20C for ; Fri, 11 Mar 2022 10:16:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646986625; x=1678522625; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=MNftrWWmZAxdQTl3xqVvgH6mtItOepgEQggiaXDf9fA=; b=atchAeyC+Kd8byK78lyhjQRBeLy08I1aXb7ccHmGMT5drBvKKSlLIw8i eydTrBCOa1VJ/AhmuXQnU9jT6cTZ1EJxM2LsJMxsJHkM++asY90hI3kdB +rQ0HTBOKbGCNBb2jO5QN1AOJ3NOYtbfZZ8l9kxGReKjxsG+667Rkn2II HU43Z4GpT950rkfzBqdjl+1evvadta8nLqBwWzzN+KNreM4o2XGQL6s1q 2XdjG7ccJYLZBCUzW+dLF1HCXaK5BM0+4/96/O3eOgpV+xZvuSYJW1u+X T4MwG8ekvC5vvhW/vW23wdhMiBLhxLh9cA7ACsoT41g1MSS34P6wM8i1S g==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="237700142" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="237700142" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:54 -0800 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="688997032" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:53 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 16:16:25 +0800 Message-Id: <20220311081630.21927-6-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311081630.21927-1-haihao.xiang@intel.com> References: <20220311081630.21927-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v7 05/10] qsv: build audio related code when MFX_VERSION < 2.0 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gct8+uSYKjTS From: Haihao Xiang Audio isn't supported for MFX_VERSION >= 2.0[1][2]. This is in preparation for oneVPL support [1]: https://spec.oneapi.io/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals [2]: https://github.com/oneapi-src/oneVPL --- libavcodec/qsv.c | 5 +++++ libavfilter/qsvvpp.c | 6 ++++++ libavfilter/qsvvpp.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 0eb0d83ac0..063d6dfb0a 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -37,6 +37,7 @@ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) #define QSV_HAVE_USER_PLUGIN !QSV_ONEVPL +#define QSV_HAVE_AUDIO !QSV_ONEVPL #if QSV_VERSION_ATLEAST(1, 12) #include "mfxvp8.h" @@ -137,8 +138,10 @@ static const struct { { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" }, { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" }, { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" }, +#if QSV_HAVE_AUDIO { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" }, { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" }, +#endif { MFX_WRN_IN_EXECUTION, 0, "operation in execution" }, { MFX_WRN_DEVICE_BUSY, 0, "device busy" }, @@ -148,7 +151,9 @@ static const struct { { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" }, { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" }, { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" }, +#if QSV_HAVE_AUDIO { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, +#endif }; /** diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 954f882637..3647891d13 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -38,6 +38,8 @@ #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY) #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) +#define QSV_HAVE_AUDIO !QSV_ONEVPL + static const AVRational default_tb = { 1, 90000 }; typedef struct QSVAsyncFrame { @@ -100,8 +102,10 @@ static const struct { { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" }, { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" }, { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" }, +#if QSV_HAVE_AUDIO { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" }, { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" }, +#endif { MFX_WRN_IN_EXECUTION, 0, "operation in execution" }, { MFX_WRN_DEVICE_BUSY, 0, "device busy" }, @@ -111,7 +115,9 @@ static const struct { { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" }, { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" }, { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" }, +#if QSV_HAVE_AUDIO { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, +#endif }; static int qsv_map_error(mfxStatus mfx_err, const char **desc) diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h index 543c58a967..802abd987d 100644 --- a/libavfilter/qsvvpp.h +++ b/libavfilter/qsvvpp.h @@ -40,6 +40,8 @@ ((MFX_VERSION.Major > (MAJOR)) || \ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))) +#define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0) + typedef struct QSVFrame { AVFrame *frame; mfxFrameSurface1 surface;