History

Merge pull request #1440 from shihuade/APIUTV1.4

fix bug in set option return value

sijchen committed 12 years ago

Commit 273e1222 parents 43c62d0 8d5863a3 files · +11 −5Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+4−2
@@ -3850,9 +3850,10 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 3849 unmodified lines
3850 return 0;3850 return 0;
3851}3851}
3852 3852
3853void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue) {3853int32_t WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue) {
3854 SWelsSvcCodingParam sConfig;3854 SWelsSvcCodingParam sConfig;
3855 int32_t iNumRefFrame = 1;3855 int32_t iNumRefFrame = 1;
3856 int32_t iRet = 0;
3856 memcpy (&sConfig, (*ppCtx)->pSvcParam, sizeof (SWelsSvcCodingParam));3857 memcpy (&sConfig, (*ppCtx)->pSvcParam, sizeof (SWelsSvcCodingParam));
3857 sConfig.bEnableLongTermReference = pLTRValue->bEnableLongTermReference;3858 sConfig.bEnableLongTermReference = pLTRValue->bEnableLongTermReference;
3858 sConfig.iLTRRefNum = pLTRValue->iLTRRefNum;3859 sConfig.iLTRRefNum = pLTRValue->iLTRRefNum;
@@ -3883,7 +3884,8 @@ void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* · 24 unmodified lines
3883 3884
3884 WelsLog (pLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable LTR = %d,ltrnum = %d",3885 WelsLog (pLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable LTR = %d,ltrnum = %d",
3885 sConfig.bEnableLongTermReference, sConfig.iLTRRefNum);3886 sConfig.bEnableLongTermReference, sConfig.iLTRRefNum);
3886 WelsEncoderParamAdjust (ppCtx, &sConfig);3887 iRet = WelsEncoderParamAdjust (ppCtx, &sConfig);
3888 return iRet;
3887}3889}
3888int32_t DynSliceRealloc (sWelsEncCtx* pCtx,3890int32_t DynSliceRealloc (sWelsEncCtx* pCtx,
3889 SFrameBSInfo* pFrameBsInfo,3891 SFrameBSInfo* pFrameBsInfo,

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