put EC before output

root committed 12 years ago

Commit 67afd911 parent 91cd93e2 files · +18 −24Browse files

Showing the changes to codec/decoder (2 of 2 files). Show all

Unified · Split

2 files

codec/decoder/core/src/decoder_core.cpp +18 −13
codec/decoder/core/src/error_concealment.cpp +0 −11

codec/decoder/core/src/decoder_core.cpp+18−13

   WelsDecodeAccessUnitEnd (pCtx);
-  if (!pCtx->bInstantDecFlag) {
-    //Do error concealment here
-    ImplementErrorCon (pCtx);
-  }
   pCtx->bNewSeqBegin = false;
   WriteBackActiveParameters (pCtx);
   pCtx->bNewSeqBegin = pCtx->bNewSeqBegin || pCtx->bNextNewSeqBegin;
 #endif//#if !CODEC_FOR_TESTBED
     if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) {
+      if (!pCtx->bInstantDecFlag) {
+        //Do error concealment here
+        if (NeedErrorCon (pCtx)) {
+          ImplementErrorCon (pCtx);
+          pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+        }
+      }
       if (DecodeFrameConstruction (pCtx, ppDst, pDstInfo)) {
         return ERR_NONE;
       }
   if ((pCtx->iTotalNumMbRec != 0)
       && (CheckAccessUnitBoundaryExt (&pCtx->sLastNalHdrExt, &pCurNal->sNalHeaderExt, &pCtx->sLastSliceHeader,
                                       &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader))) {
-    pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
-    DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
-    PPicture pCurPic = pCtx->pDec; //temporally store current picture
     //Do Error Concealment here
-    ImplementErrorCon (pCtx);
+    if (NeedErrorCon (pCtx)) { //should always be true!
-    pCtx->pPreviousDecodedPictureInDpb = pCurPic; //save ECed pic for future use
+      ImplementErrorCon (pCtx);
-    pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num
+      pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
-    if (pCtx->bLastHasMmco5)
+      DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
-      pCtx->iPrevFrameNum = 0;
+      pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use
+      MarkECFrameAsRef (pCtx);
+      pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num
+      if (pCtx->bLastHasMmco5)
+        pCtx->iPrevFrameNum = 0;
+    }
   }
   return ERR_NONE;
 }

codec/decoder/core/src/error_concealment.cpp+0−11

 // ImplementErrorConceal
 // Do actual error concealment
 void ImplementErrorCon (PWelsDecoderContext pCtx) {
-  if (!NeedErrorCon (pCtx))
-    return;
   if (ERROR_CON_DISABLE == pCtx->iErrorConMethod) {
     pCtx->iErrorCode |= dsBitstreamError;
     return;
   } else if (ERROR_CON_SLICE_COPY == pCtx->iErrorConMethod) {
     DoErrorConSliceCopy (pCtx);
   } //TODO add other EC methods here in the future
-  //mark the erroneous frame as Ref pic in DPB
-  MarkECFrameAsRef (pCtx);
-  //need update frame_num due current frame is well decoded
-  pCtx->iPrevFrameNum	= pCtx->pSliceHeader->iFrameNum;
-  if (pCtx->bLastHasMmco5)
-    pCtx->iPrevFrameNum = 0;
 }
 } // namespace WelsDec

put EC before output

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code