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 (3 of 4 files). Show all

Unified · Split

3 files

         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

@@ -1112,25 +1112,6 @@ int32_t WelsCalcDeqCoeffScalingList (PWelsDecoderContext pCtx) { · 1111 unmodified lines
1112		1112
1113	if (!pCtx->bDequantCoeff4x4Init \|\| (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) {	1113	if (!pCtx->bDequantCoeff4x4Init \|\| (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) {
1114	int i, q, x, y;	1114	int i, q, x, y;
1115	// Rewrite pps scaling list for scalingList present flag=0
1116	if (pCtx->bSpsLatePps) {
1117	for (i = 0; i < 12; i++) {
1118	//if (!pCtx->pSps->bSeqScalingListPresentFlag[i]) {
1119	if (!pCtx->pPps->bPicScalingListPresentFlag[i]) {
1120	if (i < 6) {
1121	if (i == 0 \|\| i == 3)
1122	memcpy (pCtx->pPps->iScalingList4x4[i], pCtx->pSps->iScalingList4x4[i], 16 * sizeof (uint8_t));
1123	else
1124	memcpy (pCtx->pPps->iScalingList4x4[i], pCtx->pPps->iScalingList4x4[i - 1], 16 * sizeof (uint8_t));
1125	} else {
1126	if (i == 6 \|\| i == 7)
1127	memcpy (pCtx->pPps->iScalingList8x8[ i - 6 ], pCtx->pSps->iScalingList8x8[ i - 6 ], 64 * sizeof (uint8_t));
1128	else
1129	memcpy (pCtx->pPps->iScalingList8x8[ i - 6 ], pCtx->pPps->iScalingList8x8[i - 8], 64 * sizeof (uint8_t));
1130	}
1131	}
1132	}
1133	}
1134	//Init dequant coeff value for different QP	1115	//Init dequant coeff value for different QP
1135	for (i = 0; i < 6; i++) {	1116	for (i = 0; i < 6; i++) {
1136	pCtx->pDequant_coeff4x4[i] = pCtx->pDequant_coeff_buffer4x4[i];	1117	pCtx->pDequant_coeff4x4[i] = pCtx->pDequant_coeff_buffer4x4[i];

@@ -312,7 +312,6 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 311 unmodified lines
312	pCtx->bAvcBasedFlag = true;	312	pCtx->bAvcBasedFlag = true;
313	pCtx->pPreviousDecodedPictureInDpb = NULL;	313	pCtx->pPreviousDecodedPictureInDpb = NULL;
314	pCtx->sDecoderStatistics.iAvgLumaQp = -1;	314	pCtx->sDecoderStatistics.iAvgLumaQp = -1;
315	pCtx->bSpsLatePps = false;
316	pCtx->bUseScalingList = false;	315	pCtx->bUseScalingList = false;
317	pCtx->iSpsErrorIgnored = 0;	316	pCtx->iSpsErrorIgnored = 0;
318	pCtx->iSubSpsErrorIgnored = 0;	317	pCtx->iSubSpsErrorIgnored = 0;

Keyboard shortcuts