Prevent decoded pictures of Scalable Baseline Profile (83) (no b-frame) stream from being buffered for reordering. fix "dec crash for spec bitstream (gop2.h264) cisco#3110".

The crash is caused by trying to flush out previous removed (decoded) picture. Decoder has no idea needs to keep this frame.

xiaotiansf committed 7 years ago

Commit 1bf04b11 parent 3bf69ad1 file · +17 −8Browse files

Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 1 file). Show all

Unified · Split

 DECODING_STATE CWelsDecoder::ReorderPicturesInDisplay (unsigned char** ppDst, SBufferInfo* pDstInfo) {
   DECODING_STATE iRet = dsErrorFree;
-  if (pDstInfo->iBufferStatus == 1 && m_pDecContext->pSps->uiProfileIdc != 66) {
+  if (pDstInfo->iBufferStatus == 1 && m_pDecContext->pSps->uiProfileIdc != 66
-    if (m_pDecContext->pSliceHeader->iPicOrderCntLsb == 0) {
+      && m_pDecContext->pSps->uiProfileIdc != 83) {
-      if (m_iNumOfPicts > 0) {
+    /*if (m_pDecContext->pSliceHeader->iPicOrderCntLsb == 0) {
-        m_iLastGOPRemainPicts = m_iNumOfPicts;
+      m_LastWrittenPOC = 0;
-        for (int32_t i = 0; i <= m_iLargestBufferedPicIndex; ++i) {
+      return dsErrorFree;
-          if (m_sPictInfoList[i].iPOC > sIMinInt32) {
+    }
-            m_sPictInfoList[i].bLastGOP = true;
+    if (m_iNumOfPicts == 0 && m_pDecContext->pPreviousDecodedPictureInDpb->bNewSeqBegin
-          }
+        && m_pDecContext->eSliceType != I_SLICE) {
+      m_LastWrittenPOC = m_pDecContext->pSliceHeader->iPicOrderCntLsb;
+      return dsErrorFree;
+    }*/
+    if (m_iNumOfPicts && m_pDecContext->pPreviousDecodedPictureInDpb
+        && m_pDecContext->pPreviousDecodedPictureInDpb->bNewSeqBegin) {
+      m_iLastGOPRemainPicts = m_iNumOfPicts;
+      for (int32_t i = 0; i <= m_iLargestBufferedPicIndex; ++i) {
+        if (m_sPictInfoList[i].iPOC > sIMinInt32) {
+          m_sPictInfoList[i].bLastGOP = true;
         }
       }
     } else {

Keyboard shortcuts