Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -3716,14 +3716,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3715 unmodified lines | |||
| 3716 | pLayerBsInfo->eFrameType = eFrameType; | 3716 | pLayerBsInfo->eFrameType = eFrameType; |
| 3717 | pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType); | 3717 | pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType); |
| 3718 | 3718 | ||
| 3719 | int32_t iRet = InitAllSlicesInThread(pCtx); | ||
| 3720 | if (iRet) { | ||
| 3721 | WelsLog (pLogCtx, WELS_LOG_ERROR, | ||
| 3722 | "WelsEncoderEncodeExt(), multi-slice (mode %d) InitAllSlicesInThread() error!", | ||
| 3723 | pParam->sSliceArgument.uiSliceMode); | ||
| 3724 | return ENC_RETURN_UNEXPECTED; | ||
| 3725 | } | ||
| 3726 | |||
| 3727 | pCtx->pTaskManage->ExecuteTasks(); | 3719 | pCtx->pTaskManage->ExecuteTasks(); |
| 3728 | if (pCtx->iEncoderError) { | 3720 | if (pCtx->iEncoderError) { |
| 3729 | WelsLog (pLogCtx, WELS_LOG_ERROR, | 3721 | WelsLog (pLogCtx, WELS_LOG_ERROR, |
| @@ -3732,14 +3724,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 2 unmodified lines | |||
| 3732 | return pCtx->iEncoderError; | 3724 | return pCtx->iEncoderError; |
| 3733 | } | 3725 | } |
| 3734 | 3726 | ||
| 3735 | iRet = SliceLayerInfoUpdate (pCtx, pFbi, pLayerBsInfo, pParam->sSliceArgument.uiSliceMode); | ||
| 3736 | if (iRet) { | ||
| 3737 | WelsLog (pLogCtx, WELS_LOG_ERROR, | ||
| 3738 | "WelsEncoderEncodeExt(), multi-slice (mode %d) SliceLayerInfoUpdate() error!", | ||
| 3739 | pParam->sSliceArgument.uiSliceMode); | ||
| 3740 | return ENC_RETURN_UNEXPECTED; | ||
| 3741 | } | ||
| 3742 | |||
| 3743 | iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, iSliceCount); | 3727 | iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, iSliceCount); |
| 3744 | } | 3728 | } |
| 3745 | // THREAD_FULLY_FIRE_MODE && SM_SIZELIMITED_SLICE | 3729 | // THREAD_FULLY_FIRE_MODE && SM_SIZELIMITED_SLICE |