# HG changeset patch # User Deepthi Nandakumar <deep...@multicorewareinc.com> # Date 1456928545 -19800 # Wed Mar 02 19:52:25 2016 +0530 # Node ID d8ab542232eb047bbd7f6bcbabf482d50e2393fc # Parent 7f7fe82ad6784c2773e0123f746ff37c66632d06 reconfigure: revise reconfigurable parameters
SAO, TU sizes, temporal MVP are encoded in the SPS and cannot be changed. NR structs are allocated during initialisation. diff -r 7f7fe82ad678 -r d8ab542232eb source/encoder/encoder.cpp --- a/source/encoder/encoder.cpp Mon Mar 07 10:38:19 2016 +0530 +++ b/source/encoder/encoder.cpp Wed Mar 02 19:52:25 2016 +0530 @@ -905,28 +905,24 @@ int Encoder::reconfigureParam(x265_param* encParam, x265_param* param) { encParam->maxNumReferences = param->maxNumReferences; // never uses more refs than specified in stream headers - encParam->bEnableLoopFilter = param->bEnableLoopFilter; - encParam->deblockingFilterTCOffset = param->deblockingFilterTCOffset; - encParam->deblockingFilterBetaOffset = param->deblockingFilterBetaOffset; encParam->bEnableFastIntra = param->bEnableFastIntra; encParam->bEnableEarlySkip = param->bEnableEarlySkip; - encParam->bEnableTemporalMvp = param->bEnableTemporalMvp; - /* Scratch buffer prevents me_range from being increased for esa/tesa - if (param->searchMethod < X265_FULL_SEARCH || param->searchMethod < encParam->searchRange) - encParam->searchRange = param->searchRange; */ - encParam->noiseReductionInter = param->noiseReductionInter; - encParam->noiseReductionIntra = param->noiseReductionIntra; + encParam->searchMethod = param->searchMethod; + /* Scratch buffer prevents me_range from being increased for esa/tesa */ + if (param->searchRange < encParam->searchRange) + encParam->searchRange = param->searchRange; /* We can't switch out of subme=0 during encoding. */ if (encParam->subpelRefine) encParam->subpelRefine = param->subpelRefine; encParam->rdoqLevel = param->rdoqLevel; encParam->rdLevel = param->rdLevel; - encParam->bEnableTSkipFast = param->bEnableTSkipFast; - encParam->psyRd = param->psyRd; - encParam->psyRdoq = param->psyRdoq; - encParam->bEnableSignHiding = param->bEnableSignHiding; - encParam->bEnableFastIntra = param->bEnableFastIntra; - encParam->maxTUSize = param->maxTUSize; + encParam->bEnableRectInter = param->bEnableRectInter; + encParam->maxNumMergeCand = param->maxNumMergeCand; + encParam->bIntraInBFrames = param->bIntraInBFrames; + encParam->rc.aqMode = param->rc.aqMode; + encParam->rc.cuTree = param->rc.cuTree; + /* To add: Loop Filter/deblocking controls, transform skip, signhide require PPS to be resent */ + /* To add: SAO, temporal MVP, AMP, TU depths require SPS to be resent, at every CVS boundary */ return x265_check_params(encParam); } -- Deepthi Nandakumar Engineering Manager, x265 Multicoreware, Inc
_______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel