Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 3 files). Show all
Unified · Split
| @@ -589,8 +589,9 @@ int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPa · 588 unmodified lines | |||
| 589 | iMbWidth = (kiPicWidth + 15) >> 4; | 589 | iMbWidth = (kiPicWidth + 15) >> 4; |
| 590 | iMbHeight = (kiPicHeight + 15) >> 4; | 590 | iMbHeight = (kiPicHeight + 15) >> 4; |
| 591 | if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint <= MAX_MACROBLOCK_SIZE_IN_BYTE) { | 591 | if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint <= MAX_MACROBLOCK_SIZE_IN_BYTE) { |
| 592 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid iSliceSize (%d) settings!should be larger than MAX_MACROBLOCK_SIZE_IN_BYTE(%d)", | 592 | WelsLog (pLogCtx, WELS_LOG_ERROR, |
| 593 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint,MAX_MACROBLOCK_SIZE_IN_BYTE); | 593 | "ParamValidationExt(), invalid iSliceSize (%d) settings!should be larger than MAX_MACROBLOCK_SIZE_IN_BYTE(%d)", |
| 594 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint, MAX_MACROBLOCK_SIZE_IN_BYTE); | ||
| 594 | return ENC_RETURN_UNSUPPORTED_PARA; | 595 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 595 | } | 596 | } |
| 596 | 597 | ||
| @@ -3592,7 +3593,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 2995 unmodified lines | |||
| 3592 | for (int32_t iDidIdx = 0; iDidIdx < pSvcParam->iSpatialLayerNum; iDidIdx++) { | 3593 | for (int32_t iDidIdx = 0; iDidIdx < pSvcParam->iSpatialLayerNum; iDidIdx++) { |
| 3593 | SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iDidIdx]; | 3594 | SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iDidIdx]; |
| 3594 | int32_t iTemporalId = GetTemporalLevel (pParamInternal, pParamInternal->iCodingIndex, | 3595 | int32_t iTemporalId = GetTemporalLevel (pParamInternal, pParamInternal->iCodingIndex, |
| 3595 | pSvcParam->uiGopSize); | 3596 | pSvcParam->uiGopSize); |
| 3596 | if (iTemporalId == INVALID_TEMPORAL_ID) | 3597 | if (iTemporalId == INVALID_TEMPORAL_ID) |
| 3597 | pParamInternal->iCodingIndex ++; | 3598 | pParamInternal->iCodingIndex ++; |
| 3598 | } | 3599 | } |
| @@ -3972,7 +3973,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 373 unmodified lines | |||
| 3972 | #ifdef ENABLE_FRAME_DUMP | 3973 | #ifdef ENABLE_FRAME_DUMP |
| 3973 | { | 3974 | { |
| 3974 | DumpDependencyRec (fsnr, &pSvcParam->sDependencyLayers[iCurDid].sRecFileName[0], iCurDid, | 3975 | DumpDependencyRec (fsnr, &pSvcParam->sDependencyLayers[iCurDid].sRecFileName[0], iCurDid, |
| 3975 | pCtx->bDependencyRecFlag[iCurDid], pCtx->pCurDqLayer,pSvcParam->bSimulcastAVC); | 3976 | pCtx->bDependencyRecFlag[iCurDid], pCtx->pCurDqLayer, pSvcParam->bSimulcastAVC); |
| 3976 | pCtx->bDependencyRecFlag[iCurDid] = true; | 3977 | pCtx->bDependencyRecFlag[iCurDid] = true; |
| 3977 | } | 3978 | } |
| 3978 | #endif//ENABLE_FRAME_DUMP | 3979 | #endif//ENABLE_FRAME_DUMP |