diff options
author | James Zern <jzern@google.com> | 2011-07-25 18:44:59 -0700 |
---|---|---|
committer | James Zern <jzern@google.com> | 2011-07-26 11:34:36 -0700 |
commit | b45065d38b5ccbf6a34b697edf5021fe00171f24 (patch) | |
tree | 7e6e760c7a1dd00fa36102d3d615d3d26b294fdc /vp8/encoder/encodeframe.c | |
parent | 5b0de48dddf5eb6631ac2f18b654fcd3226ba971 (diff) | |
download | libvpx-b45065d38b5ccbf6a34b697edf5021fe00171f24.tar libvpx-b45065d38b5ccbf6a34b697edf5021fe00171f24.tar.gz libvpx-b45065d38b5ccbf6a34b697edf5021fe00171f24.tar.bz2 libvpx-b45065d38b5ccbf6a34b697edf5021fe00171f24.zip |
cosmetics: consistently use [u]int64_t
Removes mixed usage of (unsigned) long long and INT64.
Fixes Issue #208.
Change-Id: I220d3ed5ce4bb1280cd38bb3715f208ce23cf83a
Diffstat (limited to 'vp8/encoder/encodeframe.c')
-rw-r--r-- | vp8/encoder/encodeframe.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 0efb9f646..5d4e7e71e 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -140,7 +140,7 @@ static unsigned int mb_activity_measure( VP8_COMP *cpi, MACROBLOCK *x, // Calculate an "average" mb activity value for the frame #define ACT_MEDIAN 0 -static void calc_av_activity( VP8_COMP *cpi, INT64 activity_sum ) +static void calc_av_activity( VP8_COMP *cpi, int64_t activity_sum ) { #if ACT_MEDIAN // Find median: Simple n^2 algorithm for experimentation @@ -208,9 +208,9 @@ static void calc_activity_index( VP8_COMP *cpi, MACROBLOCK *x ) VP8_COMMON *const cm = & cpi->common; int mb_row, mb_col; - INT64 act; - INT64 a; - INT64 b; + int64_t act; + int64_t a; + int64_t b; #if OUTPUT_NORM_ACT_STATS FILE *f = fopen("norm_act.stt", "a"); @@ -274,7 +274,7 @@ static void build_activity_map( VP8_COMP *cpi ) int mb_row, mb_col; unsigned int mb_activity; - INT64 activity_sum = 0; + int64_t activity_sum = 0; // for each macroblock row in image for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) @@ -341,15 +341,15 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) x->errorperbit = x->rdmult * 100 /(110 * x->rddiv); x->errorperbit += (x->errorperbit==0); #else - INT64 a; - INT64 b; - INT64 act = *(x->mb_activity_ptr); + int64_t a; + int64_t b; + int64_t act = *(x->mb_activity_ptr); // Apply the masking to the RD multiplier. a = act + (2*cpi->activity_avg); b = (2*act) + cpi->activity_avg; - x->rdmult = (unsigned int)(((INT64)x->rdmult*b + (a>>1))/a); + x->rdmult = (unsigned int)(((int64_t)x->rdmult*b + (a>>1))/a); x->errorperbit = x->rdmult * 100 /(110 * x->rddiv); x->errorperbit += (x->errorperbit==0); #endif @@ -1102,18 +1102,18 @@ static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ) #if USE_ACT_INDEX x->act_zbin_adj = *(x->mb_activity_ptr); #else - INT64 a; - INT64 b; - INT64 act = *(x->mb_activity_ptr); + int64_t a; + int64_t b; + int64_t act = *(x->mb_activity_ptr); // Apply the masking to the RD multiplier. a = act + 4*cpi->activity_avg; b = 4*act + cpi->activity_avg; if ( act > cpi->activity_avg ) - x->act_zbin_adj = (int)(((INT64)b + (a>>1))/a) - 1; + x->act_zbin_adj = (int)(((int64_t)b + (a>>1))/a) - 1; else - x->act_zbin_adj = 1 - (int)(((INT64)a + (b>>1))/b); + x->act_zbin_adj = 1 - (int)(((int64_t)a + (b>>1))/b); #endif } |