Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 4 files). Show all
Unified · Split
| @@ -568,7 +568,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 567 unmodified lines | ||
| 568 | 568 | if (pCtx->bPpsAvailFlags[iPpsId] == false) { |
| 569 | 569 | pCtx->sDecoderStatistics.iPpsReportErrorNum++; |
| 570 | 570 | if (pCtx->iPPSLastInvalidId != iPpsId) { |
| 571 | − WelsLog (pLogCtx, WELS_LOG_ERROR, "PPS id (%d) is invalid, previous id (%d) error ignored (%d)!", iPpsId, pCtx->iPPSLastInvalidId, pCtx->iPPSInvalidNum); | |
| 571 | + WelsLog (pLogCtx, WELS_LOG_ERROR, "PPS id (%d) is invalid, previous id (%d) error ignored (%d)!", iPpsId, | |
| 572 | + pCtx->iPPSLastInvalidId, pCtx->iPPSInvalidNum); | |
| 572 | 573 | pCtx->iPPSLastInvalidId = iPpsId; |
| 573 | 574 | pCtx->iPPSInvalidNum = 0; |
| 574 | 575 | } else { |
| @@ -593,7 +594,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 18 unmodified lines | ||
| 593 | 594 | if (pCtx->bSubspsAvailFlags[pPps->iSpsId] == false) { |
| 594 | 595 | pCtx->sDecoderStatistics.iSubSpsReportErrorNum++; |
| 595 | 596 | if (pCtx->iSubSPSLastInvalidId != pPps->iSpsId) { |
| 596 | − WelsLog (pLogCtx, WELS_LOG_ERROR, "Sub SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId, pCtx->iSubSPSLastInvalidId, pCtx->iSubSPSInvalidNum); | |
| 597 | + WelsLog (pLogCtx, WELS_LOG_ERROR, "Sub SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId, | |
| 598 | + pCtx->iSubSPSLastInvalidId, pCtx->iSubSPSInvalidNum); | |
| 597 | 599 | pCtx->iSubSPSLastInvalidId = pPps->iSpsId; |
| 598 | 600 | pCtx->iSubSPSInvalidNum = 0; |
| 599 | 601 | } else { |
| @@ -607,7 +609,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 7 unmodified lines | ||
| 607 | 609 | if (pCtx->bSpsAvailFlags[pPps->iSpsId] == false) { |
| 608 | 610 | pCtx->sDecoderStatistics.iSpsReportErrorNum++; |
| 609 | 611 | if (pCtx->iSPSLastInvalidId != pPps->iSpsId) { |
| 610 | − WelsLog (pLogCtx, WELS_LOG_ERROR, "SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId, pCtx->iSPSLastInvalidId, pCtx->iSPSInvalidNum); | |
| 612 | + WelsLog (pLogCtx, WELS_LOG_ERROR, "SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId, | |
| 613 | + pCtx->iSPSLastInvalidId, pCtx->iSPSInvalidNum); | |
| 611 | 614 | pCtx->iSPSLastInvalidId = pPps->iSpsId; |
| 612 | 615 | pCtx->iSPSInvalidNum = 0; |
| 613 | 616 | } else { |
| @@ -1066,7 +1069,8 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 452 unmodified lines | ||
| 1066 | 1069 | "pCtx->sMb.pMbType[]"); |
| 1067 | 1070 | pCtx->sMb.pMv[i][0] = (int16_t (*)[16][2])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof ( |
| 1068 | 1071 | int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]"); |
| 1069 | − pCtx->sMb.pRefIndex[i][0] = (int8_t (*)[MB_BLOCK4x4_NUM])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof ( | |
| 1072 | + pCtx->sMb.pRefIndex[i][0] = (int8_t (*)[MB_BLOCK4x4_NUM])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * | |
| 1073 | + sizeof ( | |
| 1070 | 1074 | int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[][]"); |
| 1071 | 1075 | pCtx->sMb.pLumaQp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t), |
| 1072 | 1076 | "pCtx->sMb.pLumaQp[]"); |
| @@ -1082,7 +1086,8 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 9 unmodified lines | ||
| 1082 | 1086 | "pCtx->sMb.pNzcRs[]"); |
| 1083 | 1087 | pCtx->sMb.pScaledTCoeff[i] = (int16_t (*)[MB_COEFF_LIST_SIZE])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * |
| 1084 | 1088 | sizeof (int16_t) * MB_COEFF_LIST_SIZE, "pCtx->sMb.pScaledTCoeff[]"); |
| 1085 | − pCtx->sMb.pIntraPredMode[i] = (int8_t (*)[8])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t) * 8, | |
| 1089 | + pCtx->sMb.pIntraPredMode[i] = (int8_t (*)[8])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof ( | |
| 1090 | + int8_t) * 8, | |
| 1086 | 1091 | "pCtx->sMb.pIntraPredMode[]"); |
| 1087 | 1092 | pCtx->sMb.pIntra4x4FinalMode[i] = (int8_t (*)[MB_BLOCK4x4_NUM])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * |
| 1088 | 1093 | sizeof (int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pIntra4x4FinalMode[]"); |
| @@ -1090,7 +1095,8 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 1 unmodified line | ||
| 1090 | 1095 | "pCtx->sMb.pChromaPredMode[]"); |
| 1091 | 1096 | pCtx->sMb.pCbp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t), |
| 1092 | 1097 | "pCtx->sMb.pCbp[]"); |
| 1093 | − pCtx->sMb.pSubMbType[i] = (int8_t (*)[MB_PARTITION_SIZE])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof ( | |
| 1098 | + pCtx->sMb.pSubMbType[i] = (int8_t (*)[MB_PARTITION_SIZE])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * | |
| 1099 | + sizeof ( | |
| 1094 | 1100 | int8_t) * MB_PARTITION_SIZE, "pCtx->sMb.pSubMbType[]"); |
| 1095 | 1101 | pCtx->sMb.pSliceIdc[i] = (int32_t*) WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t), |
| 1096 | 1102 | "pCtx->sMb.pSliceIdc[]"); // using int32_t for slice_idc, 4/21/2010 |