History

format the files

dong zhang committed 11 years ago

Commit 153dd0d1 parent d28970d4 files · +230 −225Browse files

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

Unified · Split

codec/decoder/core/src/decoder_core.cpp+12−6
@@ -568,7 +568,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 567 unmodified lines
568 if (pCtx->bPpsAvailFlags[iPpsId] == false) {568 if (pCtx->bPpsAvailFlags[iPpsId] == false) {
569 pCtx->sDecoderStatistics.iPpsReportErrorNum++;569 pCtx->sDecoderStatistics.iPpsReportErrorNum++;
570 if (pCtx->iPPSLastInvalidId != iPpsId) {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 pCtx->iPPSLastInvalidId = iPpsId;573 pCtx->iPPSLastInvalidId = iPpsId;
573 pCtx->iPPSInvalidNum = 0;574 pCtx->iPPSInvalidNum = 0;
574 } else {575 } else {
@@ -593,7 +594,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 18 unmodified lines
593 if (pCtx->bSubspsAvailFlags[pPps->iSpsId] == false) {594 if (pCtx->bSubspsAvailFlags[pPps->iSpsId] == false) {
594 pCtx->sDecoderStatistics.iSubSpsReportErrorNum++;595 pCtx->sDecoderStatistics.iSubSpsReportErrorNum++;
595 if (pCtx->iSubSPSLastInvalidId != pPps->iSpsId) {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 pCtx->iSubSPSLastInvalidId = pPps->iSpsId;599 pCtx->iSubSPSLastInvalidId = pPps->iSpsId;
598 pCtx->iSubSPSInvalidNum = 0;600 pCtx->iSubSPSInvalidNum = 0;
599 } else {601 } else {
@@ -607,7 +609,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 7 unmodified lines
607 if (pCtx->bSpsAvailFlags[pPps->iSpsId] == false) {609 if (pCtx->bSpsAvailFlags[pPps->iSpsId] == false) {
608 pCtx->sDecoderStatistics.iSpsReportErrorNum++;610 pCtx->sDecoderStatistics.iSpsReportErrorNum++;
609 if (pCtx->iSPSLastInvalidId != pPps->iSpsId) {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 pCtx->iSPSLastInvalidId = pPps->iSpsId;614 pCtx->iSPSLastInvalidId = pPps->iSpsId;
612 pCtx->iSPSInvalidNum = 0;615 pCtx->iSPSInvalidNum = 0;
613 } else {616 } else {
@@ -1066,7 +1069,8 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 452 unmodified lines
1066 "pCtx->sMb.pMbType[]");1069 "pCtx->sMb.pMbType[]");
1067 pCtx->sMb.pMv[i][0] = (int16_t (*)[16][2])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (1070 pCtx->sMb.pMv[i][0] = (int16_t (*)[16][2])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
1068 int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]");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 int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[][]");1074 int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[][]");
1071 pCtx->sMb.pLumaQp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),1075 pCtx->sMb.pLumaQp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),
1072 "pCtx->sMb.pLumaQp[]");1076 "pCtx->sMb.pLumaQp[]");
@@ -1082,7 +1086,8 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 9 unmodified lines
1082 "pCtx->sMb.pNzcRs[]");1086 "pCtx->sMb.pNzcRs[]");
1083 pCtx->sMb.pScaledTCoeff[i] = (int16_t (*)[MB_COEFF_LIST_SIZE])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *1087 pCtx->sMb.pScaledTCoeff[i] = (int16_t (*)[MB_COEFF_LIST_SIZE])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *
1084 sizeof (int16_t) * MB_COEFF_LIST_SIZE, "pCtx->sMb.pScaledTCoeff[]");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 "pCtx->sMb.pIntraPredMode[]");1091 "pCtx->sMb.pIntraPredMode[]");
1087 pCtx->sMb.pIntra4x4FinalMode[i] = (int8_t (*)[MB_BLOCK4x4_NUM])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *1092 pCtx->sMb.pIntra4x4FinalMode[i] = (int8_t (*)[MB_BLOCK4x4_NUM])WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *
1088 sizeof (int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pIntra4x4FinalMode[]");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 "pCtx->sMb.pChromaPredMode[]");1095 "pCtx->sMb.pChromaPredMode[]");
1091 pCtx->sMb.pCbp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),1096 pCtx->sMb.pCbp[i] = (int8_t*)WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),
1092 "pCtx->sMb.pCbp[]");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 int8_t) * MB_PARTITION_SIZE, "pCtx->sMb.pSubMbType[]");1100 int8_t) * MB_PARTITION_SIZE, "pCtx->sMb.pSubMbType[]");
1095 pCtx->sMb.pSliceIdc[i] = (int32_t*) WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t),1101 pCtx->sMb.pSliceIdc[i] = (int32_t*) WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t),
1096 "pCtx->sMb.pSliceIdc[]"); // using int32_t for slice_idc, 4/21/20101102 "pCtx->sMb.pSliceIdc[]"); // using int32_t for slice_idc, 4/21/2010

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t