shithub: openh264

Info  •  Files  •  Log  •  Branches

refine Check AU boundary

--- a/codec/decoder/core/inc/au_parser.h

+++ b/codec/decoder/core/inc/au_parser.h

@@ -92,7 +92,7 @@

 int32_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);

-bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);

+bool CheckAccessUnitBoundary (const PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);

 bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,

                                  PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader);

 /*!

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

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

@@ -316,7 +316,7 @@

     }

     if ((uiAvailNalNum > 1) &&

-        CheckAccessUnitBoundary (pCurAu->pNalUnitsList[uiAvailNalNum - 1], pCurAu->pNalUnitsList[uiAvailNalNum - 2],

+        CheckAccessUnitBoundary (pCtx, pCurAu->pNalUnitsList[uiAvailNalNum - 1], pCurAu->pNalUnitsList[uiAvailNalNum - 2],

                                  pCurAu->pNalUnitsList[uiAvailNalNum - 1]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps)) {

       pCurAu->uiEndPos = uiAvailNalNum - 2;

       pCtx->bAuReadyFlag = true;

@@ -392,7 +392,7 @@

 }

-bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {

+bool CheckAccessUnitBoundary (const PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {

   const PNalUnitHeaderExt kpLastNalHeaderExt = &kpLastNal->sNalHeaderExt;

   const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;

   const SSliceHeader* kpLastSliceHeader = &kpLastNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;

@@ -402,27 +402,20 @@

   if (kpLastNalHeaderExt->uiTemporalId != kpCurNalHeaderExt->uiTemporalId) {

     return true;

   }

-

+  if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum)

+    return true;

+  if (pCtx->pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != NULL && pCtx->pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != kpSps) {

+    return true; // the active sps changed, new sequence begins, so the current au is ready

+  }

   // Subclause 7.4.1.2.5

-  if (kpLastSliceHeader->iRedundantPicCnt < kpCurSliceHeader->iRedundantPicCnt)

-    return false;

-  else if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt)

+  if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt)

     return true;

   // Subclause G7.4.1.2.4

-  if (kpLastNalHeaderExt->uiDependencyId < kpCurNalHeaderExt->uiDependencyId)

-    return false;

-  else if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId)

+  if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId)

     return true;

-  if (kpLastNalHeaderExt->uiQualityId < kpCurNalHeaderExt->uiQualityId)

-    return false;

-  else if (kpLastNalHeaderExt->uiQualityId > kpCurNalHeaderExt->uiQualityId)

-    return true;

-

   // Subclause 7.4.1.2.4

-  if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum)

-    return true;

-  if (kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId)

+  if (kpLastNalHeaderExt->uiDependencyId == kpCurNalHeaderExt->uiDependencyId && kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId)

     return true;

   if (kpLastSliceHeader->bFieldPicFlag != kpCurSliceHeader->bFieldPicFlag)

     return true;