From 8dd136056870dd76c8a8797747c2b51d8a19a3a6 Mon Sep 17 00:00:00 2001
From: Miroslav Goncharenko <miroslav.goncharenko@intel.com>
Date: Tue, 10 Oct 2023 18:27:00 +0200
Subject: [PATCH] api: Update for experimental features (#5844)

Co-authored-by: varistar <vasily.aristarkhov@intel.com>
---
 api/vpl/mfxcamera.h     |  2 --
 api/vpl/mfxdefs.h       |  4 ----
 api/vpl/mfxstructures.h | 16 ++--------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/api/vpl/mfxcamera.h b/api/vpl/mfxcamera.h
index 66790b4e7e..6407c4996f 100644
--- a/api/vpl/mfxcamera.h
+++ b/api/vpl/mfxcamera.h
@@ -8,7 +8,6 @@
 
 #include "mfxcommon.h"
 
-#ifdef ONEVPL_EXPERIMENTAL
 
 #if !defined(__GNUC__)
     #pragma warning(disable : 4201)
@@ -402,5 +401,4 @@ MFX_PACK_END()
 } // extern "C"
 #endif
 
-#endif // ONEVPL_EXPERIMENTAL
 #endif // __MFXCAMERA_H__
\ No newline at end of file
diff --git a/api/vpl/mfxdefs.h b/api/vpl/mfxdefs.h
index dd3eab3a16..685099ab76 100644
--- a/api/vpl/mfxdefs.h
+++ b/api/vpl/mfxdefs.h
@@ -148,9 +148,7 @@ typedef void*               mfxHDL;        /*!< Handle type. */
 typedef mfxHDL              mfxMemId;      /*!< Memory ID type. */
 typedef void*               mfxThreadTask; /*!< Thread task type. */
 typedef char                mfxChar;       /*!< UTF-8 byte. */
-#ifdef ONEVPL_EXPERIMENTAL
 typedef unsigned short      mfxFP16;       /*!< Half precision floating point, 16 bit type. */
-#endif
 
 /* MFX structures version info */
 MFX_PACK_BEGIN_USUAL_STRUCT()
@@ -237,9 +235,7 @@ typedef struct {
         mfxI64 I64; /*!< mfxI64 data. */
         mfxF32 F32; /*!< mfxF32 data. */
         mfxF64 F64; /*!< mfxF64 data. */
-#ifdef ONEVPL_EXPERIMENTAL
         mfxFP16 FP16; /*!< mfxFP16 data. */
-#endif
         mfxHDL Ptr; /*!< Pointer. When this points to a string the string must be null terminated. */
     } Data;         /*!< Value data member. */
 } mfxVariant;
diff --git a/api/vpl/mfxstructures.h b/api/vpl/mfxstructures.h
index 381198f681..79be8478ea 100644
--- a/api/vpl/mfxstructures.h
+++ b/api/vpl/mfxstructures.h
@@ -182,13 +182,9 @@ enum {
     MFX_FOURCC_BGRA         = MFX_FOURCC_RGB4,                 /*!< Alias for the RGB4 color format. */
     /*! BGR 24 bit planar layout (3 separate channels, 8-bits per sample each). This format should be mapped to VA_FOURCC_BGRP. */
     MFX_FOURCC_BGRP         = MFX_MAKEFOURCC('B','G','R','P'),
-#ifdef ONEVPL_EXPERIMENTAL
     /*! 8bit per sample 4:4:4 format packed in 32 bits, X=unused/undefined, 'X' channel is 8 MSBs, then 'Y', then 'U', and then 'V' channels. This format should be mapped to VA_FOURCC_XYUV. */
     MFX_FOURCC_XYUV         = MFX_MAKEFOURCC('X','Y','U','V'),
-#endif
-#ifdef ONEVPL_EXPERIMENTAL
     MFX_FOURCC_ABGR16F      = MFX_MAKEFOURCC('B', 'G', 'R', 'F'),  /*!< 16 bits float point ABGR color format packed in 64 bits. 'A' channel is 16 MSBs, then 'B', then 'G' and then 'R' channels. This format should be mapped to DXGI_FORMAT_R16G16B16A16_FLOAT or D3DFMT_A16B16G16R16F formats.. */
-#endif
 };
 
 /* PicStruct */
@@ -286,7 +282,6 @@ typedef struct
 } mfxA2RGB10;
 MFX_PACK_END()
 
-#ifdef ONEVPL_EXPERIMENTAL
 MFX_PACK_BEGIN_USUAL_STRUCT()
 /*! Specifies "pixel" in ABGR 16 bit half float point color format */
 typedef struct
@@ -297,7 +292,6 @@ typedef struct
     mfxFP16 A; /*!< A component. */
 } mfxABGR16FP;
 MFX_PACK_END()
-#endif
 
 /*! Describes frame buffer pointers. */
 MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
@@ -361,9 +355,7 @@ typedef struct {
         mfxU16  *V16;   /*!< V16 channel. */
         mfxU8   *B;     /*!< B channel. */
         mfxA2RGB10 *A2RGB10; /*!< A2RGB10 channel for A2RGB10 format (merged ARGB). */
-#ifdef ONEVPL_EXPERIMENTAL
         mfxABGR16FP* ABGRFP16; /*!< ABGRFP16 channel for half float ARGB format (use this merged one due to no separate FP16 Alpha Channel). */
-#endif
     };
     mfxU8       *A;     /*!< A channel. */
     mfxMemId    MemId;  /*!< Memory ID of the data buffers. Ignored if any of the preceding data pointers is non-zero. */
@@ -1689,9 +1681,7 @@ enum {
     MFX_CONTENT_UNKNOWN              = 0,
     MFX_CONTENT_FULL_SCREEN_VIDEO    = 1,
     MFX_CONTENT_NON_VIDEO_SCREEN     = 2,
-#ifdef ONEVPL_EXPERIMENTAL
     MFX_CONTENT_NOISY_VIDEO          = 3
-#endif
 };
 
 /*! The PRefType enumerator itemizes models of reference list construction and DPB management when GopRefDist=1. */
@@ -3730,12 +3720,8 @@ MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
 typedef struct {
     mfxExtBuffer    Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_MBQP. */
 
-#ifdef ONEVPL_EXPERIMENTAL
     mfxU32 reserved[9];
     mfxU32 Pitch;       /*!< Distance in bytes between the start of two consecutive rows in the QP array. */
-#else
-    mfxU32 reserved[10];
-#endif
     mfxU16 Mode;        /*!< Defines QP update mode. See MBQPMode enumerator for more details. */
     mfxU16 BlockSize;   /*!< QP block size, valid for HEVC only during Init and Runtime. */
     mfxU32 NumQPAlloc;  /*!< Size of allocated by application QP or DeltaQP array. */
@@ -5080,6 +5066,8 @@ MFX_PACK_END()
 
 #ifdef __cplusplus
 } // extern "C"
+
 #endif
 
+
 #endif