From adb8a160f98eae5b4955bb80d78352c27086ee2e Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 29 Oct 2012 21:07:40 -0700 Subject: [PATCH] tokenize: make local symbols static; give exported symbols a vp9_ prefix. Change-Id: I23aa5547b1e74f31327258dda0e330aae7ca1d35 --- vp8/encoder/rdopt.c | 26 +++++++++++++------------- vp8/encoder/tokenize.c | 35 ++++++++++++++++------------------- vp8/encoder/tokenize.h | 14 +++++--------- 3 files changed, 34 insertions(+), 41 deletions(-) diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 183f63a..c6fadcf 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -738,7 +738,7 @@ static void macro_block_yrd_4x4(MACROBLOCK *mb, *Distortion = (d >> 2); // rate *Rate = vp8_rdcost_mby(mb); - *skippable = mby_is_skippable_4x4(&mb->e_mbd, 1); + *skippable = vp9_mby_is_skippable_4x4(&mb->e_mbd, 1); } static int vp8_rdcost_mby_8x8(MACROBLOCK *mb, int backup) { @@ -802,7 +802,7 @@ static void macro_block_yrd_8x8(MACROBLOCK *mb, *Distortion = (d >> 2); // rate *Rate = vp8_rdcost_mby_8x8(mb, 1); - *skippable = mby_is_skippable_8x8(&mb->e_mbd, 1); + *skippable = vp9_mby_is_skippable_8x8(&mb->e_mbd, 1); } static int vp8_rdcost_mby_16x16(MACROBLOCK *mb) { @@ -850,7 +850,7 @@ static void macro_block_yrd_16x16(MACROBLOCK *mb, int *Rate, int *Distortion, *Distortion = (d >> 2); // rate *Rate = vp8_rdcost_mby_16x16(mb); - *skippable = mby_is_skippable_16x16(&mb->e_mbd); + *skippable = vp9_mby_is_skippable_16x16(&mb->e_mbd); } static void macro_block_yrd(VP8_COMP *cpi, MACROBLOCK *x, int *rate, @@ -1024,7 +1024,7 @@ static void super_block_yrd_8x8(MACROBLOCK *x, xd->above_context = ta + x_idx; xd->left_context = tl + y_idx; r += vp8_rdcost_mby_8x8(x, 0); - skippable = skippable && mby_is_skippable_8x8(xd, 1); + skippable = skippable && vp9_mby_is_skippable_8x8(xd, 1); } *distortion = (d >> 2); @@ -1618,7 +1618,7 @@ static int64_t rd_inter16x16_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate, *rate = rd_cost_mbuv(x); *distortion = vp8_mbuverror(x) / 4; - *skip = mbuv_is_skippable_4x4(&x->e_mbd); + *skip = vp9_mbuv_is_skippable_4x4(&x->e_mbd); return RDCOST(x->rdmult, x->rddiv, *rate, *distortion); } @@ -1683,7 +1683,7 @@ static int64_t rd_inter32x32_uv_8x8(VP8_COMP *cpi, MACROBLOCK *x, int *rate, xd->left_context = tl + y_idx; r += rd_cost_mbuv_8x8(x, 0); d += vp8_mbuverror(x) / 4; - skippable = skippable && mbuv_is_skippable_8x8(xd); + skippable = skippable && vp9_mbuv_is_skippable_8x8(xd); } *rate = r; @@ -1708,7 +1708,7 @@ static int64_t rd_inter16x16_uv_8x8(VP8_COMP *cpi, MACROBLOCK *x, int *rate, *rate = rd_cost_mbuv_8x8(x, 1); *distortion = vp8_mbuverror(x) / 4; - *skip = mbuv_is_skippable_8x8(&x->e_mbd); + *skip = vp9_mbuv_is_skippable_8x8(&x->e_mbd); return RDCOST(x->rdmult, x->rddiv, *rate, *distortion); } @@ -1725,7 +1725,7 @@ static int64_t rd_inter4x4_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate, *rate = rd_cost_mbuv(x); *distortion = vp8_mbuverror(x) / 4; - *skippable = mbuv_is_skippable_4x4(&x->e_mbd); + *skippable = vp9_mbuv_is_skippable_4x4(&x->e_mbd); return RDCOST(x->rdmult, x->rddiv, *rate, *distortion); } @@ -1783,7 +1783,7 @@ static void rd_pick_intra_mbuv_mode(VP8_COMP *cpi, this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion); if (this_rd < best_rd) { - skip = mbuv_is_skippable_4x4(xd); + skip = vp9_mbuv_is_skippable_4x4(xd); best_rd = this_rd; d = distortion; r = rate; @@ -1840,7 +1840,7 @@ static void rd_pick_intra_mbuv_mode_8x8(VP8_COMP *cpi, this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion); if (this_rd < best_rd) { - skip = mbuv_is_skippable_8x8(xd); + skip = vp9_mbuv_is_skippable_8x8(xd); best_rd = this_rd; d = distortion; r = rate; @@ -1884,7 +1884,7 @@ static void super_block_uvrd_8x8(MACROBLOCK *x, dst_uv_stride); vp8_transform_mbuv_8x8(x); vp8_quantize_mbuv_8x8(x); - s &= mbuv_is_skippable_8x8(xd); + s &= vp9_mbuv_is_skippable_8x8(xd); d += vp8_mbuverror(x) >> 2; xd->above_context = ta + x_idx; @@ -2745,8 +2745,8 @@ static int rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x, *returndistortion = bsi.d; *returnyrate = bsi.segment_yrate; *skippable = bsi.txfm_size == TX_4X4 ? - mby_is_skippable_4x4(&x->e_mbd, 0) : - mby_is_skippable_8x8(&x->e_mbd, 0); + vp9_mby_is_skippable_4x4(&x->e_mbd, 0) : + vp9_mby_is_skippable_8x8(&x->e_mbd, 0); /* save partitions */ mbmi->txfm_size = bsi.txfm_size; diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index 99f6b1f..63c11b3 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -218,7 +218,7 @@ static void tokenize_b(VP8_COMP *cpi, *a = *l = (c != !type); /* 0 <-> all coeff data is zero */ } -int mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) { +int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) { int skip = 1; int i = 0; @@ -233,7 +233,7 @@ int mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) { return skip; } -int mbuv_is_skippable_4x4(MACROBLOCKD *xd) { +int vp9_mbuv_is_skippable_4x4(MACROBLOCKD *xd) { int skip = 1; int i; @@ -242,12 +242,12 @@ int mbuv_is_skippable_4x4(MACROBLOCKD *xd) { return skip; } -int mb_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) { - return (mby_is_skippable_4x4(xd, has_y2_block) & - mbuv_is_skippable_4x4(xd)); +static int mb_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) { + return (vp9_mby_is_skippable_4x4(xd, has_y2_block) & + vp9_mbuv_is_skippable_4x4(xd)); } -int mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block) { +int vp9_mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block) { int skip = 1; int i = 0; @@ -262,31 +262,28 @@ int mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block) { return skip; } -int mbuv_is_skippable_8x8(MACROBLOCKD *xd) { +int vp9_mbuv_is_skippable_8x8(MACROBLOCKD *xd) { return (!xd->block[16].eob) & (!xd->block[20].eob); } -int mb_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block) { - return (mby_is_skippable_8x8(xd, has_y2_block) & - mbuv_is_skippable_8x8(xd)); +static int mb_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block) { + return (vp9_mby_is_skippable_8x8(xd, has_y2_block) & + vp9_mbuv_is_skippable_8x8(xd)); } -int mb_is_skippable_8x8_4x4uv(MACROBLOCKD *xd, int has_y2_block) { - return (mby_is_skippable_8x8(xd, has_y2_block) & - mbuv_is_skippable_4x4(xd)); +static int mb_is_skippable_8x8_4x4uv(MACROBLOCKD *xd, int has_y2_block) { + return (vp9_mby_is_skippable_8x8(xd, has_y2_block) & + vp9_mbuv_is_skippable_4x4(xd)); } -int mby_is_skippable_16x16(MACROBLOCKD *xd) { +int vp9_mby_is_skippable_16x16(MACROBLOCKD *xd) { int skip = 1; - //skip &= (xd->block[0].eob < 2); // I think this should be commented? No second order == DC must be coded - //skip &= (xd->block[0].eob < 1); - //skip &= (!xd->block[24].eob); skip &= !xd->block[0].eob; return skip; } -int mb_is_skippable_16x16(MACROBLOCKD *xd) { - return (mby_is_skippable_16x16(xd) & mbuv_is_skippable_8x8(xd)); +static int mb_is_skippable_16x16(MACROBLOCKD *xd) { + return (vp9_mby_is_skippable_16x16(xd) & vp9_mbuv_is_skippable_8x8(xd)); } void vp8_tokenize_mb(VP8_COMP *cpi, diff --git a/vp8/encoder/tokenize.h b/vp8/encoder/tokenize.h index 87cb44b..46e94fb 100644 --- a/vp8/encoder/tokenize.h +++ b/vp8/encoder/tokenize.h @@ -31,15 +31,11 @@ typedef struct { int rd_cost_mby(MACROBLOCKD *); -extern int mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block); -extern int mbuv_is_skippable_4x4(MACROBLOCKD *xd); -extern int mb_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block); -extern int mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block); -extern int mbuv_is_skippable_8x8(MACROBLOCKD *xd); -extern int mb_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block); -extern int mb_is_skippable_8x8_4x4uv(MACROBLOCKD *xd, int has_y2_block); -extern int mb_is_skippable_16x16(MACROBLOCKD *xd); -extern int mby_is_skippable_16x16(MACROBLOCKD *xd); +extern int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block); +extern int vp9_mbuv_is_skippable_4x4(MACROBLOCKD *xd); +extern int vp9_mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block); +extern int vp9_mbuv_is_skippable_8x8(MACROBLOCKD *xd); +extern int vp9_mby_is_skippable_16x16(MACROBLOCKD *xd); #ifdef ENTROPY_STATS void init_context_counters(); -- 2.7.4