summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2014-03-13 16:13:07 -0700
committerJingning Han <jingning@google.com>2014-03-13 16:15:14 -0700
commit9efe0b25c5cd5de66a6c037acb63466d5b175ac4 (patch)
treeb87962778ce1e439bba76c250fe946c893351bd9 /vp9
parent73df20e97dc52d28a72b27406fc703fa6db7be70 (diff)
downloadlibvpx-9efe0b25c5cd5de66a6c037acb63466d5b175ac4.tar
libvpx-9efe0b25c5cd5de66a6c037acb63466d5b175ac4.tar.gz
libvpx-9efe0b25c5cd5de66a6c037acb63466d5b175ac4.tar.bz2
libvpx-9efe0b25c5cd5de66a6c037acb63466d5b175ac4.zip
Remove deprecated function nonrd_use_fixed_partition
This function was subsumed by nonrd_use_partition, hence removed. Change-Id: Id36757bc600ce6cf6ca03ad5df80268c4786d386
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_encodeframe.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index ef223db30..55376eeb3 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2685,41 +2685,6 @@ static void nonrd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
duplicate_modeinfo_in_sb(cm, xd, mi_row, mi_col, bsize);
}
-static void nonrd_use_fixed_partition(VP9_COMP *cpi,
- const TileInfo *const tile,
- TOKENEXTRA **tp,
- int mi_row, int mi_col,
- BLOCK_SIZE bsize,
- int *rate, int64_t *dist) {
- int br, bc;
- int rows = MIN(MI_BLOCK_SIZE, tile->mi_row_end - mi_row);
- int cols = MIN(MI_BLOCK_SIZE, tile->mi_col_end - mi_col);
-
- int bw = num_8x8_blocks_wide_lookup[bsize];
- int bh = num_8x8_blocks_high_lookup[bsize];
-
- int brate = 0;
- int64_t bdist = 0;
- *rate = 0;
- *dist = 0;
-
- // find prediction mode for each 8x8 block
- for (br = 0; br < rows; br += bh) {
- for (bc = 0; bc < cols; bc += bw) {
- int row = mi_row + br;
- int col = mi_col + bc;
-
- BLOCK_SIZE bs = find_partition_size(bsize, rows - br, cols - bc,
- &bh, &bw);
- nonrd_pick_sb_modes(cpi, tile, row, col, &brate, &bdist, bs);
-
- *rate += brate;
- *dist += bdist;
- }
- }
- encode_sb_rt(cpi, tile, tp, mi_row, mi_col, 1, BLOCK_64X64);
-}
-
static void nonrd_use_partition(VP9_COMP *cpi,
const TileInfo *const tile,
MODE_INFO **mi_8x8,