Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 3 files). Show all
Unified · Split
| @@ -285,6 +285,10 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 284 unmodified lines | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | } | 287 | } |
| 288 | |||
| 289 | //turn off adaptive quant now, algorithms needs to be refactored | ||
| 290 | pCfg->bEnableAdaptiveQuant = false; | ||
| 291 | |||
| 288 | if (pCfg->iSpatialLayerNum > 1) { | 292 | if (pCfg->iSpatialLayerNum > 1) { |
| 289 | for (i = pCfg->iSpatialLayerNum - 1; i > 0; i--) { | 293 | for (i = pCfg->iSpatialLayerNum - 1; i > 0; i--) { |
| 290 | SSpatialLayerConfig* fDlpUp = &pCfg->sSpatialLayers[i]; | 294 | SSpatialLayerConfig* fDlpUp = &pCfg->sSpatialLayers[i]; |
| @@ -358,10 +362,7 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 67 unmodified lines | |||
| 358 | "bEnableFrameSkip = %d,bitrate can't be controlled for RC_QUALITY_MODE,RC_BITRATE_MODE and RC_TIMESTAMP_MODE without enabling skip frame.", | 362 | "bEnableFrameSkip = %d,bitrate can't be controlled for RC_QUALITY_MODE,RC_BITRATE_MODE and RC_TIMESTAMP_MODE without enabling skip frame.", |
| 359 | pCfg->bEnableFrameSkip); | 363 | pCfg->bEnableFrameSkip); |
| 360 | 364 | ||
| 361 | if (pCfg->iRCMode == RC_QUALITY_MODE) { | 365 | if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) { |
| 362 | pCfg->iMinQp = GOM_MIN_QP_MODE; | ||
| 363 | pCfg->iMaxQp = GOM_MAX_QP_MODE; | ||
| 364 | } else if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) { | ||
| 365 | pCfg->iMinQp = MIN_SCREEN_QP; | 366 | pCfg->iMinQp = MIN_SCREEN_QP; |
| 366 | pCfg->iMaxQp = MAX_SCREEN_QP; | 367 | pCfg->iMaxQp = MAX_SCREEN_QP; |
| 367 | } else { | 368 | } else { |