Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 1 file). Show all
Unified · Split
| @@ -3205,7 +3205,7 @@ void UpdatePpsList (sWelsEncCtx* pCtx) { · 3204 unmodified lines | ||
| 3205 | 3205 | |
| 3206 | 3206 | } |
| 3207 | 3207 | |
| 3208 | −void eSpsPpsIdStrategy_INCREASING_ID (SParaSetOffset* pPSOVector, const uint32_t kuiId, const int iParasetType) { | |
| 3208 | +void UpdateSpsPpsIdStrategyWithIncreasingId (SParaSetOffset* pPSOVector, const uint32_t kuiId, const int iParasetType) { | |
| 3209 | 3209 | #if _DEBUG |
| 3210 | 3210 | pPSOVector->eSpsPpsIdStrategy = INCREASING_ID; |
| 3211 | 3211 | assert (iIdx < MAX_DQ_LAYER_NUM); |
| @@ -3216,7 +3216,7 @@ void eSpsPpsIdStrategy_INCREASING_ID (SParaSetOffset* pPSOVector, const uint32_t · 4 unmodified lines | ||
| 3216 | 3216 | (iParasetType != PARA_SET_TYPE_PPS) ? MAX_SPS_COUNT : MAX_PPS_COUNT); |
| 3217 | 3217 | } |
| 3218 | 3218 | |
| 3219 | −void eSpsPpsIdStrategy_CONSTANT_ID (SParaSetOffset* pPSOVector, const uint32_t kuiId, const int iParasetType) { | |
| 3219 | +void UpdateSpsPpsIdStrategyWithConstantId (SParaSetOffset* pPSOVector, const uint32_t kuiId, const int iParasetType) { | |
| 3220 | 3220 | memset (pPSOVector, 0, sizeof (SParaSetOffset)); |
| 3221 | 3221 | } |
| 3222 | 3222 | |
| @@ -3242,9 +3242,9 @@ int32_t WelsWriteParameterSets (sWelsEncCtx* pCtx, int32_t* pNalLen, int32_t* pN · 19 unmodified lines | ||
| 3242 | 3242 | while (iIdx < pCtx->iSpsNum) { |
| 3243 | 3243 | // TODO (Sijia) wrap different operation of eSpsPpsIdStrategy to classes to hide the details |
| 3244 | 3244 | if (INCREASING_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3245 | − eSpsPpsIdStrategy_INCREASING_ID (& (pCtx->sPSOVector), pCtx->pSpsArray[0].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3245 | + UpdateSpsPpsIdStrategyWithIncreasingId (& (pCtx->sPSOVector), pCtx->pSpsArray[0].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3246 | 3246 | } else if (CONSTANT_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3247 | − eSpsPpsIdStrategy_CONSTANT_ID (& (pCtx->sPSOVector), pCtx->pSpsArray[0].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3247 | + UpdateSpsPpsIdStrategyWithConstantId (& (pCtx->sPSOVector), pCtx->pSpsArray[0].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3248 | 3248 | } |
| 3249 | 3249 | |
| 3250 | 3250 | /* generate sequence parameters set */ |
| @@ -3265,7 +3265,7 @@ int32_t WelsWriteParameterSets (sWelsEncCtx* pCtx, int32_t* pNalLen, int32_t* pN · 14 unmodified lines | ||
| 3265 | 3265 | iNal = pCtx->pOut->iNalIndex; |
| 3266 | 3266 | |
| 3267 | 3267 | if (INCREASING_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3268 | − eSpsPpsIdStrategy_INCREASING_ID (& (pCtx->sPSOVector), pCtx->pSubsetArray[iIdx].pSps.uiSpsId, PARA_SET_TYPE_SUBSETSPS); | |
| 3268 | + UpdateSpsPpsIdStrategyWithIncreasingId (& (pCtx->sPSOVector), pCtx->pSubsetArray[iIdx].pSps.uiSpsId, PARA_SET_TYPE_SUBSETSPS); | |
| 3269 | 3269 | } |
| 3270 | 3270 | |
| 3271 | 3271 | |
| @@ -3300,7 +3300,7 @@ int32_t WelsWriteParameterSets (sWelsEncCtx* pCtx, int32_t* pNalLen, int32_t* pN · 28 unmodified lines | ||
| 3300 | 3300 | iIdx = 0; |
| 3301 | 3301 | while (iIdx < pCtx->iPpsNum) { |
| 3302 | 3302 | if ((INCREASING_ID & pCtx->pSvcParam->eSpsPpsIdStrategy)) { |
| 3303 | − eSpsPpsIdStrategy_INCREASING_ID (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3303 | + UpdateSpsPpsIdStrategyWithIncreasingId (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3304 | 3304 | } |
| 3305 | 3305 | |
| 3306 | 3306 | WelsWriteOnePPS (pCtx, iIdx, iNalLength); |
| @@ -3516,9 +3516,9 @@ int32_t WriteSavcParaset (sWelsEncCtx* pCtx, const int32_t iIdx, · 209 unmodified lines | ||
| 3516 | 3516 | iCountNal = 0; |
| 3517 | 3517 | |
| 3518 | 3518 | if (INCREASING_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3519 | − eSpsPpsIdStrategy_INCREASING_ID (& (pCtx->sPSOVector), pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3519 | + UpdateSpsPpsIdStrategyWithIncreasingId (& (pCtx->sPSOVector), pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3520 | 3520 | } else if (CONSTANT_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3521 | − eSpsPpsIdStrategy_CONSTANT_ID (& (pCtx->sPSOVector), pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3521 | + UpdateSpsPpsIdStrategyWithConstantId (& (pCtx->sPSOVector), pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS); | |
| 3522 | 3522 | } |
| 3523 | 3523 | |
| 3524 | 3524 | iReturn = WelsWriteOneSPS (pCtx, iIdx, iNalSize); |
| @@ -3553,9 +3553,9 @@ int32_t WriteSavcParaset (sWelsEncCtx* pCtx, const int32_t iIdx, · 28 unmodified lines | ||
| 3553 | 3553 | iCountNal = 0; |
| 3554 | 3554 | |
| 3555 | 3555 | if (INCREASING_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3556 | − eSpsPpsIdStrategy_INCREASING_ID (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3556 | + UpdateSpsPpsIdStrategyWithIncreasingId (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3557 | 3557 | } else if (CONSTANT_ID == pCtx->pSvcParam->eSpsPpsIdStrategy) { |
| 3558 | − eSpsPpsIdStrategy_CONSTANT_ID (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3558 | + UpdateSpsPpsIdStrategyWithConstantId (& (pCtx->sPSOVector), pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS); | |
| 3559 | 3559 | } |
| 3560 | 3560 | |
| 3561 | 3561 | iReturn = WelsWriteOnePPS (pCtx, iIdx, iNalSize); |