Skip to content

Commit 0349e3b

Browse files
galinartlu-zero
galinart
authored and
lu-zero
committed
API 1.35
1 parent 2cd279f commit 0349e3b

21 files changed

+1965
-184
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ pkginclude_HEADERS = \
8787
mfx/mfxvstructures.h \
8888
mfx/mfxbrc.h \
8989
mfx/mfxfei.h \
90-
mfx/mfxfeihevc.h
90+
mfx/mfxfeihevc.h \
91+
mfx/ts_ext_buffers_decl.h \
92+
mfx/ts_struct_decl.h \
93+
mfx/ts_typedef.h
9194

9295
pkgincludedir = $(includedir)/mfx

‎mfx/mfxaudio.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ extern "C"
3232
#endif
3333

3434
/* AudioCORE */
35-
mfxStatus MFX_CDECL MFXAudioCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait);
35+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait);
3636

3737
/* AudioENCODE */
38-
mfxStatus MFX_CDECL MFXAudioENCODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
39-
mfxStatus MFX_CDECL MFXAudioENCODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
40-
mfxStatus MFX_CDECL MFXAudioENCODE_Init(mfxSession session, mfxAudioParam *par);
41-
mfxStatus MFX_CDECL MFXAudioENCODE_Reset(mfxSession session, mfxAudioParam *par);
42-
mfxStatus MFX_CDECL MFXAudioENCODE_Close(mfxSession session);
43-
mfxStatus MFX_CDECL MFXAudioENCODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
44-
mfxStatus MFX_CDECL MFXAudioENCODE_EncodeFrameAsync(mfxSession session, mfxAudioFrame *frame, mfxBitstream *bs, mfxSyncPoint *syncp);
38+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
39+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
40+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Init(mfxSession session, mfxAudioParam *par);
41+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Reset(mfxSession session, mfxAudioParam *par);
42+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Close(mfxSession session);
43+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
44+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_EncodeFrameAsync(mfxSession session, mfxAudioFrame *frame, mfxBitstream *bs, mfxSyncPoint *syncp);
4545

4646
/* AudioDECODE */
47-
mfxStatus MFX_CDECL MFXAudioDECODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
48-
mfxStatus MFX_CDECL MFXAudioDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxAudioParam* par);
49-
mfxStatus MFX_CDECL MFXAudioDECODE_Init(mfxSession session, mfxAudioParam *par);
50-
mfxStatus MFX_CDECL MFXAudioDECODE_Reset(mfxSession session, mfxAudioParam *par);
51-
mfxStatus MFX_CDECL MFXAudioDECODE_Close(mfxSession session);
52-
mfxStatus MFX_CDECL MFXAudioDECODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
53-
mfxStatus MFX_CDECL MFXAudioDECODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
54-
mfxStatus MFX_CDECL MFXAudioDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp);
47+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
48+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxAudioParam* par);
49+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Init(mfxSession session, mfxAudioParam *par);
50+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Reset(mfxSession session, mfxAudioParam *par);
51+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Close(mfxSession session);
52+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
53+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
54+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp);
5555

5656
#ifdef __cplusplus
5757
} // extern "C"

‎mfx/mfxcommon.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ enum {
179179
MFX_PLATFORM_JASPERLAKE = 32,
180180
MFX_PLATFORM_ELKHARTLAKE = 33,
181181
MFX_PLATFORM_TIGERLAKE = 40,
182+
MFX_PLATFORM_ROCKETLAKE = 42,
183+
MFX_PLATFORM_ALDERLAKE_S = 43,
182184
MFX_PLATFORM_KEEMBAY = 50,
183185
};
184186

‎mfx/mfxdefs.h‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define __MFXDEFS_H__
2222

2323
#define MFX_VERSION_MAJOR 1
24-
#define MFX_VERSION_MINOR 34
24+
#define MFX_VERSION_MINOR 35
2525

2626
// MFX_VERSION_NEXT is always +1 from last public release
2727
// may be enforced by MFX_VERSION_USE_LATEST define
@@ -103,6 +103,52 @@ extern "C"
103103

104104
#define MFX_INFINITE 0xFFFFFFFF
105105

106+
#if !defined(MFX_DEPRECATED_OFF) && (MFX_VERSION >= 1034)
107+
#define MFX_DEPRECATED_OFF
108+
#endif
109+
110+
#ifndef MFX_DEPRECATED_OFF
111+
#if defined(__cplusplus) && __cplusplus >= 201402L
112+
#define MFX_DEPRECATED [[deprecated]]
113+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg [[deprecated]]
114+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
115+
#elif defined(__clang__)
116+
#define MFX_DEPRECATED __attribute__((deprecated))
117+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
118+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
119+
#elif defined(__INTEL_COMPILER)
120+
#if (defined(_WIN32) || defined(_WIN64))
121+
#define MFX_DEPRECATED __declspec(deprecated)
122+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
123+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
124+
#elif defined(__linux__)
125+
#define MFX_DEPRECATED __attribute__((deprecated))
126+
#if defined(__cplusplus)
127+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
128+
#else
129+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
130+
#endif
131+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
132+
#endif
133+
#elif defined(_MSC_VER) && _MSC_VER > 1200 // VS 6 doesn't support deprecation
134+
#define MFX_DEPRECATED __declspec(deprecated)
135+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
136+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
137+
#elif defined(__GNUC__)
138+
#define MFX_DEPRECATED __attribute__((deprecated))
139+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
140+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
141+
#else
142+
#define MFX_DEPRECATED
143+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
144+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
145+
#endif
146+
#else
147+
#define MFX_DEPRECATED
148+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
149+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
150+
#endif
151+
106152
typedef unsigned char mfxU8;
107153
typedef char mfxI8;
108154
typedef short mfxI16;

‎mfx/mfxenc.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern "C"
2828
#endif /* __cplusplus */
2929

3030
MFX_PACK_BEGIN_STRUCT_W_PTR()
31-
typedef struct _mfxENCInput{
31+
MFX_DEPRECATED typedef struct _mfxENCInput{
3232
mfxU32 reserved[32];
3333

3434
mfxFrameSurface1 *InSurface;
@@ -44,7 +44,7 @@ typedef struct _mfxENCInput{
4444
MFX_PACK_END()
4545

4646
MFX_PACK_BEGIN_STRUCT_W_PTR()
47-
typedef struct _mfxENCOutput{
47+
MFX_DEPRECATED typedef struct _mfxENCOutput{
4848
mfxU32 reserved[32];
4949

5050
mfxFrameSurface1 *OutSurface;
@@ -55,15 +55,15 @@ typedef struct _mfxENCOutput{
5555
MFX_PACK_END()
5656

5757

58-
mfxStatus MFX_CDECL MFXVideoENC_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
59-
mfxStatus MFX_CDECL MFXVideoENC_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request);
60-
mfxStatus MFX_CDECL MFXVideoENC_Init(mfxSession session, mfxVideoParam *par);
61-
mfxStatus MFX_CDECL MFXVideoENC_Reset(mfxSession session, mfxVideoParam *par);
62-
mfxStatus MFX_CDECL MFXVideoENC_Close(mfxSession session);
58+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
59+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request);
60+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Init(mfxSession session, mfxVideoParam *par);
61+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Reset(mfxSession session, mfxVideoParam *par);
62+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Close(mfxSession session);
6363

64-
mfxStatus MFX_CDECL MFXVideoENC_ProcessFrameAsync(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp);
64+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_ProcessFrameAsync(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp);
6565

66-
mfxStatus MFX_CDECL MFXVideoENC_GetVideoParam(mfxSession session, mfxVideoParam *par);
66+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_GetVideoParam(mfxSession session, mfxVideoParam *par);
6767

6868
#ifdef __cplusplus
6969
} // extern "C"

0 commit comments

Comments
 (0)