From c12125271eaa5cca46f2539f311cec980ab12af7 Mon Sep 17 00:00:00 2001 From: Bossonor Date: Fri, 16 Aug 2024 09:55:39 +0800 Subject: [PATCH] [Encode] Modify features sensitive name * [Encode] Modify features name Modify features name, including lut modify and scc/aqm/fastpass name open --- ...ode_av1_vdenc_feature_manager_xe_lpm_plus_base.cpp | 11 ++++------- .../enc/av1/features/encode_av1_vdenc_feature_defs.h | 5 ++++- .../agnostic/common/hw/vdbox/mhw_vdbox_vdenc_cmdpar.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/codec/hal/enc/av1/features/encode_av1_vdenc_feature_manager_xe_lpm_plus_base.cpp b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/codec/hal/enc/av1/features/encode_av1_vdenc_feature_manager_xe_lpm_plus_base.cpp index 45448ccffc8..58aeb3efb19 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/codec/hal/enc/av1/features/encode_av1_vdenc_feature_manager_xe_lpm_plus_base.cpp +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/codec/hal/enc/av1/features/encode_av1_vdenc_feature_manager_xe_lpm_plus_base.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2021 - 2023, Intel Corporation +* Copyright (c) 2021 - 2024, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -31,11 +31,8 @@ #include "encode_av1_vdenc_const_settings_xe_lpm_plus_base.h" #include "encode_av1_pipeline.h" #include "encode_av1_vdenc_lpla_enc.h" - #if _MEDIA_RESERVED -#define ENCODE_AV1_RESERVED_FRATURE1 -#include "encode_av1_feature_ext.h" -#undef ENCODE_AV1_RESERVED_FRATURE1 +#include "encode_av1_aqm.h" #endif // !(_MEDIA_RESERVED) namespace encode @@ -83,8 +80,8 @@ MOS_STATUS EncodeAv1VdencFeatureManagerXe_Lpm_Plus_Base::CreateFeatures(void *co ENCODE_CHK_STATUS_RETURN(RegisterFeatures(Av1FeatureIDs::av1LplaEncFeature, lplaEnc, {Av1Pipeline::encodePreEncPacket})); #if _MEDIA_RESERVED - Av1ReservedFeature1* av1ReservedFeature1 = MOS_New(Av1ReservedFeature1, this, m_allocator, m_hwInterface, constSettings); - ENCODE_CHK_STATUS_RETURN(RegisterFeatures(Av1FeatureIDs::av1ReservedFeatureID3, av1ReservedFeature1, {Av1Pipeline::encodePreEncPacket})); + Av1EncodeAqm *encAqm = MOS_New(Av1EncodeAqm, this, m_allocator, m_hwInterface, constSettings); + ENCODE_CHK_STATUS_RETURN(RegisterFeatures(Av1FeatureIDs::av1Aqm, encAqm, { Av1Pipeline::encodePreEncPacket })); #endif // !(_MEDIA_RESERVED) return MOS_STATUS_SUCCESS; } diff --git a/media_softlet/agnostic/common/codec/hal/enc/av1/features/encode_av1_vdenc_feature_defs.h b/media_softlet/agnostic/common/codec/hal/enc/av1/features/encode_av1_vdenc_feature_defs.h index 48a99ce89bf..d2e2e60a1cf 100644 --- a/media_softlet/agnostic/common/codec/hal/enc/av1/features/encode_av1_vdenc_feature_defs.h +++ b/media_softlet/agnostic/common/codec/hal/enc/av1/features/encode_av1_vdenc_feature_defs.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2020 - 2023, Intel Corporation +* Copyright (c) 2020 - 2024, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -41,6 +41,9 @@ struct Av1FeatureIDs : public FeatureIDs av1BrcFeature, av1LplaEncFeature, av1FullEncFeature, + av1Scc, + av1Aqm, + av1FastPass, #if _MEDIA_RESERVED #define AV1_FEATURE_IDS_EXT #include "encode_av1_vdenc_feature_defs_ext.h" diff --git a/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_cmdpar.h b/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_cmdpar.h index 0066c07c84a..7e35bdb457d 100644 --- a/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_cmdpar.h +++ b/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_cmdpar.h @@ -179,9 +179,9 @@ struct _MHW_PAR_T(VDENC_PIPE_MODE_SELECT) uint8_t VdencPipeModeSelectPar6 = 0; uint8_t VdencPipeModeSelectPar7 = 0; uint8_t VdencPipeModeSelectPar8 = 0; - bool VdencPipeModeSelectPar9 = false; - uint8_t VdencPipeModeSelectPar10 = 0; - uint8_t VdencPipeModeSelectPar11 = 0; + bool fastPassEn = false; + uint8_t fastPassScale = 0; + uint8_t DownScaleType = 0; uint8_t VdencPipeModeSelectPar12 = 0; uint8_t VdencPipeModeSelectPar13 = 0; };