From patchwork Wed Sep 16 06:44:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 22430 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2003C449470 for ; Wed, 16 Sep 2020 09:49:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A58F68BBA1; Wed, 16 Sep 2020 09:49:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9856A68B966 for ; Wed, 16 Sep 2020 09:49:33 +0300 (EEST) IronPort-SDR: hNF3LCNmHg8RN2MG+F+F9JF2EiDDKIvtoYM1kPA7QvIkIBeL/Xz6vPVJU+N3II5eYyjd8H2+Tq 1SihvRz+QWbg== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="158693660" X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="158693660" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2020 23:49:27 -0700 IronPort-SDR: /otVFqkmkMtlea9OPpcFXTWw6fLDD7pYXsGZQTyxHoS0E/4dWo9us3LwpuYf+5wA1qdxuRuoeL Y7t2BlkaJ0cw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="331551223" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga004.fm.intel.com with ESMTP; 15 Sep 2020 23:49:27 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 14:44:54 +0800 Message-Id: <20200916064457.181230-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916064457.181230-1-haihao.xiang@intel.com> References: <20200916064457.181230-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] qsv: libmfx no longer supports audio since version 2.0 (oneVPL) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 472e0952b3..2b77fdb2bf 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -143,8 +143,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_VERSION_ATLEAST(2, 0) { 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" }, @@ -154,7 +156,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_VERSION_ATLEAST(2, 0) { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, +#endif }; int ff_qsv_map_error(mfxStatus mfx_err, const char **desc)