shithub: openh264

Info  •  Files  •  Log  •  Branches

comment output info with FREEZE

--- a/codec/decoder/core/src/decoder_core.cpp

+++ b/codec/decoder/core/src/decoder_core.cpp

@@ -66,7 +66,7 @@

     if (pCtx->iTotalNumMbRec == kiTotalNumMbInCurLayer) {

       pCtx->bPrintFrameErrorTraceFlag = true;

       WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,

-               "DecodeFrameConstruction()::::output first frame of new sequence, %d x %d, crop_left:%d, crop_right:%d, crop_top:%d, crop_bottom:%d, ignored error packet:%d.",

+               "DecodeFrameConstruction(): will output first frame of new sequence, %d x %d, crop_left:%d, crop_right:%d, crop_top:%d, crop_bottom:%d, ignored error packet:%d.",

                kiWidth, kiHeight, pCtx->sFrameCrop.iLeftOffset, pCtx->sFrameCrop.iRightOffset, pCtx->sFrameCrop.iTopOffset,

                pCtx->sFrameCrop.iBottomOffset, pCtx->iIgnoredErrorInfoPacketCount);

       pCtx->iIgnoredErrorInfoPacketCount = 0;

@@ -75,7 +75,7 @@

   if (pCtx->iTotalNumMbRec != kiTotalNumMbInCurLayer) {

     WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,

-             "DecodeFrameConstruction():::iTotalNumMbRec:%d, total_num_mb_sps:%d, cur_layer_mb_width:%d, cur_layer_mb_height:%d ",

+             "DecodeFrameConstruction(): iTotalNumMbRec:%d, total_num_mb_sps:%d, cur_layer_mb_width:%d, cur_layer_mb_height:%d ",

              pCtx->iTotalNumMbRec, kiTotalNumMbInCurLayer, pCurDq->iMbWidth, pCurDq->iMbHeight);

     bFrameCompleteFlag = false; //return later after output buffer is done

     if (pCtx->bInstantDecFlag) //no-delay decoding, wait for new slice

@@ -114,8 +114,8 @@

     pDstInfo->iBufferStatus = (int32_t) (bFrameCompleteFlag

                                          && pPic->bIsComplete); // When EC disable, ECed picture not output

   else if ((pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE

-           || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)

-            && pCtx->iErrorCode && bOutResChange)

+            || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)

+           && pCtx->iErrorCode && bOutResChange)

     pCtx->bFreezeOutput = true;

   if ((pDstInfo->iBufferStatus == 1) && (pCurDq->sLayerInfo.sNalHeaderExt.bIdrFlag)) {

@@ -130,8 +130,12 @@

       pCtx->iErrorCode |= dsBitstreamError;

     return -1;

   }

-  if (pCtx->bFreezeOutput)

+  if (pCtx->bFreezeOutput) {

     pDstInfo->iBufferStatus = 0;

+    if (pCtx->bNewSeqBegin) {

+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "DecodeFrameConstruction():New sequence detected, but freezed.");

+    }

+  }

   return 0;

 }

@@ -2131,7 +2135,8 @@

                                   pCtx->pDec->iLinesize,

                                   pCtx->sExpandPicFunc.pfExpandLumaPicture, pCtx->sExpandPicFunc.pfExpandChromaPicture);

         pCtx->pDec = NULL;

-      } else if (pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE) {

+      } else if (pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR

+                 || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE) {

         pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //store latest decoded picture for MV Copy EC

         pCtx->pDec = NULL;

       }

@@ -2164,7 +2169,8 @@

         if (pCtx->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0) {

           pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use

           MarkECFrameAsRef (pCtx);

-        } else if (pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE) {

+        } else if (pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR

+                   || pCtx->eErrorConMethod == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE) {

           pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future MV Copy use

         }

       } else {