Merge pull request #409 from adamjw24/develop_fix2prctiles

Add a hotfix for IPF/Tiles with 2pRC operation
fraunhoferhhi · Jul 30, 2024 · c306b2c · c306b2c
2 parents 4488526 + ce6c979
commit c306b2c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
@@ -73,6 +73,8 @@ namespace vvenc {
 
 #define IFP_RC_DETERMINISTIC                              0 // Enables Rate Control deterministic behavior (same results) when using IFP
 
+#define TILES_IFP_2PRC_HOTFIX                             1 // Fix tiles and IFP with 2pRC operation, TODO: add proper fix, this is more of a dirty hotfix
+
 // ====================================================================================================================
 // General settings
 // ====================================================================================================================

diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
@@ -365,6 +365,16 @@ void EncLib::xInitRCCfg()
     m_firstPassCfg.m_SourceHeight = ( m_encCfg.m_SourceHeight >> 1 ) & ( ~7 );
     m_firstPassCfg.m_PadSourceWidth  = m_firstPassCfg.m_SourceWidth;
     m_firstPassCfg.m_PadSourceHeight = m_firstPassCfg.m_SourceHeight;
+#if TILES_IFP_2PRC_HOTFIX
+    if( m_firstPassCfg.m_ifp && (m_firstPassCfg.m_numTileCols > 1 || m_firstPassCfg.m_numTileRows > 1) )
+    {
+      // due to sub-sampling, expected different tile configuration in cfg (m_tileRowHeight[], m_tileColumnWidth[])
+      // currently, disable auto tiles for the first pass
+      m_firstPassCfg.m_numTileCols = 1;
+      m_firstPassCfg.m_numTileRows = 1;
+      m_firstPassCfg.m_picPartitionFlag = false;
+    }
+#endif
   }
 
   // preserve some settings