set reference info

Signed-off-by: Jing Li <[email protected]>

Source/Lib/Codec/EbDefinitions.h

@@ -13,7 +13,7 @@ extern "C" {
 
 //#define BENCHMARK 0
 #define LATENCY_PROFILE 0
-#define DEBUG_LIFE_CYCLE 0
+//#define DEBUG_LIFE_CYCLE 0
 // Internal Marcos
 #define NON_AVX512_SUPPORT
 

Source/Lib/Codec/EbEncDecProcess.c

@@ -1867,19 +1867,6 @@ static void PadRefAndSetFlags(
             refPic16BitPtr->originY >> subHeightCMinus1);   
     }
 
-    // set up TMVP flag for the reference picture
-    referenceObject->tmvpEnableFlag = (pictureControlSetPtr->ParentPcsPtr->isUsedAsReferenceFlag) ? EB_TRUE : EB_FALSE;
-
-    // set up the ref POC
-    referenceObject->refPOC = pictureControlSetPtr->ParentPcsPtr->pictureNumber;
-
-    // set up the QP
-    referenceObject->qp = (EB_U8)pictureControlSetPtr->ParentPcsPtr->pictureQp;
-
-    // set up the Slice Type
-    referenceObject->sliceType = pictureControlSetPtr->ParentPcsPtr->sliceType;
-
-
 }
 
 
@@ -2772,6 +2759,20 @@ void* EncDecKernel(void *inputPtr)
             //this function could be optimized by removed chroma, and unessary TU sizes.
             PrecomputeCabacCost(&(*pictureControlSetPtr->cabacCost),
                     (CabacEncodeContext_t*)pictureControlSetPtr->coeffEstEntropyCoderPtr->cabacEncodeContextPtr);
+            if (pictureControlSetPtr->ParentPcsPtr->isUsedAsReferenceFlag == EB_TRUE) {
+                EbReferenceObject_t   *referenceObject = (EbReferenceObject_t*)pictureControlSetPtr->ParentPcsPtr->referencePictureWrapperPtr->objectPtr;
+                // set up TMVP flag for the reference picture
+                referenceObject->tmvpEnableFlag = (pictureControlSetPtr->ParentPcsPtr->isUsedAsReferenceFlag) ? EB_TRUE : EB_FALSE;
+
+                // set up the ref POC
+                referenceObject->refPOC = pictureControlSetPtr->ParentPcsPtr->pictureNumber;
+
+                // set up the QP
+                referenceObject->qp = (EB_U8)pictureControlSetPtr->ParentPcsPtr->pictureQp;
+
+                // set up the Slice Type
+                referenceObject->sliceType = pictureControlSetPtr->ParentPcsPtr->sliceType;
+            }
         }
         EbReleaseMutex(pictureControlSetPtr->intraMutex);
 
@@ -3062,6 +3063,7 @@ void* EncDecKernel(void *inputPtr)
 
             }
 
+
             // Pad the reference picture and set up TMVP flag and ref POC
             if (pictureControlSetPtr->ParentPcsPtr->isUsedAsReferenceFlag == EB_TRUE) {
                 PadRefAndSetFlags(
@@ -3179,25 +3181,13 @@ void* EncDecKernel(void *inputPtr)
                 if (pictureControlSetPtr->refPicPtrArray[0] != EB_NULL) {
 
                     EbReleaseObject(pictureControlSetPtr->refPicPtrArray[0]);
-#if DEBUG_LIFE_CYCLE
-                    printf("\tED: [%lu] Release ref0 %p, liveCount %d\n",
-                            pictureControlSetPtr->pictureNumber,
-                            pictureControlSetPtr->refPicPtrArray[0],
-                            pictureControlSetPtr->refPicPtrArray[0]->liveCount);
-#endif
                 }
             }
 
             // Release the List 1 Reference Pictures
             for (EB_U8 refIdx = 0; refIdx < pictureControlSetPtr->ParentPcsPtr->refList1Count; ++refIdx) {
                 if (pictureControlSetPtr->refPicPtrArray[1] != EB_NULL) {
                     EbReleaseObject(pictureControlSetPtr->refPicPtrArray[1]);
-#if DEBUG_LIFE_CYCLE
-                    printf("\tED: [%lu] Release ref1 %p, liveCount %d\n",
-                            pictureControlSetPtr->pictureNumber,
-                            pictureControlSetPtr->refPicPtrArray[1],
-                            pictureControlSetPtr->refPicPtrArray[1]->liveCount);
-#endif
                 }
             }
         }

Source/Lib/Codec/EbEncHandle.c

@@ -2161,7 +2161,7 @@ void LoadDefaultBufferConfigurationSettings(
 
     // Jing: TODO:
     // Tune it later, different layer may have different Tile Group
-    EB_U16 tileGroupColCount = tileColCount;// > 1 ? (tileColCount / 2) : 1;
+    EB_U16 tileGroupColCount = 1;//1 col will have better perf for segments
     EB_U16 tileGroupRowCount = tileRowCount;// > 1 ? (tileRowCount / 2) : 1;
 
     // Tile group
@@ -2178,7 +2178,6 @@ void LoadDefaultBufferConfigurationSettings(
     sequenceControlSetPtr->tileGroupRowCountArray[3] = tileGroupRowCount;
     sequenceControlSetPtr->tileGroupRowCountArray[4] = tileGroupRowCount;
     sequenceControlSetPtr->tileGroupRowCountArray[5] = tileGroupRowCount;
-    printf("---tile group %dx%d\n",tileGroupColCount, tileGroupRowCount);
 
     //#====================== Data Structures and Picture Buffers ======================
     sequenceControlSetPtr->pictureControlSetPoolInitCount       = inputPic;