shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove unused VAR_BASED_FIXED_PARTITION flag"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -2572,8 +2572,7 @@

                              sf->always_this_block_size);

       rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,

                        &dummy_rate, &dummy_dist, 1, cpi->pc_root);

-    } else if (cpi->partition_search_skippable_frame ||

-               sf->partition_search_type == VAR_BASED_FIXED_PARTITION) {

+    } else if (cpi->partition_search_skippable_frame) {

       BLOCK_SIZE bsize;

       set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64);

       bsize = get_rd_var_based_fixed_partition(cpi, mi_row, mi_col);

@@ -2580,8 +2579,8 @@

       set_fixed_partitioning(cpi, tile, mi, mi_row, mi_col, bsize);

       rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,

                        &dummy_rate, &dummy_dist, 1, cpi->pc_root);

-      } else if (sf->partition_search_type == VAR_BASED_PARTITION &&

-                 cm->frame_type != KEY_FRAME ) {

+    } else if (sf->partition_search_type == VAR_BASED_PARTITION &&

+               cm->frame_type != KEY_FRAME ) {

       choose_partitioning(cpi, tile, mi_row, mi_col);

       rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,

                        &dummy_rate, &dummy_dist, 1, cpi->pc_root);

@@ -3174,7 +3173,6 @@

         nonrd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,

                             1, &dummy_rate, &dummy_dist, cpi->pc_root);

         break;

-      case VAR_BASED_FIXED_PARTITION:

       case FIXED_PARTITION:

         bsize = sf->partition_search_type == FIXED_PARTITION ?

                 sf->always_this_block_size :

--- a/vp9/encoder/vp9_speed_features.h

+++ b/vp9/encoder/vp9_speed_features.h

@@ -149,16 +149,12 @@

 typedef enum {

   // Search partitions using RD/NONRD criterion

-  SEARCH_PARTITION = 0,

+  SEARCH_PARTITION,

   // Always use a fixed size partition

-  FIXED_PARTITION = 1,

+  FIXED_PARTITION,

-  // Use a fixed size partition in every 64X64 SB, where the size is

-  // determined based on source variance

-  VAR_BASED_FIXED_PARTITION = 2,

-

-  REFERENCE_PARTITION = 3,

+  REFERENCE_PARTITION,

   // Use an arbitrary partitioning scheme based on source variance within

   // a 64X64 SB