Subseq
Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 6 files). Show all
Unified · Split
| @@ -2885,7 +2885,6 @@ int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst) { · 2884 unmodified lines | |||
| 2885 | int32_t iReturn = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal); | 2885 | int32_t iReturn = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal); |
| 2886 | WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS) | 2886 | WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS) |
| 2887 | 2887 | ||
| 2888 | pLayerBsInfo->uiPriorityId = 0; | ||
| 2889 | pLayerBsInfo->uiSpatialId = 0; | 2888 | pLayerBsInfo->uiSpatialId = 0; |
| 2890 | pLayerBsInfo->uiTemporalId = 0; | 2889 | pLayerBsInfo->uiTemporalId = 0; |
| 2891 | pLayerBsInfo->uiQualityId = 0; | 2890 | pLayerBsInfo->uiQualityId = 0; |
| @@ -2948,13 +2947,13 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 56 unmodified lines | |||
| 2948 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic); | 2947 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic); |
| 2949 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) | 2948 | if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate) |
| 2950 | ++ pCtx->iCodingIndex; | 2949 | ++ pCtx->iCodingIndex; |
| 2951 | pFbi->eOutputFrameType = videoFrameTypeSkip; | 2950 | pFbi->eFrameType = videoFrameTypeSkip; |
| 2952 | return ENC_RETURN_SUCCESS; | 2951 | return ENC_RETURN_SUCCESS; |
| 2953 | } | 2952 | } |
| 2954 | 2953 | ||
| 2955 | eFrameType = DecideFrameType (pCtx, iSpatialNum); | 2954 | eFrameType = DecideFrameType (pCtx, iSpatialNum); |
| 2956 | if (eFrameType == videoFrameTypeSkip) { | 2955 | if (eFrameType == videoFrameTypeSkip) { |
| 2957 | pFbi->eOutputFrameType = eFrameType; | 2956 | pFbi->eFrameType = eFrameType; |
| 2958 | return ENC_RETURN_SUCCESS; | 2957 | return ENC_RETURN_SUCCESS; |
| 2959 | } | 2958 | } |
| 2960 | 2959 | ||
| @@ -2969,7 +2968,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 8 unmodified lines | |||
| 2969 | } | 2968 | } |
| 2970 | } | 2969 | } |
| 2971 | if (true == bSkipMustFlag) { | 2970 | if (true == bSkipMustFlag) { |
| 2972 | pFbi->eOutputFrameType = videoFrameTypeSkip; | 2971 | pFbi->eFrameType = videoFrameTypeSkip; |
| 2973 | return ENC_RETURN_SUCCESS; | 2972 | return ENC_RETURN_SUCCESS; |
| 2974 | } | 2973 | } |
| 2975 | } | 2974 | } |
| @@ -2992,7 +2991,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 16 unmodified lines | |||
| 2992 | pCtx->iEncoderError = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal); | 2991 | pCtx->iEncoderError = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal); |
| 2993 | WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS) | 2992 | WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS) |
| 2994 | 2993 | ||
| 2995 | pLayerBsInfo->uiPriorityId = 0; | ||
| 2996 | pLayerBsInfo->uiSpatialId = 0; | 2994 | pLayerBsInfo->uiSpatialId = 0; |
| 2997 | pLayerBsInfo->uiTemporalId = 0; | 2995 | pLayerBsInfo->uiTemporalId = 0; |
| 2998 | pLayerBsInfo->uiQualityId = 0; | 2996 | pLayerBsInfo->uiQualityId = 0; |
| @@ -3095,7 +3093,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 96 unmodified lines | |||
| 3095 | WelsLog (pCtx, WELS_LOG_WARNING, | 3093 | WelsLog (pCtx, WELS_LOG_WARNING, |
| 3096 | "WelsEncoderEncodeExt(), WelsBuildRefList failed for P frames, pCtx->iNumRef0= %d. ForceCodingIDR!\n", | 3094 | "WelsEncoderEncodeExt(), WelsBuildRefList failed for P frames, pCtx->iNumRef0= %d. ForceCodingIDR!\n", |
| 3097 | pCtx->iNumRef0); | 3095 | pCtx->iNumRef0); |
| 3098 | pFbi->eOutputFrameType = videoFrameTypeIDR; | 3096 | pFbi->eFrameType = videoFrameTypeIDR; |
| 3099 | pCtx->iEncoderError = ENC_RETURN_CORRECTED; | 3097 | pCtx->iEncoderError = ENC_RETURN_CORRECTED; |
| 3100 | return ENC_RETURN_CORRECTED; | 3098 | return ENC_RETURN_CORRECTED; |
| 3101 | } | 3099 | } |
| @@ -3150,7 +3148,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 48 unmodified lines | |||
| 3150 | pLayerBsInfo->uiSpatialId = iCurDid; | 3148 | pLayerBsInfo->uiSpatialId = iCurDid; |
| 3151 | pLayerBsInfo->uiTemporalId = iCurTid; | 3149 | pLayerBsInfo->uiTemporalId = iCurTid; |
| 3152 | pLayerBsInfo->uiQualityId = 0; | 3150 | pLayerBsInfo->uiQualityId = 0; |
| 3153 | pLayerBsInfo->uiPriorityId = 0; | ||
| 3154 | pLayerBsInfo->iNalCount = ++ iNalIdxInLayer; | 3151 | pLayerBsInfo->iNalCount = ++ iNalIdxInLayer; |
| 3155 | } | 3152 | } |
| 3156 | // for dynamic slicing single threading.. | 3153 | // for dynamic slicing single threading.. |
| @@ -3336,7 +3333,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 179 unmodified lines | |||
| 3336 | pLayerBsInfo->uiSpatialId = iCurDid; | 3333 | pLayerBsInfo->uiSpatialId = iCurDid; |
| 3337 | pLayerBsInfo->uiTemporalId = iCurTid; | 3334 | pLayerBsInfo->uiTemporalId = iCurTid; |
| 3338 | pLayerBsInfo->uiQualityId = 0; | 3335 | pLayerBsInfo->uiQualityId = 0; |
| 3339 | pLayerBsInfo->uiPriorityId = 0; | ||
| 3340 | pLayerBsInfo->iNalCount = iNalIdxInLayer; | 3336 | pLayerBsInfo->iNalCount = iNalIdxInLayer; |
| 3341 | } | 3337 | } |
| 3342 | } | 3338 | } |
| @@ -3360,7 +3356,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 17 unmodified lines | |||
| 3360 | ForceCodingIDR (pCtx); | 3356 | ForceCodingIDR (pCtx); |
| 3361 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsEncoderEncodeExt(), WelsUpdateRefList failed. ForceCodingIDR!\n"); | 3357 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsEncoderEncodeExt(), WelsUpdateRefList failed. ForceCodingIDR!\n"); |
| 3362 | //the above is to set the next frame to be IDR | 3358 | //the above is to set the next frame to be IDR |
| 3363 | pFbi->eOutputFrameType = eFrameType; | 3359 | pFbi->eFrameType = eFrameType; |
| 3364 | return ENC_RETURN_CORRECTED; | 3360 | return ENC_RETURN_CORRECTED; |
| 3365 | } | 3361 | } |
| 3366 | } | 3362 | } |
| @@ -3474,7 +3470,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 107 unmodified lines | |||
| 3474 | 3470 | ||
| 3475 | pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize = 0; | 3471 | pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize = 0; |
| 3476 | 3472 | ||
| 3477 | pLayerBsInfo->uiPriorityId = 0; | ||
| 3478 | pLayerBsInfo->uiSpatialId = 0; | 3473 | pLayerBsInfo->uiSpatialId = 0; |
| 3479 | pLayerBsInfo->uiTemporalId = 0; | 3474 | pLayerBsInfo->uiTemporalId = 0; |
| 3480 | pLayerBsInfo->uiQualityId = 0; | 3475 | pLayerBsInfo->uiQualityId = 0; |
| @@ -3512,7 +3507,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 31 unmodified lines | |||
| 3512 | ForceCodingIDR (pCtx); | 3507 | ForceCodingIDR (pCtx); |
| 3513 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsEncoderEncodeExt(), Logic Error Found in temporal level. ForceCodingIDR!\n"); | 3508 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsEncoderEncodeExt(), Logic Error Found in temporal level. ForceCodingIDR!\n"); |
| 3514 | //the above is to set the next frame IDR | 3509 | //the above is to set the next frame IDR |
| 3515 | pFbi->eOutputFrameType = eFrameType; | 3510 | pFbi->eFrameType = eFrameType; |
| 3516 | return ENC_RETURN_CORRECTED; | 3511 | return ENC_RETURN_CORRECTED; |
| 3517 | } | 3512 | } |
| 3518 | 3513 | ||
| @@ -3548,7 +3543,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 29 unmodified lines | |||
| 3548 | 3543 | ||
| 3549 | WelsEmms(); | 3544 | WelsEmms(); |
| 3550 | 3545 | ||
| 3551 | pFbi->eOutputFrameType = eFrameType; | 3546 | pFbi->eFrameType = eFrameType; |
| 3552 | return ENC_RETURN_SUCCESS; | 3547 | return ENC_RETURN_SUCCESS; |
| 3553 | } | 3548 | } |
| 3554 | 3549 | ||
| @@ -3939,7 +3934,6 @@ int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx, · 384 unmodified lines | |||
| 3939 | pLayerBsInfo->uiSpatialId = pCtx->uiDependencyId; | 3934 | pLayerBsInfo->uiSpatialId = pCtx->uiDependencyId; |
| 3940 | pLayerBsInfo->uiTemporalId = pCtx->uiTemporalId; | 3935 | pLayerBsInfo->uiTemporalId = pCtx->uiTemporalId; |
| 3941 | pLayerBsInfo->uiQualityId = 0; | 3936 | pLayerBsInfo->uiQualityId = 0; |
| 3942 | pLayerBsInfo->uiPriorityId = 0; | ||
| 3943 | pLayerBsInfo->iNalCount = iNalIdxInLayer; | 3937 | pLayerBsInfo->iNalCount = iNalIdxInLayer; |
| 3944 | 3938 | ||
| 3945 | return ENC_RETURN_SUCCESS; | 3939 | return ENC_RETURN_SUCCESS; |