shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #796 from huili2/new_seq_au_reorder

fix order of new AU and new Seq

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

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

@@ -405,7 +405,12 @@

   const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;

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

   const SSliceHeader* kpCurSliceHeader = &kpCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;

-

+  if (pCtx->pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != NULL

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

+    pCtx->bNextNewSeqBegin = true;

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

+  }

+ 

   //Sub-clause 7.1.4.1.1 temporal_id

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

     return true;

@@ -412,11 +417,6 @@

   }

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

     return true;

-  if (pCtx->pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != NULL

-      && pCtx->pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != kpSps) {

-    pCtx->bNextNewSeqBegin = true;

-    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 true;