diff options
author | Jingning Han <jingning@google.com> | 2014-02-12 11:52:03 -0800 |
---|---|---|
committer | Jingning Han <jingning@google.com> | 2014-02-12 12:23:29 -0800 |
commit | 2e86d2de85dacc0dd4394aa3a7d427e0e29b6791 (patch) | |
tree | 157940eed86b8467f80bc7bbdb9748bc77efb764 /vp9/encoder | |
parent | 3602c4312d13138599d7b66be4f74922bf6f658e (diff) | |
download | libvpx-2e86d2de85dacc0dd4394aa3a7d427e0e29b6791.tar libvpx-2e86d2de85dacc0dd4394aa3a7d427e0e29b6791.tar.gz libvpx-2e86d2de85dacc0dd4394aa3a7d427e0e29b6791.tar.bz2 libvpx-2e86d2de85dacc0dd4394aa3a7d427e0e29b6791.zip |
Remove unused function in vp9_encodeframe
The function rd_pick_reference_frame can be deprecated. Its use was
subsumed by the adaptive motion search control.
Change-Id: Icb0c2fa335f0f06fa7b79a71f972d9fa54d750db
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index e888b9ad5..edef1356b 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2009,41 +2009,6 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, } } -// Examines 64x64 block and chooses a best reference frame -static void rd_pick_reference_frame(VP9_COMP *cpi, const TileInfo *const tile, - int mi_row, int mi_col) { - VP9_COMMON * const cm = &cpi->common; - MACROBLOCK * const x = &cpi->mb; - int bsl = b_width_log2(BLOCK_64X64), bs = 1 << bsl; - int ms = bs / 2; - ENTROPY_CONTEXT l[16 * MAX_MB_PLANE], a[16 * MAX_MB_PLANE]; - PARTITION_CONTEXT sl[8], sa[8]; - int pl; - int r; - int64_t d; - - save_context(cpi, mi_row, mi_col, a, l, sa, sl, BLOCK_64X64); - - // Default is non mask (all reference frames allowed. - cpi->ref_frame_mask = 0; - - // Do RD search for 64x64. - if ((mi_row + (ms >> 1) < cm->mi_rows) && - (mi_col + (ms >> 1) < cm->mi_cols)) { - cpi->set_ref_frame_mask = 1; - rd_pick_sb_modes(cpi, tile, mi_row, mi_col, &r, &d, BLOCK_64X64, - get_block_context(x, BLOCK_64X64), INT64_MAX); - pl = partition_plane_context(cpi->above_seg_context, cpi->left_seg_context, - mi_row, mi_col, BLOCK_64X64); - r += x->partition_cost[pl][PARTITION_NONE]; - - *(get_sb_partitioning(x, BLOCK_64X64)) = BLOCK_64X64; - cpi->set_ref_frame_mask = 0; - } - - restore_context(cpi, mi_row, mi_col, a, l, sa, sl, BLOCK_64X64); -} - static void encode_sb_row(VP9_COMP *cpi, const TileInfo *const tile, int mi_row, TOKENEXTRA **tp) { VP9_COMMON *const cm = &cpi->common; |