Commit acc0fec3 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review

Merge "remove unused parms from rd_pick_inter_mode_sb_seg_skip"

parents 2af46568 a13bf653
...@@ -784,9 +784,8 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile, ...@@ -784,9 +784,8 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
} else { } else {
if (bsize >= BLOCK_8X8) { if (bsize >= BLOCK_8X8) {
if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP))
vp9_rd_pick_inter_mode_sb_seg_skip(cpi, x, tile, mi_row, mi_col, vp9_rd_pick_inter_mode_sb_seg_skip(cpi, x, totalrate, totaldist, bsize,
totalrate, totaldist, bsize, ctx, ctx, best_rd);
best_rd);
else else
vp9_rd_pick_inter_mode_sb(cpi, x, tile, mi_row, mi_col, vp9_rd_pick_inter_mode_sb(cpi, x, tile, mi_row, mi_col,
totalrate, totaldist, bsize, ctx, best_rd); totalrate, totaldist, bsize, ctx, best_rd);
......
...@@ -3551,8 +3551,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3551,8 +3551,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
} }
int64_t vp9_rd_pick_inter_mode_sb_seg_skip(VP9_COMP *cpi, MACROBLOCK *x, int64_t vp9_rd_pick_inter_mode_sb_seg_skip(VP9_COMP *cpi, MACROBLOCK *x,
const TileInfo *const tile,
int mi_row, int mi_col,
int *returnrate, int *returnrate,
int64_t *returndistortion, int64_t *returndistortion,
BLOCK_SIZE bsize, BLOCK_SIZE bsize,
......
...@@ -157,8 +157,6 @@ int64_t vp9_rd_pick_inter_mode_sb(struct VP9_COMP *cpi, struct macroblock *x, ...@@ -157,8 +157,6 @@ int64_t vp9_rd_pick_inter_mode_sb(struct VP9_COMP *cpi, struct macroblock *x,
int64_t vp9_rd_pick_inter_mode_sb_seg_skip(struct VP9_COMP *cpi, int64_t vp9_rd_pick_inter_mode_sb_seg_skip(struct VP9_COMP *cpi,
struct macroblock *x, struct macroblock *x,
const TileInfo *const tile,
int mi_row, int mi_col,
int *returnrate, int *returnrate,
int64_t *returndistortion, int64_t *returndistortion,
BLOCK_SIZE bsize, BLOCK_SIZE bsize,
......
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