diff --git a/README.md b/README.md index 37e97d32..beedc556 100644 --- a/README.md +++ b/README.md @@ -193,13 +193,12 @@ Compression tools: - full: Full SAO --alf : Adaptive Loop Filter [off] - off: ALF disabled - - no-cc: ALF enabled without cross component refinement + - no-cc: ALF enabled without cross component + refinement - full: Full ALF --(no-)rdoq : Rate-distortion optimized quantization [enabled] --(no-)rdoq-skip : Skip RDOQ for 4x4 blocks. [disabled] --(no-)signhide : Sign hiding [disabled] - --(no-)smp : Symmetric motion partition [disabled] - --(no-)amp : Asymmetric motion partition [disabled] --rd : Intra mode search complexity [0] - 0: Skip intra if inter is good enough. - 1: Rough intra mode search with SATD. @@ -243,6 +242,16 @@ Compression tools: --ml-pu-depth-intra : Predict the pu-depth-intra using machine learning trees, overrides the --pu-depth-intra parameter. [disabled] + --(no-)combine-intra-cus: Whether the encoder tries to code a cu + on lower depth even when search is not + performed on said depth. Should only + be disabled if cus absolutely must not + be larger than limited by the search. + [enabled] + --force-inter : Force the encoder to use inter always. + This is mostly for debugging and is not + guaranteed to produce sensible bitstream or + work at all. [disabled] --tr-depth-intra : Transform split depth for intra blocks [0] --(no-)bipred : Bi-prediction [disabled] --cu-split-termination : CU split search termination [zero] @@ -284,9 +293,11 @@ Compression tools: - off: MTS disabled - intra: MTS applied only for intra blocks. - inter: MTS applied only for inter blocks. - - both: MTS applied for both intra and inter blocks. - - implicit: uses implicit MTS. Applies DST7 instead - of DCT2 to certain intra blocks. + - both: MTS applied for both intra and inter + blocks. + - implicit: uses implicit MTS. Applies DST7 + instead of DCT2 to certain intra + blocks. --(no-)jccr : Joint coding of chroma residual. Requires rdo> = 2. [disabled] --(no-)cclm : Cross component linear model. @@ -294,7 +305,7 @@ Compression tools: via linear transformation from the luma prediction. Requires rdo >=3. [disabled --(no-)amvr : Adaptive Motion Vector Resolution. - Code some mv's with reduced resolution [disabled] + Code some MVs with reduced resolution [disabled] Parallel processing: --threads : Number of threads to use [auto] @@ -317,8 +328,8 @@ Parallel processing: - u: Number of tile columns of uniform width. --tiles-height-split |u : - - : A comma-separated list of tile row - column pixel coordinates. + - : A comma-separated list of tile + row column pixel coordinates. - u: Number of tile rows of uniform height. --slices : Control how slices are used. diff --git a/src/cli.c b/src/cli.c index 9fd36359..1d2c5123 100644 --- a/src/cli.c +++ b/src/cli.c @@ -553,7 +553,8 @@ void print_help(void) " - full: Full SAO\n" " --alf : Adaptive Loop Filter [off]\n" " - off: ALF disabled\n" - " - no-cc: ALF enabled without cross component refinement\n" + " - no-cc: ALF enabled without cross component\n" + " refinement\n" " - full: Full ALF\n" " --(no-)rdoq : Rate-distortion optimized quantization [enabled]\n" " --(no-)rdoq-skip : Skip RDOQ for 4x4 blocks. [disabled]\n" @@ -606,11 +607,11 @@ void print_help(void) " performed on said depth. Should only\n" " be disabled if cus absolutely must not\n" " be larger than limited by the search.\n" - " [enabled]" + " [enabled]\n" " --force-inter : Force the encoder to use inter always.\n" " This is mostly for debugging and is not\n" " guaranteed to produce sensible bitstream or\n" - " work at all. [disabled]" + " work at all. [disabled]\n" " --tr-depth-intra : Transform split depth for intra blocks [0]\n" " --(no-)bipred : Bi-prediction [disabled]\n" " --cu-split-termination : CU split search termination [zero]\n" @@ -636,9 +637,9 @@ void print_help(void) " a zero coefficient CU is found. [disabled]\n" " --(no-)early-skip : Try to find skip cu from merge candidates.\n" " Perform no further search if skip is found.\n" - " For rd=0..1: Try the first candidate.\n" - " For rd=2.. : Try the best candidate based\n" - " on luma satd cost. [enabled]\n" + " For rd = 0..1: Try the first candidate.\n" + " For rd = 2.. : Try the best candidate based\n" + " on luma satd cost. [enabled]\n" " --max-merge : Maximum number of merge candidates, 1..6 [6]\n" " --(no-)implicit-rdpcm : Implicit residual DPCM. Currently only supported\n" " with lossless coding. [disabled]\n" @@ -652,17 +653,19 @@ void print_help(void) " - off: MTS disabled\n" " - intra: MTS applied only for intra blocks.\n" " - inter: MTS applied only for inter blocks.\n" - " - both: MTS applied for both intra and inter blocks.\n" - " - implicit: uses implicit MTS. Applies DST7 instead \n" - " of DCT2 to certain intra blocks.\n" + " - both: MTS applied for both intra and inter\n" + " blocks.\n" + " - implicit: uses implicit MTS. Applies DST7\n" + " instead of DCT2 to certain intra\n + " blocks.\n" " --(no-)jccr : Joint coding of chroma residual.\n" - " Requires rdo> = 2. [disabled]\n" + " Requires rdo >= 2. [disabled]\n" " --(no-)cclm : Cross component linear model. \n" " Extra chroma prediction modes that are formed\n" " via linear transformation from the luma\n" - " prediction. Requires rdo >=3. [disabled\n" + " prediction. Requires rdo >= 3. [disabled\n" " --(no-)amvr : Adaptive Motion Vector Resolution.\n" - " Code some mv's with reduced resolution [disabled]\n" + " Code some MVs with reduced resolution [disabled]\n" "\n" /* Word wrap to this width to stay under 80 characters (including ") *************/ "Parallel processing:\n" @@ -686,8 +689,8 @@ void print_help(void) " - u: Number of tile columns of uniform\n" " width.\n" " --tiles-height-split |u :\n" - " - : A comma-separated list of tile row\n" - " column pixel coordinates.\n" + " - : A comma-separated list of tile\n" + " row column pixel coordinates.\n" " - u: Number of tile rows of uniform\n" " height.\n" " --slices : Control how slices are used.\n"