History

fix idr_id: idr_id should be adding regardless of the sps strategy

Sijia Chen committed 11 years ago

Commit 32d61931 parent 065c3a76 files · +15 −14Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 6 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+4−3
@@ -3126,7 +3126,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3125 unmodified lines
3126 pLayerBsInfo->pNalLengthInByte = pCtx->pOut->pNalLen;3126 pLayerBsInfo->pNalLengthInByte = pCtx->pOut->pNalLen;
3127 3127
3128 if (eFrameType == videoFrameTypeIDR) {3128 if (eFrameType == videoFrameTypeIDR) {
3129 ++ pCtx->sPSOVector.uiIdrPicId;3129 ++ pCtx->uiIdrPicId;
3130 //if ( pSvcParam->bEnableSSEI )3130 //if ( pSvcParam->bEnableSSEI )
3131 3131
3132 // write parameter sets bitstream here3132 // write parameter sets bitstream here
@@ -3816,7 +3816,7 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 683 unmodified lines
3816 memset (((*ppCtx)->sPSOVector.sParaSetOffsetVariable[k].bUsedParaSetIdInBs), 0, MAX_PPS_COUNT * sizeof (bool));3816 memset (((*ppCtx)->sPSOVector.sParaSetOffsetVariable[k].bUsedParaSetIdInBs), 0, MAX_PPS_COUNT * sizeof (bool));
3817 memcpy (sTmpPsoVariable, (*ppCtx)->sPSOVector.sParaSetOffsetVariable,3817 memcpy (sTmpPsoVariable, (*ppCtx)->sPSOVector.sParaSetOffsetVariable,
3818 (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage3818 (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage
3819 uiTmpIdrPicId = (*ppCtx)->sPSOVector.uiIdrPicId;3819 uiTmpIdrPicId = (*ppCtx)->uiIdrPicId;
3820 3820
3821 SEncoderStatistics sTempEncoderStatistics = (*ppCtx)->sEncoderStatistics;3821 SEncoderStatistics sTempEncoderStatistics = (*ppCtx)->sEncoderStatistics;
3822 3822
@@ -3834,7 +3834,8 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 11 unmodified lines
3834 //for FLEXIBLE_PARASET_ID3834 //for FLEXIBLE_PARASET_ID
3835 memcpy ((*ppCtx)->sPSOVector.sParaSetOffsetVariable, sTmpPsoVariable,3835 memcpy ((*ppCtx)->sPSOVector.sParaSetOffsetVariable, sTmpPsoVariable,
3836 (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage3836 (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage
3837 (*ppCtx)->sPSOVector.uiIdrPicId = uiTmpIdrPicId;3837 //for LTR
3838 (*ppCtx)->uiIdrPicId = uiTmpIdrPicId;
3838 //for sEncoderStatistics3839 //for sEncoderStatistics
3839 (*ppCtx)->sEncoderStatistics = sTempEncoderStatistics;3840 (*ppCtx)->sEncoderStatistics = sTempEncoderStatistics;
3840 } else {3841 } else {

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