diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-29 21:07:40 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-29 21:07:40 -0700 |
| commit | adb8a160f98eae5b4955bb80d78352c27086ee2e (patch) | |
| tree | 150c701d759424c2dd5ff3ef73b639ba4e7eb29e /vp8/encoder/tokenize.c | |
| parent | 1e596da848489e9d33d19770d5c6cf8c5b1619da (diff) | |
| download | libvpx-adb8a160f98eae5b4955bb80d78352c27086ee2e.tar libvpx-adb8a160f98eae5b4955bb80d78352c27086ee2e.tar.gz libvpx-adb8a160f98eae5b4955bb80d78352c27086ee2e.tar.bz2 libvpx-adb8a160f98eae5b4955bb80d78352c27086ee2e.zip | |
tokenize: make local symbols static; give exported symbols a vp9_ prefix.
Change-Id: I23aa5547b1e74f31327258dda0e330aae7ca1d35
Diffstat (limited to 'vp8/encoder/tokenize.c')
| -rw-r--r-- | vp8/encoder/tokenize.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index 99f6b1fb1..63c11b307 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, |