[x265] [x265 PATCH] Decoupled the non-"medium" presets from the effect of new default parameters committed under 4583000db964

[Aruna Matheswaran]

Pushed to Release_3.1.

Thanks,
Aruna

On Fri, Jun 14, 2019 at 5:46 PM Praveen Kumar Karadugattu <
praveenkumar at multicorewareinc.com> wrote:

> # HG changeset patch
> # User praveen_karadugattu <praveenkumar at multicorewareinc.com>
> # Date 1560507248 -19800
> #      Fri Jun 14 15:44:08 2019 +0530
> # Node ID 6766973bc652a7a2a550f539f03248ee54e3b312
> # Parent  a46ded2c14116af1cafacdc1fb98be43259dc7d6
> Decoupled the non-"medium" presets from the effect of new default
> parameters committed under commit-id 4583000db964.
> diff -r a46ded2c1411 -r 6766973bc652 source/common/param.cpp
> --- a/source/common/param.cpp Tue May 28 14:01:54 2019 +0800
> +++ b/source/common/param.cpp Fri Jun 14 15:44:08 2019 +0530
> @@ -361,6 +361,8 @@
>
>          if (!strcmp(preset, "ultrafast"))
>          {
> +            param->maxNumMergeCand = 2;
> +            param->bIntraInBFrames = 0;
>              param->lookaheadDepth = 5;
>              param->scenecutThreshold = 0; // disable lookahead
>              param->maxCUSize = 32;
> @@ -369,7 +371,6 @@
>              param->bFrameAdaptive = 0;
>              param->subpelRefine = 0;
>              param->searchMethod = X265_DIA_SEARCH;
> -            param->bEnableEarlySkip = 1;
>              param->bEnableSAO = 0;
>              param->bEnableSignHiding = 0;
>              param->bEnableWeightedPred = 0;
> @@ -384,12 +385,13 @@
>          }
>          else if (!strcmp(preset, "superfast"))
>          {
> +            param->maxNumMergeCand = 2;
> +            param->bIntraInBFrames = 0;
>              param->lookaheadDepth = 10;
>              param->maxCUSize = 32;
>              param->bframes = 3;
>              param->bFrameAdaptive = 0;
>              param->subpelRefine = 1;
> -            param->bEnableEarlySkip = 1;
>              param->bEnableWeightedPred = 0;
>              param->rdLevel = 2;
>              param->maxNumReferences = 1;
> @@ -403,10 +405,12 @@
>          }
>          else if (!strcmp(preset, "veryfast"))
>          {
> +            param->maxNumMergeCand = 2;
> +            param->limitReferences = 3;
> +            param->bIntraInBFrames = 0;
>              param->lookaheadDepth = 15;
>              param->bFrameAdaptive = 0;
>              param->subpelRefine = 1;
> -            param->bEnableEarlySkip = 1;
>              param->rdLevel = 2;
>              param->maxNumReferences = 2;
>              param->rc.qgSize = 32;
> @@ -414,15 +418,21 @@
>          }
>          else if (!strcmp(preset, "faster"))
>          {
> +            param->maxNumMergeCand = 2;
> +            param->limitReferences = 3;
> +            param->bIntraInBFrames = 0;
>              param->lookaheadDepth = 15;
>              param->bFrameAdaptive = 0;
> -            param->bEnableEarlySkip = 1;
>              param->rdLevel = 2;
>              param->maxNumReferences = 2;
>              param->bEnableFastIntra = 1;
>          }
>          else if (!strcmp(preset, "fast"))
>          {
> +            param->maxNumMergeCand = 2;
> +            param->limitReferences = 3;
> +            param->bEnableEarlySkip = 0;
> +            param->bIntraInBFrames = 0;
>              param->lookaheadDepth = 15;
>              param->bFrameAdaptive = 0;
>              param->rdLevel = 2;
> @@ -435,13 +445,15 @@
>          }
>          else if (!strcmp(preset, "slow"))
>          {
> +            param->limitReferences = 3;
> +            param->bEnableEarlySkip = 0;
> +            param->bIntraInBFrames = 0;
>              param->bEnableRectInter = 1;
>              param->lookaheadDepth = 25;
>              param->rdLevel = 4;
>              param->rdoqLevel = 2;
>              param->psyRdoq = 1.0;
>              param->subpelRefine = 3;
> -            param->maxNumMergeCand = 3;
>              param->searchMethod = X265_STAR_SEARCH;
>              param->maxNumReferences = 4;
>              param->limitModes = 1;
> @@ -449,6 +461,7 @@
>          }
>          else if (!strcmp(preset, "slower"))
>          {
> +            param->bEnableEarlySkip = 0;
>              param->bEnableWeightedBiPred = 1;
>              param->bEnableAMP = 1;
>              param->bEnableRectInter = 1;
> @@ -463,14 +476,13 @@
>              param->maxNumMergeCand = 4;
>              param->searchMethod = X265_STAR_SEARCH;
>              param->maxNumReferences = 5;
> -            param->limitReferences = 1;
>              param->limitModes = 1;
> -            param->bIntraInBFrames = 1;
>              param->lookaheadSlices = 0; // disabled for best quality
>              param->limitTU = 4;
>          }
>          else if (!strcmp(preset, "veryslow"))
>          {
> +            param->bEnableEarlySkip = 0;
>              param->bEnableWeightedBiPred = 1;
>              param->bEnableAMP = 1;
>              param->bEnableRectInter = 1;
> @@ -487,12 +499,12 @@
>              param->maxNumReferences = 5;
>              param->limitReferences = 0;
>              param->limitModes = 0;
> -            param->bIntraInBFrames = 1;
>              param->lookaheadSlices = 0; // disabled for best quality
>              param->limitTU = 0;
>          }
>          else if (!strcmp(preset, "placebo"))
>          {
> +            param->bEnableEarlySkip = 0;
>              param->bEnableWeightedBiPred = 1;
>              param->bEnableAMP = 1;
>              param->bEnableRectInter = 1;
> @@ -511,7 +523,6 @@
>              param->bEnableRecursionSkip = 0;
>              param->maxNumReferences = 5;
>              param->limitReferences = 0;
> -            param->bIntraInBFrames = 1;
>              param->lookaheadSlices = 0; // disabled for best quality
>              // TODO: optimized esa
>          }
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20190614/f5a21936/attachment.html>