Fix Hrd signalling for fixed GOP length

Source/Lib/Codec/EbEncodeContext.c

@@ -179,7 +179,7 @@ EB_ERRORTYPE EncodeContextCtor(
     encodeContextPtr->initialPicture                                    = EB_TRUE;
 
     encodeContextPtr->lastIdrPicture                                    = 0;
-
+    encodeContextPtr->lastIdrPictureOrder                               = 0;
     // Sequence Termination Flags
     encodeContextPtr->terminatingPictureNumber                          = ~0u;
     encodeContextPtr->terminatingSequenceFlagReceived                   = EB_FALSE;

Source/Lib/Codec/EbEncodeContext.h

@@ -114,7 +114,7 @@ typedef struct EncodeContext_s
     EB_BOOL                              initialPicture;
 
     EB_U64                               lastIdrPicture; // the most recently occured IDR picture (in decode order)
-
+    EB_U64                               lastIdrPictureOrder;
     // Sequence Termination Flags
     EB_U64							     terminatingPictureNumber;
 	EB_BOOL                              terminatingSequenceFlagReceived;

Source/Lib/Codec/EbPacketizationProcess.c

@@ -147,9 +147,8 @@ void* PacketizationKernel(void *inputPtr)
     EB_U32                          packetizationQp;
 
     EB_PICTURE                        sliceType;
-
-    EB_U64                          prevBPpictureNumber;
-    EB_U64                          lastBpnumber=0;
+    EB_U32                            refDecOrder;
+
     for(;;) {
 
         // Get EntropyCoding Results
@@ -518,7 +517,6 @@ void* PacketizationKernel(void *inputPtr)
 
         // Parsing the linked list and find the user data SEI msgs and code them
         sequenceControlSetPtr->picTimingSei.picStruct = 0;
-        prevBPpictureNumber = pictureControlSetPtr->pictureNumber == 0 ? 0 : lastBpnumber;
         if( sequenceControlSetPtr->staticConfig.bufferingPeriodSEI && 
             pictureControlSetPtr->sliceType == EB_I_PICTURE && 
             sequenceControlSetPtr->staticConfig.videoUsabilityInfo &&
@@ -528,7 +526,6 @@ void* PacketizationKernel(void *inputPtr)
             if (sequenceControlSetPtr->staticConfig.hrdFlag == 1)
             {
                 HrdFullness(sequenceControlSetPtr, pictureControlSetPtr, &sequenceControlSetPtr->bufferingPeriod);
-                lastBpnumber= pictureControlSetPtr->ParentPcsPtr->decodeOrder;
             }
             EncodeBufferingPeriodSEI(
                 pictureControlSetPtr->bitstreamPtr,
@@ -546,7 +543,20 @@ void* PacketizationKernel(void *inputPtr)
                 // buffering period SEI message
                 const AppVideoUsabilityInfo_t* vui = sequenceControlSetPtr->videoUsabilityInfoPtr;
                 const AppHrdParameters_t* hrd = vui->hrdParametersPtr;
-                sequenceControlSetPtr->picTimingSei.auCpbRemovalDelayMinus1 = (EB_U32)((MIN(MAX(1, (EB_S32)pictureControlSetPtr->ParentPcsPtr->decodeOrder - (EB_S32)prevBPpictureNumber), (1 << hrd->auCpbRemovalDelayLengthMinus1)))-1);
+                if (sequenceControlSetPtr->intraRefreshType == CRA_REFRESH)
+                {
+                    if (pictureControlSetPtr->sliceType == EB_I_PICTURE)
+                        refDecOrder = (EB_S64)((pictureControlSetPtr->pictureNumber - (sequenceControlSetPtr->intraPeriodLength + 1) - ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1))) < 0 ? 
+                        0 : (EB_U32)((pictureControlSetPtr->pictureNumber - (sequenceControlSetPtr->intraPeriodLength + 1) - ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1)));
+                    else
+                        refDecOrder = (EB_S64)((((pictureControlSetPtr->pictureNumber + ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1)) / (sequenceControlSetPtr->intraPeriodLength + 1) * (sequenceControlSetPtr->intraPeriodLength + 1))) - ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1)) < 0 ?
+                        0: (EB_U32)((((pictureControlSetPtr->pictureNumber + ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1)) / (sequenceControlSetPtr->intraPeriodLength + 1) * (sequenceControlSetPtr->intraPeriodLength + 1))) - ((1 << sequenceControlSetPtr->staticConfig.hierarchicalLevels) - 1));
+                }
+                else
+                {
+                        refDecOrder = (EB_U32)pictureControlSetPtr->ParentPcsPtr->lastIdrPictureOrder;
+                }
+                sequenceControlSetPtr->picTimingSei.auCpbRemovalDelayMinus1 = (EB_U32)((MIN(MAX(1, (EB_S32)(pictureControlSetPtr->ParentPcsPtr->decodeOrder - refDecOrder)), (1 << hrd->auCpbRemovalDelayLengthMinus1)))-1);
                 sequenceControlSetPtr->picTimingSei.picDpbOutputDelay = (EB_U32)((sequenceControlSetPtr->maxDpbSize-1) + pictureControlSetPtr->pictureNumber - pictureControlSetPtr->ParentPcsPtr->decodeOrder);
             }
 

Source/Lib/Codec/EbPictureControlSet.c

@@ -598,6 +598,7 @@ EB_ERRORTYPE PictureParentControlSetCtor(
     objectPtr->totalNumBits = 0;
 
     objectPtr->lastIdrPicture = 0;
+    objectPtr->lastIdrPictureOrder = 0;
 
     objectPtr->lcuTotalCount            = pictureLcuWidth * pictureLcuHeight;
 

Source/Lib/Codec/EbPictureControlSet.h

@@ -404,6 +404,7 @@ typedef struct PictureParentControlSet_s
     EB_U64                                averageQp;
 
     EB_U64                                lastIdrPicture;
+    EB_U64                                lastIdrPictureOrder;
 
     EB_U64                                startTimeSeconds;
     EB_U64                                startTimeuSeconds;

Source/Lib/Codec/EbPictureDecisionProcess.c

@@ -1302,7 +1302,12 @@ void* PictureDecisionKernel(void *inputPtr)
                         else {
                             pictureControlSetPtr->decodeOrder = pictureControlSetPtr->pictureNumber;
                         }
-
+                        if (sequenceControlSetPtr->intraRefreshType == IDR_REFRESH)
+                        {
+                            pictureControlSetPtr->lastIdrPictureOrder = encodeContextPtr->lastIdrPictureOrder;
+                            if (pictureControlSetPtr->sliceType == EB_I_PICTURE)
+                            encodeContextPtr->lastIdrPictureOrder = pictureControlSetPtr->decodeOrder;
+                        }
                         EbBlockOnMutex(encodeContextPtr->terminatingConditionsMutex);
 
                         encodeContextPtr->terminatingSequenceFlagReceived = (pictureControlSetPtr->endOfSequenceFlag == EB_TRUE) ?