remove sps late than pps logic for scaling_list

huili2 committed 9 years ago

Commit 3c2b1601 parent 3c2caa44 files · +6 −29Browse files

Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 4 files). Show all

Unified · Split

         WELS_READ_VERIFY (ParseScalingList (&pCtx->sSpsBuffer[pPps->iSpsId], pBsAux, 1, pPps->bTransform8x8ModeFlag,
                                             pPps->bPicScalingListPresentFlag, pPps->iScalingList4x4, pPps->iScalingList8x8));
       } else {
-        pCtx->bSpsLatePps = true;
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
-        WELS_READ_VERIFY (ParseScalingList (NULL, pBsAux, 1, pPps->bTransform8x8ModeFlag, pPps->bPicScalingListPresentFlag,
+                 "ParsePps(): sps_id (%d) does not exist for scaling_list. This PPS (%d) is marked as invalid.", pPps->iSpsId,
-                                            pPps->iScalingList4x4, pPps->iScalingList8x8));
+                 pPps->iPpsId);
+        return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_SPS_ID);
       }
     }
     WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode)); //second_chroma_qp_index_offset
   const uint8_t* defaultScaling[4];
   if (!bPPS) { //sps scaling_list
-    if (pSps != NULL) {
+    uiScalingListNum = (pSps->uiChromaFormatIdc != 3) ? 8 : 12;
-      uiScalingListNum = (pSps->uiChromaFormatIdc != 3) ? 8 : 12;
-      bInit = bPPS && pSps->bSeqScalingMatrixPresentFlag;
-    } else
-      uiScalingListNum = 12;
   } else { //pps scaling_list
     uiScalingListNum = 6 + (int32_t) kbTrans8x8ModeFlag * ((pSps->uiChromaFormatIdc != 3) ? 2 : 6);
+    bInit = pSps->bSeqScalingMatrixPresentFlag;
   }
 //Init default_scaling_list value for sps or pps

Keyboard shortcuts