History

Merge pull request #2901 from ruil2/temporal

fix crash issue that temporal layer changs cause memory issue

sijchen committed 8 years ago

Commit bbfc8402 parents 523d4bd e0548342 files · +65 −1Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+2−1
@@ -4181,7 +4181,8 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 4180 unmodified lines
41814181 (pOldParam->bEnableBackgroundDetection != pNewParam->bEnableBackgroundDetection) ||
41824182 (pOldParam->bEnableAdaptiveQuant != pNewParam->bEnableAdaptiveQuant) ||
41834183 (pOldParam->eSpsPpsIdStrategy != pNewParam->eSpsPpsIdStrategy);
4184− if (pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) {
4184+ if ((pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) ||
4185+ ((pOldParam->iMaxNumRefFrame == 1) && (pOldParam->iTemporalLayerNum == 1) && (pNewParam->iTemporalLayerNum == 2))) {
41854186 bNeedReset = true;
41864187 }
41874188 if (bNeedReset) {

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