diff options
| author | Jingning Han <jingning@google.com> | 2014-10-15 15:45:27 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-10-17 09:02:25 -0700 |
| commit | e1111fba7e178a8e4a0aecd573cfe90f51845bf6 (patch) | |
| tree | 108c14839c324c3ca79369a899df26befe04d1cd /vp9/encoder/vp9_encodeframe.c | |
| parent | 5e766ccee030a207a2edd37a5f7012665bc43796 (diff) | |
| download | libvpx-e1111fba7e178a8e4a0aecd573cfe90f51845bf6.tar libvpx-e1111fba7e178a8e4a0aecd573cfe90f51845bf6.tar.gz libvpx-e1111fba7e178a8e4a0aecd573cfe90f51845bf6.tar.bz2 libvpx-e1111fba7e178a8e4a0aecd573cfe90f51845bf6.zip | |
Remove unused VAR_BASED_FIXED_PARTITION flag
Change-Id: I4ce19b7cb1c45fed86e81ee785e787630020fb4f
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a4e4fa325..322efe4ec 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2573,16 +2573,15 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile, 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); 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); @@ -3175,7 +3174,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, 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 : |