diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-08-05 12:15:52 -0700 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2013-08-05 12:15:52 -0700 |
| commit | 5d2cb7ead0696078f9a69d89884a90f66fac6540 (patch) | |
| tree | 020a7759db4fd30f30c241ea4753e7382560d79f /vp9/encoder/vp9_encodeframe.c | |
| parent | d91e9f4e369020d301804f39acc400eece894590 (diff) | |
| download | libvpx-5d2cb7ead0696078f9a69d89884a90f66fac6540.tar libvpx-5d2cb7ead0696078f9a69d89884a90f66fac6540.tar.gz libvpx-5d2cb7ead0696078f9a69d89884a90f66fac6540.tar.bz2 libvpx-5d2cb7ead0696078f9a69d89884a90f66fac6540.zip | |
cleanups after bw bh code
Cons bw/bh parms that should have been const. Additional formatting.
Change-Id: Icd36a5c9dc17dadd7284315ac0d6fef1a565ca16
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1b63dea2d..c8b81a3ae 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -340,8 +340,8 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, int mb_mode_index = ctx->best_mode_index; const int mis = cpi->common.mode_info_stride; - const int mi_height = num_8x8_blocks_high_lookup[bsize]; const int mi_width = num_8x8_blocks_wide_lookup[bsize]; + const int mi_height = num_8x8_blocks_high_lookup[bsize]; assert(mi->mbmi.mode < MB_MODE_COUNT); assert(mb_mode_index < MAX_MODES); @@ -694,12 +694,12 @@ static void restore_context(VP9_COMP *cpi, int mi_row, int mi_col, ENTROPY_CONTEXT l[16 * MAX_MB_PLANE], PARTITION_CONTEXT sa[8], PARTITION_CONTEXT sl[8], BLOCK_SIZE_TYPE bsize) { - VP9_COMMON * const cm = &cpi->common; - MACROBLOCK * const x = &cpi->mb; - MACROBLOCKD * const xd = &x->e_mbd; + VP9_COMMON *const cm = &cpi->common; + MACROBLOCK *const x = &cpi->mb; + MACROBLOCKD *const xd = &x->e_mbd; int p; - int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; - int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; + const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; + const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; int mi_width = num_8x8_blocks_wide_lookup[bsize]; int mi_height = num_8x8_blocks_high_lookup[bsize]; for (p = 0; p < MAX_MB_PLANE; p++) { @@ -725,12 +725,12 @@ static void save_context(VP9_COMP *cpi, int mi_row, int mi_col, ENTROPY_CONTEXT l[16 * MAX_MB_PLANE], PARTITION_CONTEXT sa[8], PARTITION_CONTEXT sl[8], BLOCK_SIZE_TYPE bsize) { - VP9_COMMON * const cm = &cpi->common; - MACROBLOCK * const x = &cpi->mb; - MACROBLOCKD * const xd = &x->e_mbd; + const VP9_COMMON *const cm = &cpi->common; + const MACROBLOCK *const x = &cpi->mb; + const MACROBLOCKD *const xd = &x->e_mbd; int p; - int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; - int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; + const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; + const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; int mi_width = num_8x8_blocks_wide_lookup[bsize]; int mi_height = num_8x8_blocks_high_lookup[bsize]; @@ -1193,8 +1193,8 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp, MACROBLOCKD *xd = &cpi->mb.e_mbd; const int mis = cm->mode_info_stride; int bsl = b_width_log2(bsize); - int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; - int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; + const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize]; + const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; int ms = num_4x4_blocks_wide / 2; int mh = num_4x4_blocks_high / 2; int bss = (1 << bsl) / 4; |