Ticket #269: merge_mode_mods.patch

TEncCu.cpp

@@ -608 +608 @@
           Bool bTestMergeAMP_Hor = false, bTestMergeAMP_Ver = false;
 
           deriveTestModeAMP (rpcBestCU, eParentPartSize, bTestAMP_Hor, bTestAMP_Ver, bTestMergeAMP_Hor, bTestMergeAMP_Ver);
+
+                  if( !pcPic->getSlice(0)->getSPS()->getUseMRG() )
+                  {
+                          bTestMergeAMP_Hor = false; bTestMergeAMP_Ver = false;
+                  }
 #else
           deriveTestModeAMP (rpcBestCU, eParentPartSize, bTestAMP_Hor, bTestAMP_Ver);
 #endif

TEncSearch.cpp

@@ -2939 +2939 @@
     } // end if bTestNormalMC
 #endif
 
-    if ( pcCU->getSlice()->getSPS()->getUseMRG() && pcCU->getPartitionSize( uiPartAddr ) != SIZE_2Nx2N )
+    if ( /*pcCU->getSlice()->getSPS()->getUseMRG()*/bUseMRG && pcCU->getPartitionSize( uiPartAddr ) != SIZE_2Nx2N )
     {
       UInt uiMRGInterDir = 0;     
       TComMvField cMRGMvField[2];