Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 2 files). Show all
Unified · Split
| @@ -2089,7 +2089,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2088 unmodified lines | |||
| 2089 | if (pCodingParam->iMultipleThreadIdc > 1) | 2089 | if (pCodingParam->iMultipleThreadIdc > 1) |
| 2090 | iRet = CreateSliceThreads (pCtx); | 2090 | iRet = CreateSliceThreads (pCtx); |
| 2091 | 2091 | ||
| 2092 | if(pCodingParam->iEntropyCodingModeFlag) | 2092 | if (pCodingParam->iEntropyCodingModeFlag) |
| 2093 | WelsCabacInit (pCtx); | 2093 | WelsCabacInit (pCtx); |
| 2094 | WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode); | 2094 | WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode); |
| 2095 | 2095 | ||
| @@ -3059,24 +3059,24 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 963 unmodified lines | |||
| 3059 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) | 3059 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) |
| 3060 | ++ pCtx->iCodingIndex; | 3060 | ++ pCtx->iCodingIndex; |
| 3061 | pFbi->eFrameType = videoFrameTypeSkip; | 3061 | pFbi->eFrameType = videoFrameTypeSkip; |
| 3062 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame", | 3062 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld", |
| 3063 | (int64_t)pSrcPic->uiTimeStamp); | 3063 | pSrcPic->uiTimeStamp); |
| 3064 | return ENC_RETURN_SUCCESS; | 3064 | return ENC_RETURN_SUCCESS; |
| 3065 | } | 3065 | } |
| 3066 | 3066 | ||
| 3067 | eFrameType = DecideFrameType (pCtx, iSpatialNum); | 3067 | eFrameType = DecideFrameType (pCtx, iSpatialNum); |
| 3068 | if (eFrameType == videoFrameTypeSkip) { | 3068 | if (eFrameType == videoFrameTypeSkip) { |
| 3069 | pFbi->eFrameType = eFrameType; | 3069 | pFbi->eFrameType = eFrameType; |
| 3070 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame", | 3070 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld", |
| 3071 | (int64_t)pSrcPic->uiTimeStamp); | 3071 | pSrcPic->uiTimeStamp); |
| 3072 | return ENC_RETURN_SUCCESS; | 3072 | return ENC_RETURN_SUCCESS; |
| 3073 | } | 3073 | } |
| 3074 | 3074 | ||
| 3075 | //loop each layer to check if have skip frame when RC and frame skip enable | 3075 | //loop each layer to check if have skip frame when RC and frame skip enable |
| 3076 | if (CheckFrameSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, (uint32_t)pSrcPic->uiTimeStamp)) { | 3076 | if (CheckFrameSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, (uint32_t)pSrcPic->uiTimeStamp)) { |
| 3077 | pFbi->eFrameType = videoFrameTypeSkip; | 3077 | pFbi->eFrameType = videoFrameTypeSkip; |
| 3078 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame", | 3078 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld", |
| 3079 | (int64_t)pSrcPic->uiTimeStamp); | 3079 | pSrcPic->uiTimeStamp); |
| 3080 | return ENC_RETURN_SUCCESS; | 3080 | return ENC_RETURN_SUCCESS; |
| 3081 | } | 3081 | } |
| 3082 | 3082 | ||