Skip to content

Commit b6e613f

Browse files
SenlinGeintel-mediadev
SenlinGe
authored and
intel-mediadev
committed
[Encode] compile command line optimization
replace and remove unused marcos
1 parent c4b3b4a commit b6e613f

30 files changed

+49
-71
lines changed

‎media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_hpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include "mhw_hwcmd.h"
3838

39-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
39+
#ifdef _MEDIA_RESERVED
4040
#include "mhw_vdbox_avp_cmdpar_ext.h"
4141
#endif
4242

‎media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe_hpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ struct _VDENC_CMD1_CMD
490490
static const size_t byteSize = 132;
491491
};
492492

493-
#if IGFX_VDENC_INTERFACE_EXT_SUPPORT
493+
#if _MEDIA_RESERVED
494494
#include "mhw_vdbox_vdenc_hwcmd_xe_hpm_ext.h"
495495
#else
496496
struct _VDENC_CMD2_CMD

‎media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_vdenc_xe_hpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#ifndef __MHW_VDBOX_VDENC_XE_HPM_H__
3131
#define __MHW_VDBOX_VDENC_XE_HPM_H__
3232

33-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
33+
#ifdef _MEDIA_RESERVED
3434
#include "mhw_vdbox_vdenc_hwcmd_ext.h"
3535
#endif
3636
#include "mhw_vdbox_vdenc_hwcmd_xe_hpm.h"

‎media_driver/agnostic/gen11/codec/hal/codechal_vdenc_hevc_g11.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mhw_vdbox_vdenc_g11_X.h"
3636
#include "codechal_huc_cmd_initializer_g11.h"
3737
#include "codechal_debug_encode_par_g11.h"
38-
#ifdef _ENCODE_VDENC_RESERVED
38+
#ifdef _MEDIA_RESERVED
3939
#include "codechal_debug_encode_brc.h"
4040
#endif
4141

@@ -5907,7 +5907,7 @@ MOS_STATUS CodechalVdencHevcStateG11::HuCLookaheadInit()
59075907
virtualAddrParams.regionParams[0].presRegion = &m_vdencLaHistoryBuffer;
59085908
virtualAddrParams.regionParams[0].isWritable = true;
59095909

5910-
#if USE_CODECHAL_DEBUG_TOOL && _ENCODE_VDENC_RESERVED
5910+
#if USE_CODECHAL_DEBUG_TOOL && _MEDIA_RESERVED
59115911
if (m_swLaMode)
59125912
{
59135913
CODECHAL_ENCODE_CHK_STATUS_RETURN(CodecHal_DbgCallSwLookaheadImpl(
@@ -6022,7 +6022,7 @@ MOS_STATUS CodechalVdencHevcStateG11::HuCLookaheadUpdate()
60226022
virtualAddrParams.regionParams[2].presRegion = &m_vdencLaDataBuffer;
60236023
virtualAddrParams.regionParams[2].isWritable = true;
60246024

6025-
#if USE_CODECHAL_DEBUG_TOOL && _ENCODE_VDENC_RESERVED
6025+
#if USE_CODECHAL_DEBUG_TOOL && _MEDIA_RESERVED
60266026
if (m_swLaMode)
60276027
{
60286028
bool isLaAnalysisRequired = true;

‎media_driver/agnostic/gen12/codec/hal/codechal_vdenc_hevc_g12.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "codechal_mmc_encode_hevc_g12.h"
3939
#include "mhw_mmio_g12.h"
4040
#include "hal_oca_interface.h"
41-
#ifdef _ENCODE_VDENC_RESERVED
41+
#ifdef _MEDIA_RESERVED
4242
#include "codechal_debug_encode_brc.h"
4343
#endif
4444
const uint32_t CodechalVdencHevcStateG12::m_VdboxVDENCRegBase[4] = M_VDBOX_VDENC_REG_BASE;
@@ -626,7 +626,7 @@ CodechalVdencHevcStateG12::~CodechalVdencHevcStateG12()
626626
CODECHAL_DEBUG_TOOL(
627627
MOS_Delete(m_encodeParState);
628628
)
629-
#ifdef _ENCODE_VDENC_RESERVED
629+
#ifdef _MEDIA_RESERVED
630630
if (m_rsvdState)
631631
{
632632
MOS_Delete(m_rsvdState);
@@ -5350,7 +5350,7 @@ void CodechalVdencHevcStateG12::SetVdencPipeModeSelectParams(MHW_VDBOX_PIPE_MODE
53505350
// Set lookahead pass flag
53515351
pipeModeSelectParams.bLookaheadPass = m_lookaheadPass;
53525352

5353-
#ifdef _ENCODE_VDENC_RESERVED
5353+
#ifdef _MEDIA_RESERVED
53545354
if (m_rsvdState)
53555355
{
53565356
m_rsvdState->SetVdencPipeModeSelectParams(pipeModeSelectParams);
@@ -6433,7 +6433,7 @@ MOS_STATUS CodechalVdencHevcStateG12::Initialize(CodechalSetting * settings)
64336433

64346434
m_sizeOfHcpPakFrameStats = 9 * CODECHAL_CACHELINE_SIZE;
64356435

6436-
#ifdef _ENCODE_VDENC_RESERVED
6436+
#ifdef _MEDIA_RESERVED
64376437
InitReserveState(settings);
64386438
#endif
64396439
m_enableSCC = settings->isSCCEnabled;
@@ -7486,7 +7486,7 @@ MOS_STATUS CodechalVdencHevcStateG12::InitMmcState()
74867486
return MOS_STATUS_SUCCESS;
74877487
}
74887488

7489-
#ifdef _ENCODE_VDENC_RESERVED
7489+
#ifdef _MEDIA_RESERVED
74907490
MOS_STATUS CodechalVdencHevcStateG12::InitReserveState(CodechalSetting * settings)
74917491
{
74927492
CODECHAL_ENCODE_FUNCTION_ENTER;
@@ -8209,7 +8209,7 @@ MOS_STATUS CodechalVdencHevcStateG12::HuCLookaheadInit()
82098209
virtualAddrParams.regionParams[0].presRegion = &m_vdencLaHistoryBuffer;
82108210
virtualAddrParams.regionParams[0].isWritable = true;
82118211

8212-
#if USE_CODECHAL_DEBUG_TOOL && _ENCODE_VDENC_RESERVED
8212+
#if USE_CODECHAL_DEBUG_TOOL && _MEDIA_RESERVED
82138213
if (m_swLaMode)
82148214
{
82158215
CODECHAL_ENCODE_CHK_STATUS_RETURN(CodecHal_DbgCallSwLookaheadImpl(
@@ -8324,7 +8324,7 @@ MOS_STATUS CodechalVdencHevcStateG12::HuCLookaheadUpdate()
83248324
virtualAddrParams.regionParams[2].presRegion = &m_vdencLaDataBuffer;
83258325
virtualAddrParams.regionParams[2].isWritable = true;
83268326

8327-
#if USE_CODECHAL_DEBUG_TOOL && _ENCODE_VDENC_RESERVED
8327+
#if USE_CODECHAL_DEBUG_TOOL && _MEDIA_RESERVED
83288328
if (m_swLaMode)
83298329
{
83308330
bool isLaAnalysisRequired = true;
@@ -8562,7 +8562,7 @@ MOS_STATUS CodechalVdencHevcStateG12::HuCBrcInitReset()
85628562

85638563
CODECHAL_ENCODE_FUNCTION_ENTER;
85648564

8565-
#if (_DEBUG || _RELEASE_INTERNAL) && _ENCODE_VDENC_RESERVED
8565+
#if (_DEBUG || _RELEASE_INTERNAL) && _MEDIA_RESERVED
85668566
if (m_swBrcMode != nullptr && !m_enableTileReplay && !m_hevcVdencWeightedPredEnabled)
85678567
{
85688568
CODECHAL_ENCODE_CHK_STATUS_RETURN(SetDmemHuCBrcInitReset());
@@ -8738,7 +8738,7 @@ MOS_STATUS CodechalVdencHevcStateG12::HuCBrcUpdate()
87388738

87398739
CODECHAL_ENCODE_CHK_STATUS_RETURN(ConstructBatchBufferHuCBRC(&m_vdencReadBatchBuffer[m_currRecycledBufIdx][currentPass]));
87408740

8741-
#if (_DEBUG || _RELEASE_INTERNAL) && _ENCODE_VDENC_RESERVED
8741+
#if (_DEBUG || _RELEASE_INTERNAL) && _MEDIA_RESERVED
87428742
if (m_swBrcMode != nullptr && !m_enableTileReplay && !m_hevcVdencWeightedPredEnabled)
87438743
{
87448744
CODECHAL_ENCODE_CHK_STATUS_RETURN(SetDmemHuCBrcUpdate());

‎media_driver/agnostic/gen12/codec/hal/codechal_vdenc_hevc_g12.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "codechal_debug_encode_par_g12.h"
3333
#include "codechal_encode_singlepipe_virtualengine.h"
3434
#include "codechal_encode_scalability.h"
35-
#ifdef _ENCODE_VDENC_RESERVED
35+
#ifdef _MEDIA_RESERVED
3636
#include "codechal_vdenc_hevc_g12_rsvd.h"
3737
#endif
3838

@@ -2713,7 +2713,7 @@ class CodechalVdencHevcStateG12 : public CodechalVdencHevcState
27132713
MOS_STATUS SetRoundingValues();
27142714

27152715
protected:
2716-
#ifdef _ENCODE_VDENC_RESERVED
2716+
#ifdef _MEDIA_RESERVED
27172717
CodechalVdencHevcG12Rsvd *m_rsvdState = nullptr;
27182718
#endif
27192719

‎media_driver/media_interface/media_interfaces_dg2/media_interfaces_dg2.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#include "mhw_vdbox_avp_xe_hpm.h"
5656
#include "mhw_vdbox_huc_xe_hpm.h"
5757
#include "mhw_vdbox_avp_g12_X.h"
58-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
58+
#ifdef _MEDIA_RESERVED
5959
#include "mhw_vdbox_vdenc_xe_hpm_ext.h"
6060
#else
6161
#include "mhw_vdbox_vdenc_xe_hpm.h"
@@ -157,7 +157,7 @@ class MhwInterfacesDg2_Next : public MhwInterfacesNext
157157
using Mfx = MhwVdboxMfxInterfaceXe_Xpm;
158158
using Hcp = MhwVdboxHcpInterfaceXe_Hpm;
159159
using Huc = MhwVdboxHucInterfaceXe_Hpm;
160-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
160+
#ifdef _MEDIA_RESERVED
161161
using Vdenc = MhwVdboxVdencInterfaceXe_HpmExt;
162162
#else
163163
using Vdenc = MhwVdboxVdencInterfaceXe_Hpm;
@@ -194,7 +194,7 @@ class MhwInterfacesDg2 : public MhwInterfaces
194194
using Hcp = MhwVdboxHcpInterfaceXe_Hpm;
195195
using Avp = MhwVdboxAvpInterfaceXe_Hpm;
196196
using Huc = MhwVdboxHucInterfaceXe_Hpm;
197-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
197+
#ifdef _MEDIA_RESERVED
198198
using Vdenc = MhwVdboxVdencInterfaceXe_HpmExt;
199199
#else
200200
using Vdenc = MhwVdboxVdencInterfaceXe_Hpm;

‎media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ MOS_STATUS MhwInterfacesG12Tgllp::Initialize(
142142
CreateParams params,
143143
PMOS_INTERFACE osInterface)
144144
{
145-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
145+
#ifdef _MEDIA_RESERVED
146146
bool useBaseVdencInterface = false;
147147
#if (_DEBUG || _RELEASE_INTERNAL)
148148
MOS_USER_FEATURE_VALUE_DATA UserFeatureData;
@@ -280,7 +280,7 @@ MOS_STATUS MhwInterfacesG12Tgllp::Initialize(
280280
}
281281
if (params.Flags.m_vdboxAll || params.Flags.m_vdenc)
282282
{
283-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
283+
#ifdef _MEDIA_RESERVED
284284
#if (_DEBUG || _RELEASE_INTERNAL)
285285
if(useBaseVdencInterface)
286286
{

‎media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "mhw_blt_legacy.h"
5252
#include "mhw_vdbox_avp_g12_X.h"
5353

54-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
54+
#ifdef _MEDIA_RESERVED
5555
#include "mhw_vdbox_vdenc_g12_X_ext.h"
5656
#endif
5757

@@ -165,7 +165,7 @@ class MhwInterfacesG12Tgllp : public MhwInterfaces
165165
using Hcp = MhwVdboxHcpInterfaceG12;
166166
using Huc = MhwVdboxHucInterfaceG12;
167167
using Avp = MhwVdboxAvpInterfaceG12;
168-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
168+
#ifdef _MEDIA_RESERVED
169169
using Vdenc = MhwVdboxVdencInterfaceG12ExtX;
170170
#else
171171
using Vdenc = MhwVdboxVdencInterfaceG12X;

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_lpm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <cstddef>
4242
#include "media_class_trace.h"
4343

44-
#ifdef IGFX_AQM_INTERFACE_EXT_SUPPORT
44+
#ifdef _MEDIA_RESERVED
4545
#include "mhw_vdbox_aqm_hwcmd_ext.h"
4646
#endif
4747

@@ -347,7 +347,7 @@ class Cmd
347347
static const size_t byteSize = 8;
348348
};
349349

350-
#ifdef IGFX_AQM_INTERFACE_EXT_SUPPORT
350+
#ifdef _MEDIA_RESERVED
351351
#include "mhw_vdbox_aqm_hwcmd_xe2_lpm_ext.h"
352352
#else
353353
//!

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_impl_xe2_lpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Impl : public aqm::Impl<Cmd>
5151
public:
5252
Impl(PMOS_INTERFACE osItf) : base_t(osItf){};
5353

54-
#ifdef IGFX_AQM_INTERFACE_EXT_SUPPORT
54+
#ifdef _MEDIA_RESERVED
5555
#include "mhw_vdbox_aqm_impl_xe2_lpm_ext.h"
5656
#endif
5757

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_lpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <cstddef>
4343
#include "media_class_trace.h"
4444

45-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
45+
#ifdef _MEDIA_RESERVED
4646
#include "mhw_vdbox_avp_hwcmd_ext.h"
4747
#endif
4848

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_impl_xe2_lpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "mhw_vdbox_avp_impl_xe2_lpm_base.h"
3232
#include "mhw_vdbox_avp_hwcmd_xe2_lpm.h"
3333

34-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
34+
#ifdef _MEDIA_RESERVED
3535
#include "mhw_vdbox_avp_impl_xe2_lpm_ext.h"
3636
#endif
3737

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_lpm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define __MHW_VDBOX_VDENC_HWCMD_XE2_LPM_H__
3333

3434
#include "mhw_hwcmd.h"
35-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
35+
#ifdef _MEDIA_RESERVED
3636
#include "mhw_vdbox_vdenc_hwcmd_ext.h"
3737
#endif
3838

@@ -748,7 +748,7 @@ struct _VDENC_CMD3_CMD
748748
static const size_t byteSize = 92;
749749
};
750750

751-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
751+
#ifdef _MEDIA_RESERVED
752752
#include "mhw_vdbox_vdenc_hwcmd_xe2_lpm_ext.h"
753753
#else
754754
struct _VDENC_CMD2_CMD

‎media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/vdbox/mhw_vdbox_vdenc_impl_xe2_lpm_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "mhw_vdbox_vdenc_impl.h"
3232

33-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
33+
#ifdef _MEDIA_RESERVED
3434
#include "mhw_vdbox_vdenc_impl_xe2_lpm_base_ext.h"
3535
#endif
3636

‎media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe3_lpm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define __MHW_VDBOX_VDENC_HWCMD_XE3_LPM_H__
3333

3434
#include "mhw_hwcmd.h"
35-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
35+
#ifdef _MEDIA_RESERVED
3636
#include "mhw_vdbox_vdenc_hwcmd_ext.h"
3737
#endif
3838

@@ -839,7 +839,7 @@ struct _VDENC_CMD3_CMD
839839
static const size_t byteSize = 92;
840840
};
841841

842-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
842+
#ifdef _MEDIA_RESERVED
843843
#include "mhw_vdbox_vdenc_hwcmd_xe3_lpm_ext.h"
844844
#else
845845
struct _VDENC_CMD2_CMD

‎media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/codec/hal/dec/av1/packet/decode_av1_picture_packet_xe3_lpm_base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ namespace decode
256256
params = {};
257257
Av1DecodePicPkt::MHW_SETPAR_F(AVP_SURFACE_STATE)(params);
258258

259-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
259+
#ifdef _MEDIA_RESERVED
260260
if (m_av1PicParams->m_seqInfoFlags.m_fields.m_subsamplingX == 0 && m_av1PicParams->m_seqInfoFlags.m_fields.m_subsamplingY == 0) // 4:4:4
261261
{
262262
if (params.bitDepthLumaMinus8 == 0)

‎media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/vdbox/mhw_vdbox_avp_impl_xe3_lpm_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "mhw_vdbox_avp_impl.h"
3232
#include "mhw_vdbox_avp_hwcmd_xe3_lpm.h"
3333

34-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
34+
#ifdef _MEDIA_RESERVED
3535
#include "mhw_vdbox_avp_impl_xe3_lpm_base_ext.h"
3636
#endif
3737

‎media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/vdbox/mhw_vdbox_vdenc_impl_xe3_lpm_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "mhw_vdbox_vdenc_impl.h"
3232

33-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
33+
#ifdef _MEDIA_RESERVED
3434
#include "mhw_vdbox_vdenc_impl_xe3_lpm_base_ext.h"
3535
#endif
3636

‎media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_hpm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <cstddef>
4343
#include "media_class_trace.h"
4444

45-
#ifdef IGFX_AQM_INTERFACE_EXT_SUPPORT
45+
#ifdef _MEDIA_RESERVED
4646
#include "mhw_vdbox_aqm_hwcmd_ext.h"
4747
#endif
4848

@@ -339,7 +339,7 @@ class Cmd
339339
static const size_t byteSize = 8;
340340
};
341341

342-
#ifdef IGFX_AQM_INTERFACE_EXT_SUPPORT
342+
#ifdef _MEDIA_RESERVED
343343
#include "mhw_vdbox_aqm_hwcmd_xe2_hpm_ext.h"
344344
#else
345345
//!

‎media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_hpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <cstddef>
4141
#include "media_class_trace.h"
4242

43-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
43+
#ifdef _MEDIA_RESERVED
4444
#include "mhw_vdbox_avp_hwcmd_ext.h"
4545
#endif
4646

‎media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_hpm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#pragma pack(1)
3737

3838
#include "mhw_hwcmd.h"
39-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
39+
#ifdef _MEDIA_RESERVED
4040
#include "mhw_vdbox_vdenc_hwcmd_ext.h"
4141
#endif
4242

@@ -748,7 +748,7 @@ struct _VDENC_CMD3_CMD
748748
static const size_t byteSize = 92;
749749
};
750750

751-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
751+
#ifdef _MEDIA_RESERVED
752752
#include "mhw_vdbox_vdenc_hwcmd_xe2_hpm_ext.h"
753753
#else
754754
struct _VDENC_CMD2_CMD

‎media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_lpm_plus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <cstddef>
4242
#include "media_class_trace.h"
4343

44-
#ifdef IGFX_AVP_INTERFACE_EXT_SUPPORT
44+
#ifdef _MEDIA_RESERVED
4545
#include "mhw_vdbox_avp_hwcmd_ext.h"
4646
#endif
4747

‎media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe_lpm_plus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ struct _VDENC_CMD3_CMD
680680
static const size_t byteSize = 92;
681681
};
682682

683-
#ifdef IGFX_VDENC_INTERFACE_EXT_SUPPORT
683+
#ifdef _MEDIA_RESERVED
684684
#include "mhw_vdbox_vdenc_hwcmd_xe_lpm_plus_ext.h"
685685
#else
686686
struct _VDENC_CMD2_CMD

0 commit comments

Comments
 (0)