Faster M11 8k 4k presets - Updated MD / ADP / PF Settings to match those of the old M12 tune0 (#301)

Signed-off-by: htmar <[email protected]>

Author: hassount

Source/Lib/Codec/EbEncDecProcess.c

@@ -2689,10 +2689,12 @@ static EB_ERRORTYPE SignalDerivationEncDecKernelOq(
 			contextPtr->mdContext->intraMdOpenLoopFlag = pictureControlSetPtr->ParentPcsPtr->isUsedAsReferenceFlag == EB_TRUE ? EB_FALSE : EB_TRUE;
 		}
 	}
+    else if (pictureControlSetPtr->encMode <= ENC_MODE_10) {
+        contextPtr->mdContext->intraMdOpenLoopFlag = pictureControlSetPtr->temporalLayerIndex == 0 ? EB_FALSE : EB_TRUE;
+    }
     else {
-    		contextPtr->mdContext->intraMdOpenLoopFlag = pictureControlSetPtr->temporalLayerIndex == 0 ? EB_FALSE : EB_TRUE;
+        contextPtr->mdContext->intraMdOpenLoopFlag = pictureControlSetPtr->sliceType == EB_I_PICTURE ? EB_FALSE : EB_TRUE;
     }
-
     // Derive INTRA Injection Method
     // 0 : Default (OIS)
     // 1 : Enhanced I_PICTURE, Default (OIS) otherwise 
@@ -2832,7 +2834,7 @@ static EB_ERRORTYPE SignalDerivationEncDecKernelOq(
     }
 
     // Set AMVP Generation @ MD Flag
-    contextPtr->mdContext->generateAmvpTableMd = EB_TRUE;
+    contextPtr->mdContext->generateAmvpTableMd = (pictureControlSetPtr->encMode <= ENC_MODE_10) ? EB_TRUE : EB_FALSE;
 
     // Set Cbf based Full-Loop Escape Flag
     if (pictureControlSetPtr->encMode <= ENC_MODE_1) {
@@ -2890,8 +2892,8 @@ static EB_ERRORTYPE SignalDerivationEncDecKernelOq(
     contextPtr->pmMethod = 0;
 
     // Set Fast EL Flag
-    contextPtr->fastEl = EB_FALSE;
-	contextPtr->yBitsThsld = YBITS_THSHLD_1(0);
+    contextPtr->fastEl      = (pictureControlSetPtr->encMode <= ENC_MODE_10) ? EB_FALSE : EB_TRUE;
+	contextPtr->yBitsThsld  = (pictureControlSetPtr->encMode <= ENC_MODE_10) ? YBITS_THSHLD_1(0) : YBITS_THSHLD_1(12);
 
     // Set SAO Mode
     contextPtr->saoMode = (pictureControlSetPtr->ParentPcsPtr->encMode <= ENC_MODE_10) ? 1 : 0;
@@ -3009,9 +3011,6 @@ static EB_ERRORTYPE SignalDerivationEncDecKernelOq(
         if (pictureControlSetPtr->sliceType == EB_I_PICTURE) {
             contextPtr->mdContext->pfMdLevel = 1;
         }
-        else if (pictureControlSetPtr->ParentPcsPtr->temporalLayerIndex == 0) {
-            contextPtr->mdContext->pfMdLevel = 1;
-        }
         else {
             contextPtr->mdContext->pfMdLevel = 3;
         }

Source/Lib/Codec/EbModeDecisionConfigurationProcess.c

@@ -1522,12 +1522,12 @@ void SetTargetBudgetOq(
             budget = (contextPtr->adpDepthSensitivePictureClass == DEPTH_SENSITIVE_PIC_CLASS_2) ?
             pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * OPEN_LOOP_COST :
             (contextPtr->adpDepthSensitivePictureClass == DEPTH_SENSITIVE_PIC_CLASS_1) ?
-            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * U_104 :
-            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * U_103;
+            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * 100 :
+            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * 100;
         else
             budget = (contextPtr->adpDepthSensitivePictureClass == DEPTH_SENSITIVE_PIC_CLASS_2) ?
-            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * U_104 :
-            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * U_103;
+            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * 100 :
+            pictureControlSetPtr->ParentPcsPtr->lcuTotalCount * 100;
     }
 
 

Source/Lib/Codec/EbPictureDecisionProcess.c

@@ -664,7 +664,7 @@ EB_ERRORTYPE SignalDerivationMultiProcessesOq(
 	  pictureControlSetPtr->cu16x16Mode = CU_16x16_MODE_0;
 
     // Set Skip OIS 8x8 Flag
-    pictureControlSetPtr->skipOis8x8 = EB_FALSE;
+    pictureControlSetPtr->skipOis8x8 = (pictureControlSetPtr->sliceType == EB_I_PICTURE && (pictureControlSetPtr->encMode <= ENC_MODE_10)) ? EB_FALSE : EB_TRUE;
 
     return return_error;
 }