From 73cd763b010732ec84bfaab390fb8381eded1b73 Mon Sep 17 00:00:00 2001 From: Haihao Xiang Date: Tue, 4 Aug 2020 12:55:35 +0800 Subject: [PATCH] msdk: exclude the audio code for MFX version 2.0+ MFX version 2.0+ no longer supports audio functions, please refer to the links below for details https://spec.oneapi.com/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html#msdk-full-name-feature-removals https://github.com/oneapi-src/oneVPL This is in preparation for oneVPL support Part-of: --- sys/msdk/msdk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/msdk/msdk.c b/sys/msdk/msdk.c index a4ce2c50df..df7fd75839 100644 --- a/sys/msdk/msdk.c +++ b/sys/msdk/msdk.c @@ -123,10 +123,12 @@ msdk_status_to_string (mfxStatus status) return "device operation failure"; case MFX_ERR_MORE_BITSTREAM: return "expect more bitstream buffers at output"; +#if (MFX_VERSION < 2000) case MFX_ERR_INCOMPATIBLE_AUDIO_PARAM: return "incompatible audio parameters"; case MFX_ERR_INVALID_AUDIO_PARAM: return "invalid audio parameters"; +#endif /* warnings >0 */ case MFX_WRN_IN_EXECUTION: return "the previous asynchronous operation is in execution"; @@ -144,8 +146,10 @@ msdk_status_to_string (mfxStatus status) return "the value is out of valid range"; case MFX_WRN_FILTER_SKIPPED: return "one of requested filters has been skipped"; +#if (MFX_VERSION < 2000) case MFX_WRN_INCOMPATIBLE_AUDIO_PARAM: return "incompatible audio parameters"; +#endif default: break; }