update docs

ultravideo · Sep 21, 2022 · f2529a7 · f2529a7
1 parent a75aa9a
commit f2529a7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -200,18 +200,22 @@ Compression tools:
       --(no-)signhide        : Sign hiding [disabled]
       --(no-)smp             : Symmetric motion partition [disabled]
       --(no-)amp             : Asymmetric motion partition [disabled]
-      --rd <integer>         : Intra mode search complexity [0]
+      --rd <integer>         : Mode search complexity [0]
                                    - 0: Skip intra if inter is good enough.
                                    - 1: Rough intra mode search with SATD.
-                                   - 2: Refine intra mode search with SSE.
-                                   - 3: Try all intra modes and enable intra
-                                        chroma mode search.
+                                   - 2: Refine mode search with SSE.
+                                   - 3: More SSE candidates for inter and
+                                        chroma mode search for 4x4 intra.
+                                   - 4: Even more SSE candidates for both.
+                                   - 5: Try all intra modes.
       --(no-)mv-rdo          : Rate-distortion optimized motion vector costs
                                [disabled]
       --(no-)zero-coeff-rdo  : If a CU is set inter, check if forcing zero
                                residual improves the RD cost. [enabled]
       --(no-)full-intra-search : Try all intra modes during rough search.
                                [disabled]
+      --(no-)intra-chroma-search : Test non-derived intra chroma modes.
+                                   [disabled]
       --(no-)transform-skip  : Try transform skip [disabled]
       --me <string>          : Integer motion estimation algorithm [hexbs]
                                    - hexbs: Hexagon Based Search
@@ -227,6 +231,7 @@ Compression tools:
                                    - 2: + 1/2-pixel diagonal
                                    - 3: + 1/4-pixel horizontal and vertical
                                    - 4: + 1/4-pixel diagonal
+      --(no-)fast-bipred     : Only perform fast bipred search. [enabled]
       --pu-depth-inter <int>-<int> : Inter prediction units sizes [0-3]
                                    - 0, 1, 2, 3: from 64x64 to 8x8
                                    - Accepts a list of values separated by ','

diff --git a/doc/kvazaar.1 b/doc/kvazaar.1
@@ -1,4 +1,4 @@
-.TH KVAZAAR "1" "June 2022" "kvazaar v2.1.0" "User Commands"
+.TH KVAZAAR "1" "September 2022" "kvazaar v2.1.0" "User Commands"
 .SH NAME
 kvazaar \- open source HEVC encoder
 .SH SYNOPSIS
@@ -252,12 +252,14 @@ Symmetric motion partition [disabled]
 Asymmetric motion partition [disabled]
 .TP
 \fB\-\-rd <integer>        
-Intra mode search complexity [0]
+Mode search complexity [0]
     \- 0: Skip intra if inter is good enough.
     \- 1: Rough intra mode search with SATD.
-    \- 2: Refine intra mode search with SSE.
-    \- 3: Try all intra modes and enable intra
-         chroma mode search.
+    \- 2: Refine mode search with SSE.
+    \- 3: More SSE candidates for inter and
+         chroma mode search for 4x4 intra.
+    \- 4: Even more SSE candidates for both.
+    \- 5: Try all intra modes.
 .TP
 \fB\-\-(no\-)mv\-rdo         
 Rate\-distortion optimized motion vector costs
@@ -271,6 +273,10 @@ residual improves the RD cost. [enabled]
 Try all intra modes during rough search.
 [disabled]
 .TP
+\fB\-\-(no\-)intra\-chroma\-search
+Test non\-derived intra chroma modes.
+    [disabled]
+.TP
 \fB\-\-(no\-)transform\-skip 
 Try transform skip [disabled]
 .TP
@@ -294,6 +300,9 @@ Fractional pixel motion estimation level [4]
     \- 3: + 1/4\-pixel horizontal and vertical
     \- 4: + 1/4\-pixel diagonal
 .TP
+\fB\-\-(no\-)fast\-bipred    
+Only perform fast bipred search. [enabled]
+.TP
 \fB\-\-pu\-depth\-inter <int>\-<int>
 Inter prediction units sizes [0\-3]
     \- 0, 1, 2, 3: from 64x64 to 8x8

diff --git a/src/cli.c b/src/cli.c
@@ -557,10 +557,11 @@ void print_help(void)
     "      --rd <integer>         : Mode search complexity [0]\n"
     "                                   - 0: Skip intra if inter is good enough.\n"
     "                                   - 1: Rough intra mode search with SATD.\n"
-    "                                   - 2: Refine intra mode search with SSE.\n"
-    "                                   - 3: Try SSE cost for all inter merge\n"
-    "                                        candidates and modes.\n"
-    "                                   - 4: Try SSE cost for all intra modes.\n"
+    "                                   - 2: Refine mode search with SSE.\n"
+    "                                   - 3: More SSE candidates for inter and\n"
+    "                                        chroma mode search for 4x4 intra.\n"
+    "                                   - 4: Even more SSE candidates for both.\n"
+    "                                   - 5: Try all intra modes.\n"
     "      --(no-)mv-rdo          : Rate-distortion optimized motion vector costs\n"
     "                               [disabled]\n"
     "      --(no-)zero-coeff-rdo  : If a CU is set inter, check if forcing zero\n"

diff --git a/src/search_intra.c b/src/search_intra.c
@@ -819,7 +819,6 @@ void kvz_search_cu_intra(encoder_state_t * const state,
                          int8_t *mode_out, double *cost_out)
 {
   const vector2d_t lcu_px = { SUB_SCU(x_px), SUB_SCU(y_px) };
-  const int8_t cu_width = LCU_WIDTH >> depth;
   const int_fast8_t log2_width = LOG2_LCU_WIDTH - depth;
 
   cu_info_t *cur_cu = LCU_GET_CU_AT_PX(lcu, lcu_px.x, lcu_px.y);