Commit 06e65269 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Remove unused VAR_BASED_FIXED_PARTITION flag"

parents 7bf47592 e1111fba
...@@ -2572,16 +2572,15 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile, ...@@ -2572,16 +2572,15 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
sf->always_this_block_size); sf->always_this_block_size);
rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64, rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,
&dummy_rate, &dummy_dist, 1, cpi->pc_root); &dummy_rate, &dummy_dist, 1, cpi->pc_root);
} else if (cpi->partition_search_skippable_frame || } else if (cpi->partition_search_skippable_frame) {
sf->partition_search_type == VAR_BASED_FIXED_PARTITION) {
BLOCK_SIZE bsize; BLOCK_SIZE bsize;
set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64); set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64);
bsize = get_rd_var_based_fixed_partition(cpi, mi_row, mi_col); bsize = get_rd_var_based_fixed_partition(cpi, mi_row, mi_col);
set_fixed_partitioning(cpi, tile, mi, mi_row, mi_col, bsize); set_fixed_partitioning(cpi, tile, mi, mi_row, mi_col, bsize);
rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64, rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,
&dummy_rate, &dummy_dist, 1, cpi->pc_root); &dummy_rate, &dummy_dist, 1, cpi->pc_root);
} else if (sf->partition_search_type == VAR_BASED_PARTITION && } else if (sf->partition_search_type == VAR_BASED_PARTITION &&
cm->frame_type != KEY_FRAME ) { cm->frame_type != KEY_FRAME ) {
choose_partitioning(cpi, tile, mi_row, mi_col); choose_partitioning(cpi, tile, mi_row, mi_col);
rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64, rd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,
&dummy_rate, &dummy_dist, 1, cpi->pc_root); &dummy_rate, &dummy_dist, 1, cpi->pc_root);
...@@ -3174,7 +3173,6 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile, ...@@ -3174,7 +3173,6 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
nonrd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64, nonrd_use_partition(cpi, tile, mi, tp, mi_row, mi_col, BLOCK_64X64,
1, &dummy_rate, &dummy_dist, cpi->pc_root); 1, &dummy_rate, &dummy_dist, cpi->pc_root);
break; break;
case VAR_BASED_FIXED_PARTITION:
case FIXED_PARTITION: case FIXED_PARTITION:
bsize = sf->partition_search_type == FIXED_PARTITION ? bsize = sf->partition_search_type == FIXED_PARTITION ?
sf->always_this_block_size : sf->always_this_block_size :
......
...@@ -149,16 +149,12 @@ typedef enum { ...@@ -149,16 +149,12 @@ typedef enum {
typedef enum { typedef enum {
// Search partitions using RD/NONRD criterion // Search partitions using RD/NONRD criterion
SEARCH_PARTITION = 0, SEARCH_PARTITION,
// Always use a fixed size 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 REFERENCE_PARTITION,
// determined based on source variance
VAR_BASED_FIXED_PARTITION = 2,
REFERENCE_PARTITION = 3,
// Use an arbitrary partitioning scheme based on source variance within // Use an arbitrary partitioning scheme based on source variance within
// a 64X64 SB // a 64X64 SB
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment