History

Merge pull request #1632 from ruil2/encoder_refine

use the same complexity computation branch for screen and camera

sijchen committed 11 years ago

Commit 9cc395f2 parents 2c99f58 173ec602 files · +11 −12Browse 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−3
@@ -3269,11 +3269,10 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3268 unmodified lines
3269#ifdef LONG_TERM_REF_DUMP3269#ifdef LONG_TERM_REF_DUMP
3270 DumpRef (pCtx);3270 DumpRef (pCtx);
3271#endif3271#endif
3272 if ((pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) && (pSvcParam->iRCMode != RC_OFF_MODE))3272 if ((pSvcParam->iRCMode != RC_OFF_MODE))
3273 pCtx->pVpp->AnalyzePictureComplexity (pCtx, pCtx->pEncPic, ((pCtx->eSliceType == P_SLICE)3273 pCtx->pVpp->AnalyzePictureComplexity (pCtx, pCtx->pEncPic, ((pCtx->eSliceType == P_SLICE)
3274 && (pCtx->iNumRef0 > 0)) ? pCtx->pRefList0[0] : NULL,3274 && (pCtx->iNumRef0 > 0)) ? pCtx->pRefList0[0] : NULL,
3275 iCurDid, pSvcParam->bEnableBackgroundDetection);3275 iCurDid,(pCtx->eSliceType == P_SLICE)&&(pSvcParam->bEnableBackgroundDetection));
3276
3277 WelsUpdateRefSyntax (pCtx, pCtx->iPOC,3276 WelsUpdateRefSyntax (pCtx, pCtx->iPOC,
3278 eFrameType); //get reordering syntax used for writing slice header and transmit to encoder.3277 eFrameType); //get reordering syntax used for writing slice header and transmit to encoder.
3279 PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer3278 PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer

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