|
30 | 30 | #include "encode_av1_brc.h" |
31 | 31 | #include "encode_av1_vdenc_packet.h" |
32 | 32 | #include "encode_av1_vdenc_lpla_enc.h" |
| 33 | +#if _MEDIA_RESERVED |
33 | 34 | #include "encode_av1_scc.h" |
| 35 | +#endif |
34 | 36 |
|
35 | 37 | namespace encode |
36 | 38 | { |
@@ -171,16 +173,8 @@ namespace encode |
171 | 173 | { |
172 | 174 | auto original_TU = m_basicFeature->m_targetUsage; |
173 | 175 | 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; |
180 | 176 | ENCODE_CHK_STATUS_RETURN(ConstructBatchBufferHuCBRC(&m_vdencReadBatchBufferTU7[m_pipeline->m_currRecycledBufIdx][m_pipeline->GetCurrentPass()])); |
181 | 177 | 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; |
184 | 178 | } |
185 | 179 |
|
186 | 180 | ENCODE_CHK_STATUS_RETURN(ConstructPakInsertHucBRC(&m_vdencPakInsertBatchBuffer[m_pipeline->m_currRecycledBufIdx])); |
@@ -302,7 +296,7 @@ namespace encode |
302 | 296 | ENCODE_CHK_STATUS_RETURN(AddAvpPicStateBaseOnTile(constructedCmdBuf, slbData)); |
303 | 297 |
|
304 | 298 | /*----Group5----*/ |
305 | | - if (m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable || m_basicFeature->m_av1PicParams->AdaptiveTUEnabled) |
| 299 | + if (m_basicFeature->m_av1PicParams->PicFlags.fields.PaletteModeEnable) |
306 | 300 | { |
307 | 301 | slbData.vdencTileSliceStateOffset = (uint16_t)constructedCmdBuf.iOffset; |
308 | 302 | ENCODE_CHK_STATUS_RETURN(AddVdencTileSliceBaseOnTile(constructedCmdBuf, slbData)); |
|
0 commit comments