get the correct did for savc case
This commit is contained in:
parent
4fc2b1f636
commit
64ad70b0ea
@ -269,7 +269,7 @@ void RcTraceFrameBits (sWelsEncCtx* pEncCtx, long long uiTimeStamp);
|
||||
void WelsRcInitModule (sWelsEncCtx* pCtx, RC_MODES iRcMode);
|
||||
void WelsRcInitFuncPointers (sWelsEncCtx* pEncCtx, RC_MODES iRcMode);
|
||||
void WelsRcFreeMemory (sWelsEncCtx* pCtx);
|
||||
bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx,long long uiTimeStamp,int32_t iSpatialNum);
|
||||
bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx,long long uiTimeStamp,int32_t iSpatialNum,int32_t iCurDid);
|
||||
bool WelsUpdateSkipFrameStatus();
|
||||
long long GetTimestampForRc(const long long uiTimeStamp, const long long uiLastTimeStamp, const float fFrameRate);
|
||||
|
||||
|
@ -3453,7 +3453,7 @@ EVideoFrameType PrepareEncodeFrame (sWelsEncCtx* pCtx, SLayerBSInfo*& pLayerBsIn
|
||||
SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
|
||||
SSpatialPicIndex* pSpatialIndexMap = &pCtx->sSpatialIndexMap[0];
|
||||
|
||||
bool bSkipFrameFlag = WelsRcCheckFrameStatus (pCtx,uiTimeStamp,iSpatialNum);
|
||||
bool bSkipFrameFlag = WelsRcCheckFrameStatus (pCtx,uiTimeStamp,iSpatialNum,iCurDid);
|
||||
EVideoFrameType eFrameType = DecideFrameType (pCtx, iSpatialNum, iCurDid, bSkipFrameFlag);
|
||||
|
||||
if (eFrameType == videoFrameTypeSkip) {
|
||||
|
@ -768,7 +768,7 @@ void CheckFrameSkipBasedMaxbr (sWelsEncCtx* pEncCtx, const long long uiTimeStamp
|
||||
}
|
||||
}
|
||||
|
||||
bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iSpatialNum) {
|
||||
bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iSpatialNum,int32_t iCurDid) {
|
||||
|
||||
bool bSkipMustFlag = false;
|
||||
|
||||
@ -777,7 +777,7 @@ bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_
|
||||
//simul_cast AVC control
|
||||
if (pEncCtx->pSvcParam->bSimulcastAVC) {
|
||||
//check target_br skip and update info
|
||||
int32_t iDidIdx = pSpatialIndexMap->iDid;
|
||||
int32_t iDidIdx = iCurDid;
|
||||
if (pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge) {
|
||||
pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge (pEncCtx, uiTimeStamp, iDidIdx);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user