Skip to content

Commit 5db5d07

Browse files
oneVPL 2.3 API version release (#307)
1 parent f8562ef commit 5db5d07

File tree

19 files changed

+389
-119
lines changed

19 files changed

+389
-119
lines changed

oneapi-doc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"version": "1.1-provisional-draft",
3-
"vpl_version": "2.2.0",
3+
"vpl_version": "2.3.0",
44
"art_version": "0.5-rev-1"
55
}

source/elements/oneVPL/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2193,7 +2193,7 @@ INCLUDE_FILE_PATTERNS =
21932193
# recursively expanded use the := operator instead of the = operator.
21942194
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
21952195

2196-
PREDEFINED = MFX_CDECL=
2196+
PREDEFINED = MFX_CDECL= MFX_DEPRECATED=
21972197

21982198
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
21992199
# tag can be used to specify a list of macro names that should be expanded. The
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*############################################################################
2+
# Copyright (C) 2021 Intel Corporation
3+
#
4+
# SPDX-License-Identifier: MIT
5+
############################################################################*/
6+
7+
#ifndef __MFX_H__
8+
#define __MFX_H__
9+
10+
#include "mfxdefs.h"
11+
#include "mfxcommon.h"
12+
#include "mfxstructures.h"
13+
#include "mfxdispatcher.h"
14+
#include "mfximplcaps.h"
15+
#include "mfxsession.h"
16+
#include "mfxvideo.h"
17+
#include "mfxadapter.h"
18+
19+
#include "mfxbrc.h"
20+
#include "mfxmvc.h"
21+
#include "mfxpcp.h"
22+
#include "mfxvp8.h"
23+
#include "mfxjpeg.h"
24+
25+
#endif /* __MFXDEFS_H__ */

source/elements/oneVPL/include/vpl/mfxcommon.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ typedef struct {
172172
} mfxExtThreadsParam;
173173
MFX_PACK_END()
174174

175-
/*! The PlatformCodeName enumerator itemizes microarchitecture code names for the Legacy mode.
175+
/*! The PlatformCodeName enumerator itemizes product code names for platforms.
176176
For details about Intel code names, see ark.intel.com. */
177177
enum {
178178
MFX_PLATFORM_UNKNOWN = 0, /*!< Unknown platform. */
@@ -192,6 +192,10 @@ enum {
192192
MFX_PLATFORM_JASPERLAKE = 32, /*!< Code name Jasper Lake. */
193193
MFX_PLATFORM_ELKHARTLAKE = 33, /*!< Code name Elkhart Lake. */
194194
MFX_PLATFORM_TIGERLAKE = 40, /*!< Code name Tiger Lake. */
195+
MFX_PLATFORM_ROCKETLAKE = 42, /*!< Code name Rocket Lake. */
196+
MFX_PLATFORM_ALDERLAKE_S = 43, /*!< Code name Alder Lake S. */
197+
MFX_PLATFORM_ALDERLAKE_P = 44, /*!< Code name Alder Lake P. */
198+
MFX_PLATFORM_ARCTICSOUND_P = 45, /*!< Code name Arctic Sound P. */
195199
MFX_PLATFORM_KEEMBAY = 50, /*!< Code name Keem Bay. */
196200
};
197201

@@ -370,7 +374,6 @@ typedef enum {
370374
MFX_ACCEL_MODE_VIA_HDDLUNITE = 0x0500, /*!< Hardware acceleration goes through the HDDL* Unite*. */
371375
} mfxAccelerationMode;
372376

373-
374377
#define MFX_ACCELERATIONMODESCRIPTION_VERSION MFX_STRUCT_VERSION(1, 0)
375378

376379
MFX_PACK_BEGIN_STRUCT_W_PTR()
@@ -438,7 +441,7 @@ typedef struct {
438441
mfxU16 reserved[3]; /*!< Reserved for future use. */
439442
mfxU16 NumExtParam; /*!< The number of extra configuration structures attached to this structure. */
440443
mfxExtBuffer **ExtParam; /*!< Points to an array of pointers to the extra configuration structures; see the ExtendedBufferID enumerator for a list of extended configurations. */
441-
mfxU32 VendorImplID; /*!< Vendor specific number with given implementation ID. Represents the same filed from mfxImplDescription. */
444+
mfxU32 VendorImplID; /*!< Vendor specific number with given implementation ID. Represents the same field from mfxImplDescription. */
442445
mfxU32 reserved2[3]; /*!< Reserved for future use. */
443446
} mfxInitializationParam;
444447
MFX_PACK_END()

source/elements/oneVPL/include/vpl/mfxdefs.h

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define __MFXDEFS_H__
99

1010
#define MFX_VERSION_MAJOR 2
11-
#define MFX_VERSION_MINOR 2
11+
#define MFX_VERSION_MINOR 3
1212

1313
// MFX_VERSION - version of API that 'assumed' by build may be provided externally
1414
// if it omitted then latest stable API derived from Major.Minor is assumed
@@ -27,7 +27,7 @@
2727
/*! The corresponding version of the Intel(r) Media SDK legacy API that is used as a basis
2828
for the current API. */
2929

30-
#define MFX_LEGACY_VERSION 1034
30+
#define MFX_LEGACY_VERSION 1035
3131

3232

3333
#ifdef __cplusplus
@@ -85,6 +85,48 @@ extern "C"
8585

8686
#define MFX_INFINITE 0xFFFFFFFF
8787

88+
#ifndef MFX_DEPRECATED_OFF
89+
#if defined(__cplusplus) && __cplusplus >= 201402L
90+
#define MFX_DEPRECATED [[deprecated]]
91+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg [[deprecated]]
92+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
93+
#elif defined(__clang__)
94+
#define MFX_DEPRECATED __attribute__((deprecated))
95+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
96+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
97+
#elif defined(__INTEL_COMPILER)
98+
#if (defined(_WIN32) || defined(_WIN64))
99+
#define MFX_DEPRECATED __declspec(deprecated)
100+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
101+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
102+
#elif defined(__linux__)
103+
#define MFX_DEPRECATED __attribute__((deprecated))
104+
#if defined(__cplusplus)
105+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
106+
#else
107+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
108+
#endif
109+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
110+
#endif
111+
#elif defined(_MSC_VER) && _MSC_VER > 1200 // VS 6 doesn't support deprecation
112+
#define MFX_DEPRECATED __declspec(deprecated)
113+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
114+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
115+
#elif defined(__GNUC__)
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+
#else
120+
#define MFX_DEPRECATED
121+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
122+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
123+
#endif
124+
#else
125+
#define MFX_DEPRECATED
126+
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
127+
#define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
128+
#endif
129+
88130
typedef unsigned char mfxU8; /*!< Unsigned integer, 8 bit type. */
89131
typedef char mfxI8; /*!< Signed integer, 8 bit type. */
90132
typedef short mfxI16; /*!< Signed integer, 16 bit type. */

source/elements/oneVPL/include/vpl/mfxdispatcher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ mfxStatus MFX_CDECL MFXCreateSession(mfxLoader loader, mfxU32 i, mfxSession* ses
193193

194194
/*!
195195
@brief
196-
Destroys handle allocated by the MFXQueryImplsCapabilities function.
196+
Destroys handle allocated by the MFXEnumImplementations function.
197197
198198
@param[in] loader Loader handle.
199199
@param[in] hdl Handle to destroy. Can be equal to NULL.

source/elements/oneVPL/include/vpl/mfximplcaps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mfxHDL* MFX_CDECL MFXQueryImplsDescription(mfxImplCapsDeliveryFormat format, mfx
3333

3434
/*!
3535
@brief
36-
Destroys the handle allocated by the MFXQueryImplsCapabilities function.
36+
Destroys the handle allocated by the MFXQueryImplsDescription function.
3737
Implementation must remember which handles are released. Once the last handle is released, this function must release memory
3838
allocated for the array of handles.
3939

source/elements/oneVPL/include/vpl/mfxsession.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,17 @@ typedef struct _mfxSession *mfxSession;
4949
MFX_ERR_UNSUPPORTED The function cannot find the desired legacy Intel(r) Media SDK implementation or version.
5050
5151
@since This function is available since API version 1.0.
52+
53+
@deprecated Deprecated in API version 2.3. Use MFXLoad and MFXCreateSession to initialize the session.
54+
Use MFX_DEPRECATED_OFF macro to turn off the deprecation message visualization.
5255
*/
53-
mfxStatus MFX_CDECL MFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session);
56+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session);
5457

5558
/*!
5659
@brief
5760
Creates and initializes a session in the legacy mode for compatibility with Intel(r) Media SDK applications.
5861
This function is deprecated starting from API version 2.0, applications must use MFXLoad with mfxCreateSession
59-
to select the implementation and initialize the session.
60-
62+
to select the implementation and initialize the session.
6163
6264
Call this function before calling any other API functions.
6365
If the desired implementation specified by ``par`` is MFX_IMPL_AUTO, the function will search for
@@ -72,7 +74,7 @@ mfxStatus MFX_CDECL MFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session);
7274
For example, if an application uses only H.264 decoding as described in API v1.0, the application should initialize the library with API v1.0. This ensures backward compatibility.
7375
7476
The argument ``par.ExternalThreads`` specifies threading mode. Value 0 means that the implementation should create and
75-
handle work threads internally (this is essentially the equivalent of the regular MFXInit). I
77+
handle work threads internally (this is essentially the equivalent of the regular MFXInit).
7678
7779
@param[in] par mfxInitParam structure that indicates the desired implementation, minimum library version and desired threading mode.
7880
@param[out] session Pointer to the session handle.
@@ -82,8 +84,11 @@ mfxStatus MFX_CDECL MFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session);
8284
MFX_ERR_UNSUPPORTED The function cannot find the desired implementation or version.
8385
8486
@since This function is available since API version 1.14.
87+
88+
@deprecated Deprecated in API version 2.3. Use MFXLoad and MFXCreateSession to initialize the session.
89+
Use MFX_DEPRECATED_OFF macro to turn off the deprecation message visualization.
8590
*/
86-
mfxStatus MFX_CDECL MFXInitEx(mfxInitParam par, mfxSession *session);
91+
MFX_DEPRECATED mfxStatus MFX_CDECL MFXInitEx(mfxInitParam par, mfxSession *session);
8792

8893
/*!
8994
@brief

0 commit comments

Comments
 (0)