diff --git a/_studio/mfx_lib/decode/h264/src/mfx_h264_dec_decode.cpp b/_studio/mfx_lib/decode/h264/src/mfx_h264_dec_decode.cpp index d3826ccc7c..d1b1756605 100644 --- a/_studio/mfx_lib/decode/h264/src/mfx_h264_dec_decode.cpp +++ b/_studio/mfx_lib/decode/h264/src/mfx_h264_dec_decode.cpp @@ -93,9 +93,9 @@ struct ThreadTaskInfo mfxFrameSurface1* surface_work = nullptr; mfxFrameSurface1* surface_out = nullptr; - ThreadTaskInfo(mfxFrameSurface1* work, mfxFrameSurface1* out) - : surface_work(work) - , surface_out(out) + ThreadTaskInfo(mfxFrameSurface1* work, mfxFrameSurface1* out) + : surface_work(work) + , surface_out(out) {} }; @@ -454,7 +454,7 @@ mfxStatus VideoDECODEH264::Init(mfxVideoParam *par) umcVideoParams.lpMemoryAllocator = &m_MemoryAllocator; -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) umcVideoParams.m_ignore_level_constrain = par->mfx.IgnoreLevelConstrain; #endif diff --git a/_studio/shared/include/mfx_config.h b/_studio/shared/include/mfx_config.h index 8b190651df..e682d8ff8b 100644 --- a/_studio/shared/include/mfx_config.h +++ b/_studio/shared/include/mfx_config.h @@ -23,6 +23,10 @@ #include "mfxdefs.h" +#ifndef MFX_DEPRECATED_OFF +#define MFX_DEPRECATED_OFF +#endif + #ifdef MFX_VA #if defined(LINUX32) || defined(LINUX64) #include diff --git a/_studio/shared/umc/codec/h264_dec/include/umc_h264_dec.h b/_studio/shared/umc/codec/h264_dec/include/umc_h264_dec.h index d48efb0c07..9270c2058a 100644 --- a/_studio/shared/umc/codec/h264_dec/include/umc_h264_dec.h +++ b/_studio/shared/umc/codec/h264_dec/include/umc_h264_dec.h @@ -85,13 +85,13 @@ class H264VideoDecoderParams : public VideoDecoderParams H264_LEVEL_51 = 51, H264_LEVEL_52 = 52, -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) H264_LEVEL_6 = 60, H264_LEVEL_61 = 61, H264_LEVEL_62 = 62, #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) H264_LEVEL_MAX = 62, #else H264_LEVEL_MAX = 52, diff --git a/_studio/shared/umc/codec/h264_dec/include/umc_h264_task_supplier.h b/_studio/shared/umc/codec/h264_dec/include/umc_h264_task_supplier.h index 9685f83c5c..6c5111520a 100644 --- a/_studio/shared/umc/codec/h264_dec/include/umc_h264_task_supplier.h +++ b/_studio/shared/umc/codec/h264_dec/include/umc_h264_task_supplier.h @@ -725,7 +725,7 @@ inline int32_t CalculateDPBSize(uint8_t & level_idc, int32_t width, int32_t heig case H264VideoDecoderParams::H264_LEVEL_52: MaxDPBMbs = 184320; break; -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) case H264VideoDecoderParams::H264_LEVEL_6: case H264VideoDecoderParams::H264_LEVEL_61: case H264VideoDecoderParams::H264_LEVEL_62: @@ -793,14 +793,14 @@ inline int32_t CalculateDPBSize(uint8_t & level_idc, int32_t width, int32_t heig // can be used to calculate the DPB size. case H264VideoDecoderParams::H264_LEVEL_51: case H264VideoDecoderParams::H264_LEVEL_52: -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) level_idc = H264VideoDecoderParams::H264_LEVEL_6; #else level_idc = INTERNAL_MAX_LEVEL; #endif break; -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) case H264VideoDecoderParams::H264_LEVEL_6: case H264VideoDecoderParams::H264_LEVEL_61: case H264VideoDecoderParams::H264_LEVEL_62: diff --git a/_studio/shared/umc/codec/h264_dec/src/umc_h264_dec_bitstream_headers.cpp b/_studio/shared/umc/codec/h264_dec/src/umc_h264_dec_bitstream_headers.cpp index 322df854ba..9b24966507 100644 --- a/_studio/shared/umc/codec/h264_dec/src/umc_h264_dec_bitstream_headers.cpp +++ b/_studio/shared/umc/codec/h264_dec/src/umc_h264_dec_bitstream_headers.cpp @@ -337,7 +337,7 @@ H264HeadersBitstream::H264HeadersBitstream(uint8_t * const pb, const uint32_t ma inline bool CheckLevel(uint8_t level_idc, bool ignore_level_constrain = false) { -#if (MFX_VERSION < MFX_VERSION_NEXT) +#if (MFX_VERSION < 1035) std::ignore = ignore_level_constrain; #endif @@ -367,7 +367,7 @@ inline bool CheckLevel(uint8_t level_idc, bool ignore_level_constrain = false) case H264VideoDecoderParams::H264_LEVEL_9: return true; -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) case H264VideoDecoderParams::H264_LEVEL_6: case H264VideoDecoderParams::H264_LEVEL_61: case H264VideoDecoderParams::H264_LEVEL_62: diff --git a/_studio/shared/umc/codec/h264_dec/src/umc_h264_mfx_supplier.cpp b/_studio/shared/umc/codec/h264_dec/src/umc_h264_mfx_supplier.cpp index 57796106ab..741fa0efc5 100644 --- a/_studio/shared/umc/codec/h264_dec/src/umc_h264_mfx_supplier.cpp +++ b/_studio/shared/umc/codec/h264_dec/src/umc_h264_mfx_supplier.cpp @@ -928,7 +928,7 @@ UMC::Status MFX_Utility::DecodeHeader(UMC::TaskSupplier * supplier, UMC::H264Vid if (!lpInfo->m_pData->GetDataSize()) return UMC::UMC_ERR_NOT_ENOUGH_DATA; -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) lpInfo->m_ignore_level_constrain = out->mfx.IgnoreLevelConstrain; #endif umcRes = supplier->PreInit(lpInfo); @@ -1087,7 +1087,7 @@ mfxStatus MFX_Utility::Query(VideoCORE *core, mfxVideoParam *in, mfxVideoParam * } -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) out->mfx.IgnoreLevelConstrain = in->mfx.IgnoreLevelConstrain; #endif @@ -1111,7 +1111,7 @@ mfxStatus MFX_Utility::Query(VideoCORE *core, mfxVideoParam *in, mfxVideoParam * case MFX_LEVEL_AVC_5: case MFX_LEVEL_AVC_51: case MFX_LEVEL_AVC_52: -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) case MFX_LEVEL_AVC_6: case MFX_LEVEL_AVC_61: case MFX_LEVEL_AVC_62: @@ -1339,7 +1339,7 @@ mfxStatus MFX_Utility::Query(VideoCORE *core, mfxVideoParam *in, mfxVideoParam * case MFX_LEVEL_AVC_5: case MFX_LEVEL_AVC_51: case MFX_LEVEL_AVC_52: -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) case MFX_LEVEL_AVC_6: case MFX_LEVEL_AVC_61: case MFX_LEVEL_AVC_62: diff --git a/api/include/mfxaudio.h b/api/include/mfxaudio.h index fd5872f45e..032fb010cf 100644 --- a/api/include/mfxaudio.h +++ b/api/include/mfxaudio.h @@ -32,26 +32,26 @@ extern "C" #endif /* AudioCORE */ -mfxStatus MFX_CDECL MFXAudioCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait); /* AudioENCODE */ -mfxStatus MFX_CDECL MFXAudioENCODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out); -mfxStatus MFX_CDECL MFXAudioENCODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request); -mfxStatus MFX_CDECL MFXAudioENCODE_Init(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioENCODE_Reset(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioENCODE_Close(mfxSession session); -mfxStatus MFX_CDECL MFXAudioENCODE_GetAudioParam(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioENCODE_EncodeFrameAsync(mfxSession session, mfxAudioFrame *frame, mfxBitstream *bs, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Init(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Reset(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Close(mfxSession session); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_GetAudioParam(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_EncodeFrameAsync(mfxSession session, mfxAudioFrame *frame, mfxBitstream *bs, mfxSyncPoint *syncp); /* AudioDECODE */ -mfxStatus MFX_CDECL MFXAudioDECODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out); -mfxStatus MFX_CDECL MFXAudioDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxAudioParam* par); -mfxStatus MFX_CDECL MFXAudioDECODE_Init(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioDECODE_Reset(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioDECODE_Close(mfxSession session); -mfxStatus MFX_CDECL MFXAudioDECODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request); -mfxStatus MFX_CDECL MFXAudioDECODE_GetAudioParam(mfxSession session, mfxAudioParam *par); -mfxStatus MFX_CDECL MFXAudioDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxAudioParam* par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Init(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Reset(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Close(mfxSession session); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_GetAudioParam(mfxSession session, mfxAudioParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp); #ifdef __cplusplus } // extern "C" diff --git a/api/include/mfxdefs.h b/api/include/mfxdefs.h index 07acf555a6..2c288c7f87 100644 --- a/api/include/mfxdefs.h +++ b/api/include/mfxdefs.h @@ -21,7 +21,7 @@ #define __MFXDEFS_H__ #define MFX_VERSION_MAJOR 1 -#define MFX_VERSION_MINOR 34 +#define MFX_VERSION_MINOR 35 // MFX_VERSION_NEXT is always +1 from last public release // may be enforced by MFX_VERSION_USE_LATEST define @@ -103,6 +103,52 @@ extern "C" #define MFX_INFINITE 0xFFFFFFFF +#if !defined(MFX_DEPRECATED_OFF) && (MFX_VERSION >= 1034) +#define MFX_DEPRECATED_OFF +#endif + +#ifndef MFX_DEPRECATED_OFF + #if defined(__cplusplus) && __cplusplus >= 201402L + #define MFX_DEPRECATED [[deprecated]] + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg [[deprecated]] + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) + #elif defined(__clang__) + #define MFX_DEPRECATED __attribute__((deprecated)) + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) + #elif defined(__INTEL_COMPILER) + #if (defined(_WIN32) || defined(_WIN64)) + #define MFX_DEPRECATED __declspec(deprecated) + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg)) + #elif defined(__linux__) + #define MFX_DEPRECATED __attribute__((deprecated)) + #if defined(__cplusplus) + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) + #else + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg + #endif + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) + #endif + #elif defined(_MSC_VER) && _MSC_VER > 1200 // VS 6 doesn't support deprecation + #define MFX_DEPRECATED __declspec(deprecated) + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg)) + #elif defined(__GNUC__) + #define MFX_DEPRECATED __attribute__((deprecated)) + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) + #else + #define MFX_DEPRECATED + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) + #endif +#else + #define MFX_DEPRECATED + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) +#endif + typedef unsigned char mfxU8; typedef char mfxI8; typedef short mfxI16; diff --git a/api/include/mfxenc.h b/api/include/mfxenc.h index 4a3296baef..3294546e3a 100644 --- a/api/include/mfxenc.h +++ b/api/include/mfxenc.h @@ -55,15 +55,15 @@ typedef struct _mfxENCOutput{ MFX_PACK_END() -mfxStatus MFX_CDECL MFXVideoENC_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out); -mfxStatus MFX_CDECL MFXVideoENC_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request); -mfxStatus MFX_CDECL MFXVideoENC_Init(mfxSession session, mfxVideoParam *par); -mfxStatus MFX_CDECL MFXVideoENC_Reset(mfxSession session, mfxVideoParam *par); -mfxStatus MFX_CDECL MFXVideoENC_Close(mfxSession session); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Init(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Reset(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Close(mfxSession session); -mfxStatus MFX_CDECL MFXVideoENC_ProcessFrameAsync(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_ProcessFrameAsync(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp); -mfxStatus MFX_CDECL MFXVideoENC_GetVideoParam(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_GetVideoParam(mfxSession session, mfxVideoParam *par); #ifdef __cplusplus } // extern "C" diff --git a/api/include/mfxfei.h b/api/include/mfxfei.h index 55e61ca4d3..8641266772 100644 --- a/api/include/mfxfei.h +++ b/api/include/mfxfei.h @@ -29,7 +29,7 @@ extern "C" #endif /* __cplusplus */ MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 Qp; @@ -61,7 +61,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; /* size of allocated memory in number of macroblocks */ @@ -74,7 +74,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -87,7 +87,7 @@ MFX_PACK_END() /* PreENC output */ /* Layout is exactly the same as mfxExtFeiEncMVs, this buffer may be removed in future */ MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -100,7 +100,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -131,7 +131,7 @@ MFX_PACK_END() /* 1 ENC_PAK input */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 SearchPath; @@ -160,7 +160,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -178,7 +178,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -222,7 +222,7 @@ For example, MV for right top 4x4 sub block is stored in 5-th element of the arr ======================== */ MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -235,7 +235,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -257,7 +257,7 @@ enum { }; MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { /* dword 0-2 */ mfxU32 Header; /* MFX_PAK_OBJECT_HEADER */ mfxU32 MVDataLength; @@ -330,7 +330,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -341,7 +341,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 MaxFrameSize; /* in bytes */ mfxU32 NumPasses; /* up to 8 */ @@ -353,7 +353,7 @@ MFX_PACK_END() #if (MFX_VERSION >= 1025) /* FEI repack status */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 NumPasses; mfxU16 reserved[58]; @@ -433,7 +433,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 reserved1[3]; mfxU32 NumMBAlloc; @@ -447,7 +447,7 @@ MFX_PACK_END() /* SPS, PPS, Slice Header */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 SPSId; @@ -459,7 +459,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 SPSId; @@ -486,7 +486,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 NumSlice; /* actual number of slices in the picture */ @@ -521,7 +521,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 DisableHME; /* 0 - enable, any other value means disable */ @@ -567,7 +567,7 @@ enum { /* should be attached to mfxVideoParam during initialization to indicate FEI function */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxFeiFunction Func; mfxU16 SingleFieldProcessing; diff --git a/api/include/mfxfeihevc.h b/api/include/mfxfeihevc.h index 8827892e55..4d976fe128 100644 --- a/api/include/mfxfeihevc.h +++ b/api/include/mfxfeihevc.h @@ -29,7 +29,7 @@ extern "C" #if (MFX_VERSION >= 1027) MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 SearchPath; @@ -70,7 +70,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; @@ -82,7 +82,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; @@ -104,7 +104,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; @@ -116,7 +116,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 MaxFrameSize; /* in bytes */ mfxU32 NumPasses; /* up to 8 */ @@ -126,7 +126,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 NumPasses; mfxU16 reserved[58]; @@ -162,7 +162,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; @@ -233,7 +233,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; @@ -252,7 +252,7 @@ typedef struct { MFX_PACK_END() MFX_PACK_BEGIN_STRUCT_W_PTR() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 VaBufferID; mfxU32 Pitch; diff --git a/api/include/mfxpak.h b/api/include/mfxpak.h index b0d7db56e3..6733a5139e 100644 --- a/api/include/mfxpak.h +++ b/api/include/mfxpak.h @@ -60,15 +60,15 @@ typedef struct { MFX_PACK_END() typedef struct _mfxSession *mfxSession; -mfxStatus MFX_CDECL MFXVideoPAK_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out); -mfxStatus MFX_CDECL MFXVideoPAK_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest request[2]); -mfxStatus MFX_CDECL MFXVideoPAK_Init(mfxSession session, mfxVideoParam *par); -mfxStatus MFX_CDECL MFXVideoPAK_Reset(mfxSession session, mfxVideoParam *par); -mfxStatus MFX_CDECL MFXVideoPAK_Close(mfxSession session); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest request[2]); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Init(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Reset(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Close(mfxSession session); -mfxStatus MFX_CDECL MFXVideoPAK_ProcessFrameAsync(mfxSession session, mfxPAKInput *in, mfxPAKOutput *out, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_ProcessFrameAsync(mfxSession session, mfxPAKInput *in, mfxPAKOutput *out, mfxSyncPoint *syncp); -mfxStatus MFX_CDECL MFXVideoPAK_GetVideoParam(mfxSession session, mfxVideoParam *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_GetVideoParam(mfxSession session, mfxVideoParam *par); #ifdef __cplusplus } // extern "C" diff --git a/api/include/mfxplugin.h b/api/include/mfxplugin.h index 58ddd6f09c..cef4e095a4 100644 --- a/api/include/mfxplugin.h +++ b/api/include/mfxplugin.h @@ -193,21 +193,21 @@ typedef struct mfxPlugin{ MFX_PACK_END() -mfxStatus MFX_CDECL MFXVideoUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par); -mfxStatus MFX_CDECL MFXVideoUSER_Unregister(mfxSession session, mfxU32 type); -mfxStatus MFX_CDECL MFXVideoUSER_GetPlugin(mfxSession session, mfxU32 type, mfxPlugin *par); -mfxStatus MFX_CDECL MFXVideoUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Unregister(mfxSession session, mfxU32 type); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_GetPlugin(mfxSession session, mfxU32 type, mfxPlugin *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp); -mfxStatus MFX_CDECL MFXVideoUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version); -mfxStatus MFX_CDECL MFXVideoUSER_LoadByPath(mfxSession session, const mfxPluginUID *uid, mfxU32 version, const mfxChar *path, mfxU32 len); -mfxStatus MFX_CDECL MFXVideoUSER_UnLoad(mfxSession session, const mfxPluginUID *uid); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_LoadByPath(mfxSession session, const mfxPluginUID *uid, mfxU32 version, const mfxChar *path, mfxU32 len); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_UnLoad(mfxSession session, const mfxPluginUID *uid); -mfxStatus MFX_CDECL MFXAudioUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par); -mfxStatus MFX_CDECL MFXAudioUSER_Unregister(mfxSession session, mfxU32 type); -mfxStatus MFX_CDECL MFXAudioUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Unregister(mfxSession session, mfxU32 type); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp); -mfxStatus MFX_CDECL MFXAudioUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version); -mfxStatus MFX_CDECL MFXAudioUSER_UnLoad(mfxSession session, const mfxPluginUID *uid); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_UnLoad(mfxSession session, const mfxPluginUID *uid); #ifdef __cplusplus } // extern "C" diff --git a/api/include/mfxsession.h b/api/include/mfxsession.h index 60cc6d6d86..2d7330426f 100644 --- a/api/include/mfxsession.h +++ b/api/include/mfxsession.h @@ -40,7 +40,7 @@ mfxStatus MFX_CDECL MFXDisjoinSession(mfxSession session); mfxStatus MFX_CDECL MFXCloneSession(mfxSession session, mfxSession *clone); mfxStatus MFX_CDECL MFXSetPriority(mfxSession session, mfxPriority priority); mfxStatus MFX_CDECL MFXGetPriority(mfxSession session, mfxPriority *priority); -mfxStatus MFX_CDECL MFXDoWork(mfxSession session); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXDoWork(mfxSession session); #ifdef __cplusplus } diff --git a/api/include/mfxstructures.h b/api/include/mfxstructures.h index 65e7de9903..6d233a089b 100644 --- a/api/include/mfxstructures.h +++ b/api/include/mfxstructures.h @@ -389,12 +389,15 @@ MFX_PACK_END() enum { MFX_IOPATTERN_IN_VIDEO_MEMORY = 0x01, MFX_IOPATTERN_IN_SYSTEM_MEMORY = 0x02, - MFX_IOPATTERN_IN_OPAQUE_MEMORY = 0x04, + MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_IOPATTERN_IN_OPAQUE_MEMORY) = 0x04, MFX_IOPATTERN_OUT_VIDEO_MEMORY = 0x10, MFX_IOPATTERN_OUT_SYSTEM_MEMORY = 0x20, - MFX_IOPATTERN_OUT_OPAQUE_MEMORY = 0x40 + MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_IOPATTERN_OUT_OPAQUE_MEMORY) = 0x40 }; +MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_IOPATTERN_IN_OPAQUE_MEMORY); +MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_IOPATTERN_OUT_OPAQUE_MEMORY); + /* CodecId */ enum { MFX_CODEC_AVC =MFX_MAKEFOURCC('A','V','C',' '), @@ -447,7 +450,7 @@ enum { MFX_LEVEL_AVC_5 =50, MFX_LEVEL_AVC_51 =51, MFX_LEVEL_AVC_52 =52, -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) MFX_LEVEL_AVC_6 =60, MFX_LEVEL_AVC_61 =61, MFX_LEVEL_AVC_62 =62, @@ -1133,7 +1136,7 @@ enum { MFX_MEMTYPE_INTERNAL_FRAME = 0x0001, MFX_MEMTYPE_EXTERNAL_FRAME = 0x0002, - MFX_MEMTYPE_OPAQUE_FRAME = 0x0004, + MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_MEMTYPE_OPAQUE_FRAME) = 0x0004, MFX_MEMTYPE_EXPORT_FRAME = 0x0008, MFX_MEMTYPE_SHARED_RESOURCE = MFX_MEMTYPE_EXPORT_FRAME, #if (MFX_VERSION >= 1025) @@ -1143,6 +1146,8 @@ enum { #endif }; +MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_MEMTYPE_OPAQUE_FRAME); + MFX_PACK_BEGIN_USUAL_STRUCT() typedef struct { union { @@ -2302,7 +2307,7 @@ enum { /* Multi-Frame Initialization parameters */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU16 MFMode; @@ -2314,7 +2319,7 @@ MFX_PACK_END() /* Multi-Frame Run-time controls */ MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { +MFX_DEPRECATED typedef struct { mfxExtBuffer Header; mfxU32 Timeout; /* timeout in millisecond */ diff --git a/api/include/mfxvideo++.h b/api/include/mfxvideo++.h index 9256c95907..41c18e9f12 100644 --- a/api/include/mfxvideo++.h +++ b/api/include/mfxvideo++.h @@ -49,7 +49,7 @@ class MFXVideoSession virtual mfxStatus SetPriority( mfxPriority priority) { return MFXSetPriority(m_session, priority);} virtual mfxStatus GetPriority( mfxPriority *priority) { return MFXGetPriority(m_session, priority);} - virtual mfxStatus SetBufferAllocator(mfxBufferAllocator *allocator) { return MFXVideoCORE_SetBufferAllocator(m_session, allocator); } + MFX_DEPRECATED virtual mfxStatus SetBufferAllocator(mfxBufferAllocator *allocator) { return MFXVideoCORE_SetBufferAllocator(m_session, allocator); } virtual mfxStatus SetFrameAllocator(mfxFrameAllocator *allocator) { return MFXVideoCORE_SetFrameAllocator(m_session, allocator); } virtual mfxStatus SetHandle(mfxHandleType type, mfxHDL hdl) { return MFXVideoCORE_SetHandle(m_session, type, hdl); } virtual mfxStatus GetHandle(mfxHandleType type, mfxHDL *hdl) { return MFXVideoCORE_GetHandle(m_session, type, hdl); } diff --git a/api/include/mfxvideo.h b/api/include/mfxvideo.h index 88f388d3d5..aee387a720 100644 --- a/api/include/mfxvideo.h +++ b/api/include/mfxvideo.h @@ -53,7 +53,7 @@ typedef struct { MFX_PACK_END() /* VideoCORE */ -mfxStatus MFX_CDECL MFXVideoCORE_SetBufferAllocator(mfxSession session, mfxBufferAllocator *allocator); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoCORE_SetBufferAllocator(mfxSession session, mfxBufferAllocator *allocator); mfxStatus MFX_CDECL MFXVideoCORE_SetFrameAllocator(mfxSession session, mfxFrameAllocator *allocator); mfxStatus MFX_CDECL MFXVideoCORE_SetHandle(mfxSession session, mfxHandleType type, mfxHDL hdl); mfxStatus MFX_CDECL MFXVideoCORE_GetHandle(mfxSession session, mfxHandleType type, mfxHDL *hdl); @@ -95,7 +95,7 @@ mfxStatus MFX_CDECL MFXVideoVPP_Close(mfxSession session); mfxStatus MFX_CDECL MFXVideoVPP_GetVideoParam(mfxSession session, mfxVideoParam *par); mfxStatus MFX_CDECL MFXVideoVPP_GetVPPStat(mfxSession session, mfxVPPStat *stat); mfxStatus MFX_CDECL MFXVideoVPP_RunFrameVPPAsync(mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *out, mfxExtVppAuxData *aux, mfxSyncPoint *syncp); -mfxStatus MFX_CDECL MFXVideoVPP_RunFrameVPPAsyncEx(mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp); +MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoVPP_RunFrameVPPAsyncEx(mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp); #ifdef __cplusplus } // extern "C" diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMakeLists.txt index 15a4bd9a7a..c09ffeee3a 100644 --- a/api/mfx_dispatch/linux/CMakeLists.txt +++ b/api/mfx_dispatch/linux/CMakeLists.txt @@ -57,6 +57,7 @@ add_definitions( -DMFX_MODULES_DIR="${MFX_MODULES_DIR}" ) message( STATUS "MFX_MODULES_DIR=${MFX_MODULES_DIR}" ) add_definitions(-DUNIX) +add_definitions(-DMFX_DEPRECATED_OFF) if( CMAKE_SYSTEM_NAME MATCHES Linux ) add_definitions(-D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64 -DLINUX -DLINUX32) diff --git a/api/mfx_dispatch/windows/libmfx_vs2015.vcxproj b/api/mfx_dispatch/windows/libmfx_vs2015.vcxproj index 72de6ce655..fdcdf8c0f3 100644 --- a/api/mfx_dispatch/windows/libmfx_vs2015.vcxproj +++ b/api/mfx_dispatch/windows/libmfx_vs2015.vcxproj @@ -143,7 +143,7 @@ Disabled include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;MFX_VA;_ALLOW_MSC_VER_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;MFX_VA;MFX_DEPRECATED_OFF;_ALLOW_MSC_VER_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;%(PreprocessorDefinitions) Async MultiThreadedDebug Level4 @@ -180,7 +180,7 @@ true Speed include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;MFX_VA;_ALLOW_MSC_VER_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;MFX_VA;MFX_DEPRECATED_OFF;_ALLOW_MSC_VER_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;%(PreprocessorDefinitions) Async MultiThreaded true diff --git a/doc/MFE-Overview.md b/doc/MFE-Overview.md index 8343bd85a8..c33e8b87a7 100644 --- a/doc/MFE-Overview.md +++ b/doc/MFE-Overview.md @@ -306,9 +306,11 @@ Encoder initialization changes Extended buffers added: -`mfxExtMultiFrameParams` +`mfxExtMultiFrameParam` ---------------------- +*Deprecated in 1.35 and removed starting from 2.0* + *Definition:* ``` typedef struct { @@ -321,7 +323,7 @@ Extended buffers added:     mfxU16      reserved[58]; - } mfxExtMultiFrameParams; + } mfxExtMultiFrameParam; ``` *Description:* @@ -360,6 +362,8 @@ Frame Management New structure added +*Deprecated in 1.35 and removed starting from 2.0* + *Definition:* ``` typedef struct { diff --git a/doc/header-template.md b/doc/header-template.md index 77e760bb5b..e5d18baf38 100644 --- a/doc/header-template.md +++ b/doc/header-template.md @@ -1,7 +1,7 @@ ![](./pic/intel_logo.png) #**Title** -Media SDK API Version 1.34 +Media SDK API Version 1.35
diff --git a/doc/mediasdk-man.md b/doc/mediasdk-man.md index 2d29353860..ad19cde8ff 100755 --- a/doc/mediasdk-man.md +++ b/doc/mediasdk-man.md @@ -1,7 +1,7 @@ ![](./pic/intel_logo.png) # **Media SDK Developer Reference** -## Media SDK API Version 1.34 +## Media SDK API Version 1.35
@@ -315,7 +315,9 @@ Notice revision #20110804 Intel® Media Software Development Kit – SDK, further referred to as the SDK, is a software development library that exposes the media acceleration capabilities of Intel platforms for decoding, encoding and video processing. The API library covers a wide range of Intel platforms. -This document describes the SDK API. +This document describes the SDK API. + +SDK version 1.35 supposed to be last in 1.xx series. Successor API is oneVPL https://docs.oneapi.com/versions/latest/onevpl/index.html ## Document Conventions @@ -1745,6 +1747,8 @@ This function is available since SDK API 1.0. ### MFXDoWork +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** [mfxStatus](#mfxStatus) `MFXDoWork(mfxSession session);` @@ -2085,6 +2089,8 @@ This function is available since SDK API 1.0. ### MFXVideoCORE_SetBufferAllocator +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** [mfxStatus](#mfxStatus) `MFXVideoCORE_SetBufferAllocator(mfxSession session,` [mfxBufferAllocator](#mfxBufferAllocator) ` *allocator);` @@ -7791,6 +7797,8 @@ This structure is available since SDK API 1.24. ## mfxExtMultiFrameParam +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -7823,6 +7831,8 @@ This structure is available since SDK API 1.25. ## mfxExtMultiFrameControl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -8309,7 +8319,7 @@ SDK API 1.8 added HEVC level and tier definitions. SDK API 1.34 added AV1 level definitions. -SDK API **TBD** added H.264 level 6-6.2 definitions. +SDK API 1.35 added H.264 level 6-6.2 definitions. ## CodecProfile @@ -8737,10 +8747,10 @@ The `IOPattern` enumerator itemizes memory access patterns for SDK functions. Us --- | --- `MFX_IOPATTERN_IN_VIDEO_MEMORY` | Input to SDK functions is a video memory surface `MFX_IOPATTERN_IN_SYSTEM_MEMORY` | Input to SDK functions is a linear buffer directly in system memory or in system memory through an external allocator -`MFX_IOPATTERN_IN_OPAQUE_MEMORY` | Input to SDK functions maps at runtime to either a system memory buffer or a video memory surface. +`MFX_IOPATTERN_IN_OPAQUE_MEMORY` | Input to SDK functions maps at runtime to either a system memory buffer or a video memory surface. *Deprecated in 1.35 and removed starting from 2.0* `MFX_IOPATTERN_OUT_VIDEO_MEMORY` | Output to SDK functions is a video memory surface `MFX_IOPATTERN_OUT_SYSTEM_MEMORY` | Output to SDK functions is a linear buffer directly in system memory or in system memory through an external allocator -`MFX_IOPATTERN_OUT_OPAQUE_MEMORY` | Output to SDK functions maps at runtime to either a system memory buffer or a video memory surface. +`MFX_IOPATTERN_OUT_OPAQUE_MEMORY` | Output to SDK functions maps at runtime to either a system memory buffer or a video memory surface. *Deprecated in 1.35 and removed starting from 2.0* **Change History** diff --git a/doc/mediasdkfei-man.md b/doc/mediasdkfei-man.md index fce46110f2..d35a3f85a0 100644 --- a/doc/mediasdkfei-man.md +++ b/doc/mediasdkfei-man.md @@ -400,6 +400,8 @@ In each function description, only commonly used status codes are documented. Th ## MFXVideoENC_Init +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -429,6 +431,8 @@ This function is available since SDK API 1.9. ## MFXVideoENC_Reset +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -458,6 +462,8 @@ This function is available since SDK API 1.9. ## MFXVideoENC_Close +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -486,6 +492,8 @@ This function is available since SDK API 1.9. ## MFXVideoENC_ProcessFrameAsync +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** @@ -522,6 +530,8 @@ This function is available since SDK API 1.9. ## MFXVideoPAK_QueryIOSurf +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** `mfxStatus MFXVideoPAK_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest request[2]);` @@ -555,6 +565,8 @@ This function is available since SDK API 1.23. ## MFXVideoPAK_Init +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -585,6 +597,8 @@ This function is available since SDK API 1.9. ## MFXVideoPAK_Reset +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -617,6 +631,8 @@ This function is available since SDK API 1.9. ## MFXVideoPAK_Close +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ``` @@ -645,6 +661,8 @@ This function is available since SDK API 1.9. ## MFXVideoPAK_ProcessFrameAsync +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** `mfxStatus MFXVideoPAK_ProcessFrameAsync(mfxSession session,` [mfxPAKInput](#mfxPAKInput) `*in,` [mfxPAKOutput](#mfxPAKOutput) `*out, mfxSyncPoint *syncp);` @@ -682,6 +700,8 @@ In the following structures all reserved fields must be zero. ## mfxExtFeiPreEncCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -761,6 +781,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiPreEncMVPredictors +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -798,6 +820,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiEncQP +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -833,6 +857,8 @@ SDK API 1.23 renames `NumQPAlloc` and `QP` fields to `NumMBAlloc` and `MB` respe ## mfxExtFeiPreEncMV +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -868,6 +894,9 @@ This structure is used during runtime and should be attached to the [mfxENCOutpu This structure is available since SDK API 1.9. ## mfxExtFeiPreEncMBStat + +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -928,6 +957,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiEncFrameCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -997,6 +1028,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiEncMVPredictors +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1040,6 +1073,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiEncMBCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1097,6 +1132,8 @@ SDK API 1.23 adds `DirectBiasAdjustment, GlobalMotionBiasAdjustment` and `MVCost ## mfxExtFeiEncMV +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1131,6 +1168,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiEncMBStat +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1173,6 +1212,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiPakMBCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1308,6 +1349,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiSPS +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1343,6 +1386,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiPPS +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1408,6 +1453,8 @@ The SDK API 1.23 adds `FrameType`,`DpbBefore`,`DpbAfter` fields and removes `Ref ## mfxExtFeiSliceHeader +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C @@ -1482,6 +1529,8 @@ This structure is available since SDK API 1.9. ## mfxExtFeiParam +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ```C diff --git a/doc/mediasdkhevcfei-man.md b/doc/mediasdkhevcfei-man.md index 7b8d02029e..58410cb623 100644 --- a/doc/mediasdkhevcfei-man.md +++ b/doc/mediasdkhevcfei-man.md @@ -153,6 +153,8 @@ In the following structures all reserved fields must be zeroed by application if ## mfxExtFeiHevcEncFrameCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` @@ -213,6 +215,9 @@ This structure is available since SDK API 1.27 ## mfxExtFeiHevcEncMVPredictors + +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` @@ -306,6 +311,8 @@ This structure is available since SDK API 1.27 ## mfxExtFeiHevcEncQP +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` @@ -364,6 +371,8 @@ This structure is available since SDK API 1.27 ## mfxExtFeiHevcEncCtuCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` @@ -410,6 +419,8 @@ This structure is available since SDK API 1.27 ## mfxExtFeiHevcRepackCtrl +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` @@ -442,6 +453,8 @@ This structure is available since SDK API 1.27. ## mfxExtFeiHevcRepackStat +*Deprecated in 1.35 and removed starting from 2.0* + **Definition** ``` diff --git a/doc/mediasdkusr-man.md b/doc/mediasdkusr-man.md index 80b68e416a..aaf78fb23d 100644 --- a/doc/mediasdkusr-man.md +++ b/doc/mediasdkusr-man.md @@ -450,6 +450,8 @@ This class of functions allows applications to specify user-defined functions to ### MFXVideoUSER_ProcessFrameAsync +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -482,6 +484,8 @@ This function is available since SDK API 1.1. ### MFXVideoUSER_Register +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -514,6 +518,8 @@ SDK API 1.8 extends functionality and allows registering of codec plug-ins. Befo ### MFXVideoUSER_Unregister +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -546,6 +552,8 @@ This function is available since SDK API 1.1. ### MFXVideoUSER_Load +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -583,6 +591,8 @@ This function is available since SDK API 1.8. ### MFXVideoUSER_LoadByPath +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -623,6 +633,8 @@ This function is available since SDK API 1.13. ### MFXVideoUSER_UnLoad +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C @@ -652,6 +664,8 @@ This function is available since SDK API 1.8. ### MFXVideoUSER_GetPlugin +*Deprecated in 1.35 and removed starting from 2.0* + **Syntax** ```C diff --git a/doc/samples/readme-decode_linux.md b/doc/samples/readme-decode_linux.md index be27463542..8b83a16cf1 100644 --- a/doc/samples/readme-decode_linux.md +++ b/doc/samples/readme-decode_linux.md @@ -62,6 +62,7 @@ The following command-line switches are optional: | [-d]| enable decode error report| |[-jpeg_rgb] |RGB Chroma Type| |[-device /path/to/device]| set graphics device for processing. For example: `-device /dev/dri/renderD128`. If not specified, defaults to the first Intel device found on the system. | + | [-ignore_level_constrain] | ignore level constrain (AVC) | |Output format parameters:|| | [-i420] | pipeline output format: NV12, output file format: I420| | [-nv12] | pipeline output format: NV12, output file format: NV12| diff --git a/samples/sample_common/props/winsdk_win32.props b/samples/sample_common/props/winsdk_win32.props index ef0bc2b9c0..fef2ca8b4c 100644 --- a/samples/sample_common/props/winsdk_win32.props +++ b/samples/sample_common/props/winsdk_win32.props @@ -4,7 +4,7 @@ <_ProjectFileVersion>10.0.30319.1 - NOMINMAX; + NOMINMAX;MFX_DEPRECATED_OFF; diff --git a/samples/sample_common/props/winsdk_x64.props b/samples/sample_common/props/winsdk_x64.props index ef0bc2b9c0..fef2ca8b4c 100644 --- a/samples/sample_common/props/winsdk_x64.props +++ b/samples/sample_common/props/winsdk_x64.props @@ -4,7 +4,7 @@ <_ProjectFileVersion>10.0.30319.1 - NOMINMAX; + NOMINMAX;MFX_DEPRECATED_OFF; diff --git a/samples/sample_decode/sample_decode.vcxproj b/samples/sample_decode/sample_decode.vcxproj index e6e14367a8..5ef6f5e0be 100644 --- a/samples/sample_decode/sample_decode.vcxproj +++ b/samples/sample_decode/sample_decode.vcxproj @@ -94,7 +94,7 @@ Disabled $(ProjectDir)\include;$(ProjectDir)\..\..\api\include;$(INTELMEDIASDKROOT)\include;$(ProjectDir)\..\sample_common\include;%(AdditionalIncludeDirectories) - NOMINMAX;_WIN32;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + NOMINMAX;MFX_DEPRECATED_OFF;_WIN32;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -122,7 +122,7 @@ Disabled $(ProjectDir)\include;$(ProjectDir)\..\..\api\include;$(INTELMEDIASDKROOT)\include;$(ProjectDir)\..\sample_common\include;%(AdditionalIncludeDirectories) - NOMINMAX;_WIN64;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + NOMINMAX;MFX_DEPRECATED_OFF;_WIN64;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreaded @@ -146,7 +146,7 @@ $(ProjectDir)\include;$(ProjectDir)\..\..\api\include;$(INTELMEDIASDKROOT)\include;$(ProjectDir)\..\sample_common\include;%(AdditionalIncludeDirectories) - NOMINMAX;_WIN32;WIN32;NDEBUG;_CONSOLE;SAVE_RECON;%(PreprocessorDefinitions) + NOMINMAX;MFX_DEPRECATED_OFF;_WIN32;WIN32;NDEBUG;_CONSOLE;SAVE_RECON;%(PreprocessorDefinitions) Default MultiThreaded true @@ -177,7 +177,7 @@ $(ProjectDir)\include;$(ProjectDir)\..\..\api\include;$(INTELMEDIASDKROOT)\include;$(ProjectDir)\..\sample_common\include;%(AdditionalIncludeDirectories) - NOMINMAX;WIN64;NDEBUG;_CONSOLE;SAVE_RECON;%(PreprocessorDefinitions) + NOMINMAX;MFX_DEPRECATED_OFF;WIN64;NDEBUG;_CONSOLE;SAVE_RECON;%(PreprocessorDefinitions) Default MultiThreaded true diff --git a/samples/sample_decode/src/sample_decode.cpp b/samples/sample_decode/src/sample_decode.cpp index 833f3797f2..6ff3108152 100644 --- a/samples/sample_decode/src/sample_decode.cpp +++ b/samples/sample_decode/src/sample_decode.cpp @@ -73,7 +73,7 @@ void PrintHelp(msdk_char *strAppName, const msdk_char *strErrorMessage) msdk_printf(MSDK_STRING(" '-device /dev/dri/renderD128'\n")); msdk_printf(MSDK_STRING(" If not specified, defaults to the first Intel device found on the system\n")); #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) +#if (MFX_VERSION >= 1035) msdk_printf(MSDK_STRING(" [-ignore_level_constrain] - ignore level constrain\n")); #endif msdk_printf(MSDK_STRING(" [-disable_film_grain] - disable film grain application(valid only for av1)\n")); diff --git a/tools/asg-hevc/asg-hevc.vcxproj b/tools/asg-hevc/asg-hevc.vcxproj index 0e8801f2b5..a52d7ae93e 100644 --- a/tools/asg-hevc/asg-hevc.vcxproj +++ b/tools/asg-hevc/asg-hevc.vcxproj @@ -84,7 +84,7 @@ - MFX_VERSION_USE_LATEST;_WIN32;WIN32;_DEBUG;NOMINMAX; _UNICODE;UNICODE;%(PreprocessorDefinitions) + MFX_VERSION_USE_LATEST;_WIN32;WIN32;_DEBUG;NOMINMAX;MFX_DEPRECATED_OFF; _UNICODE;UNICODE;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ProgramDatabase @@ -101,7 +101,7 @@ - MFX_VERSION_USE_LATEST;_WIN32;WIN32;NDEBUG;NOMINMAX; _UNICODE;UNICODE;%(PreprocessorDefinitions) + MFX_VERSION_USE_LATEST;_WIN32;WIN32;NDEBUG;NOMINMAX;MFX_DEPRECATED_OFF; _UNICODE;UNICODE;%(PreprocessorDefinitions) MultiThreaded Level3 ProgramDatabase @@ -131,7 +131,7 @@ true - MFX_VERSION_USE_LATEST;_WIN64;WIN64;_DEBUG;NOMINMAX; _UNICODE;UNICODE;%(PreprocessorDefinitions) + MFX_VERSION_USE_LATEST;_WIN64;WIN64;_DEBUG;NOMINMAX;MFX_DEPRECATED_OFF; _UNICODE;UNICODE;%(PreprocessorDefinitions) MultiThreadedDebug ProgramDatabase @@ -150,7 +150,7 @@ Level3 true - MFX_VERSION_USE_LATEST;_WIN64;WIN64;NDEBUG;NOMINMAX; _UNICODE;UNICODE;%(PreprocessorDefinitions) + MFX_VERSION_USE_LATEST;_WIN64;WIN64;NDEBUG;NOMINMAX;MFX_DEPRECATED_OFF; _UNICODE;UNICODE;%(PreprocessorDefinitions) true MultiThreaded diff --git a/tools/tracer/CMakeLists.txt b/tools/tracer/CMakeLists.txt index 0abc02efc8..7c3b988aaa 100644 --- a/tools/tracer/CMakeLists.txt +++ b/tools/tracer/CMakeLists.txt @@ -71,6 +71,7 @@ set_target_properties(mfx-tracer PROPERTIES VERSION ${mfx_version_major}.${mfx set_target_properties(mfx-tracer PROPERTIES SOVERSION ${mfx_version_major}) target_link_libraries( mfx-tracer ${CMAKE_DL_LIBS}) +target_compile_options(mfx-tracer PRIVATE -Wno-deprecated-declarations) install(TARGETS mfx-tracer LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})