Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -3067,9 +3067,7 @@ int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst) { · 3066 unmodified lines | |||
| 3067 | * [NO in picture list case, YES in console aplication based] | 3067 | * [NO in picture list case, YES in console aplication based] |
| 3068 | * \return EFrameType (WELS_FRAME_TYPE_IDR/WELS_FRAME_TYPE_I/WELS_FRAME_TYPE_P) | 3068 | * \return EFrameType (WELS_FRAME_TYPE_IDR/WELS_FRAME_TYPE_I/WELS_FRAME_TYPE_P) |
| 3069 | */ | 3069 | */ |
| 3070 | int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePicture** ppSrcList, | 3070 | int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo * pFbi, const SSourcePicture* pSrcPic) { |
| 3071 | const int32_t iConfiguredLayerNum) { | ||
| 3072 | SFrameBSInfo* pFbi = (SFrameBSInfo*)pDst; | ||
| 3073 | SLayerBSInfo* pLayerBsInfo = &pFbi->sLayerInfo[0]; | 3071 | SLayerBSInfo* pLayerBsInfo = &pFbi->sLayerInfo[0]; |
| 3074 | SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam; | 3072 | SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam; |
| 3075 | SSpatialPicIndex* pSpatialIndexMap = &pCtx->sSpatialIndexMap[0]; | 3073 | SSpatialPicIndex* pSpatialIndexMap = &pCtx->sSpatialIndexMap[0]; |
| @@ -3108,7 +3106,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 32 unmodified lines | |||
| 3108 | pFbi->iLayerNum = 0; // for initialization | 3106 | pFbi->iLayerNum = 0; // for initialization |
| 3109 | 3107 | ||
| 3110 | // perform csc/denoise/downsample/padding, generate spatial layers | 3108 | // perform csc/denoise/downsample/padding, generate spatial layers |
| 3111 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, ppSrcList, iConfiguredLayerNum); | 3109 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, &pSrcPic, 1); |
| 3112 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) | 3110 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) |
| 3113 | ++ pCtx->iCodingIndex; | 3111 | ++ pCtx->iCodingIndex; |
| 3114 | pFbi->eOutputFrameType = WELS_FRAME_TYPE_SKIP; | 3112 | pFbi->eOutputFrameType = WELS_FRAME_TYPE_SKIP; |