Skip to content

Commit dec69b2

Browse files
sujun96intel-mediadev
authored andcommitted
Revert "[Encode] Fix Av1 Adaptive TU perf issue on PTL"
This reverts commit 43a4bfd.
1 parent e54f709 commit dec69b2

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/codec/hal/enc/av1/packet/encode_av1_vdenc_packet_xe3_lpm_base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ MOS_STATUS Av1VdencPktXe3_Lpm_Base::AddOneTileCommands(
469469
SETPAR_AND_ADDCMD(VDENC_CMD1, m_vdencItf, tempCmdBuffer);
470470
}
471471

472-
if (brcFeature->IsBRCEnabled() && (m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable || m_basicFeature->m_av1PicParams->AdaptiveTUEnabled))
472+
if (brcFeature->IsBRCEnabled() && m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable)
473473
{
474474
uint32_t tileIdx = 0;
475475
RUN_FEATURE_INTERFACE_RETURN(Av1EncodeTile, Av1FeatureIDs::encodeTile, GetTileIdx, tileIdx);

media_softlet/agnostic/common/codec/hal/enc/av1/features/encode_av1_scc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ class Av1Scc : public MediaFeature, public mhw::vdbox::vdenc::Itf::ParSetting, p
7373

7474
MOS_STATUS Update(void *params) override;
7575

76-
bool IsPaletteEnabled() { return m_enablePalette; }
77-
void SetPalette(bool paletteEnabled) { m_enablePalette = paletteEnabled; }
78-
7976
virtual ~Av1Scc();
8077

8178
MHW_SETPAR_DECL_HDR(VDENC_HEVC_VP9_TILE_SLICE_STATE);

media_softlet/agnostic/common/codec/hal/enc/av1/packet/encode_av1_brc_update_packet.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
#include "encode_av1_brc.h"
3131
#include "encode_av1_vdenc_packet.h"
3232
#include "encode_av1_vdenc_lpla_enc.h"
33+
#if _MEDIA_RESERVED
3334
#include "encode_av1_scc.h"
35+
#endif
3436

3537
namespace encode
3638
{
@@ -171,16 +173,8 @@ namespace encode
171173
{
172174
auto original_TU = m_basicFeature->m_targetUsage;
173175
m_basicFeature->m_targetUsage = m_basicFeature->m_av1SeqParams->TargetUsage = 7;
174-
175-
auto sccFeature = dynamic_cast<Av1Scc *>(m_featureManager->GetFeature(Av1FeatureIDs::av1Scc));
176-
ENCODE_CHK_NULL_RETURN(sccFeature);
177-
bool original_Palette = sccFeature->IsPaletteEnabled();
178-
sccFeature->SetPalette(false);
179-
m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable = 0;
180176
ENCODE_CHK_STATUS_RETURN(ConstructBatchBufferHuCBRC(&m_vdencReadBatchBufferTU7[m_pipeline->m_currRecycledBufIdx][m_pipeline->GetCurrentPass()]));
181177
m_basicFeature->m_targetUsage = m_basicFeature->m_av1SeqParams->TargetUsage = original_TU;
182-
sccFeature->SetPalette(original_Palette);
183-
m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable = original_Palette;
184178
}
185179

186180
ENCODE_CHK_STATUS_RETURN(ConstructPakInsertHucBRC(&m_vdencPakInsertBatchBuffer[m_pipeline->m_currRecycledBufIdx]));
@@ -302,7 +296,7 @@ namespace encode
302296
ENCODE_CHK_STATUS_RETURN(AddAvpPicStateBaseOnTile(constructedCmdBuf, slbData));
303297

304298
/*----Group5----*/
305-
if (m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable || m_basicFeature->m_av1PicParams->AdaptiveTUEnabled)
299+
if (m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable)
306300
{
307301
slbData.vdencTileSliceStateOffset = (uint16_t)constructedCmdBuf.iOffset;
308302
ENCODE_CHK_STATUS_RETURN(AddVdencTileSliceBaseOnTile(constructedCmdBuf, slbData));

0 commit comments

Comments
 (0)