generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp8: simplify a few #if's

Browse Source 
bitstream.c: asserts are disabled when CONFIG_DEBUG is unset
vp8_dx_iface.c: split |s into 2 statements across #if bounds

Change-Id: I307d1e969134db5c9c0edd7690589b6b29116cbd
This commit is contained in:
James Zern 2016-07-19 20:45:28 -07:00
parent 96797e43b4
commit b5164f55a0
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp8/encoder/bitstream.c
View File

@ -568,14 +568,9 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) {
blockmode = cpi->mb.partition_info->bmi[j].mode; blockmode = cpi->mb.partition_info->bmi[j].mode;
blockmv = cpi->mb.partition_info->bmi[j].mv; blockmv = cpi->mb.partition_info->bmi[j].mv;
#if CONFIG_DEBUG
while (j != L[++k]) { while (j != L[++k]) {
if (k >= 16) assert(0); assert(k < 16);
} }
#else
while (j != L[++k])
;
#endif
leftmv.as_int = left_block_mv(m, k); leftmv.as_int = left_block_mv(m, k);
abovemv.as_int = above_block_mv(m, k, mis); abovemv.as_int = above_block_mv(m, k, mis);
mv_contz = vp8_mv_cont(&leftmv, &abovemv); mv_contz = vp8_mv_cont(&leftmv, &abovemv);

12
vp8/vp8_dx_iface.c
View File

@ -473,17 +473,15 @@ static vpx_image_t *vp8_get_frame(vpx_codec_alg_priv_t *ctx,
vp8_zero(flags); vp8_zero(flags);
if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC) { if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC) {
flags.post_proc_flag = flags.post_proc_flag = ctx->postproc_cfg.post_proc_flag;
ctx->postproc_cfg.post_proc_flag
#if CONFIG_POSTPROC_VISUALIZER #if CONFIG_POSTPROC_VISUALIZER
flags.post_proc_flag |=
| ((ctx->dbg_color_ref_frame_flag != 0) ? VP8D_DEBUG_CLR_FRM_REF_BLKS ((ctx->dbg_color_ref_frame_flag != 0) ? VP8D_DEBUG_CLR_FRM_REF_BLKS
: 0) | : 0) |
((ctx->dbg_color_mb_modes_flag != 0) ? VP8D_DEBUG_CLR_BLK_MODES : 0) | ((ctx->dbg_color_mb_modes_flag != 0) ? VP8D_DEBUG_CLR_BLK_MODES : 0) |
((ctx->dbg_color_b_modes_flag != 0) ? VP8D_DEBUG_CLR_BLK_MODES : 0) | ((ctx->dbg_color_b_modes_flag != 0) ? VP8D_DEBUG_CLR_BLK_MODES : 0) |
((ctx->dbg_display_mv_flag != 0) ? VP8D_DEBUG_DRAW_MV : 0) ((ctx->dbg_display_mv_flag != 0) ? VP8D_DEBUG_DRAW_MV : 0);
#endif #endif
;
flags.deblocking_level = ctx->postproc_cfg.deblocking_level; flags.deblocking_level = ctx->postproc_cfg.deblocking_level;
flags.noise_level = ctx->postproc_cfg.noise_level; flags.noise_level = ctx->postproc_cfg.noise_level;
#if CONFIG_POSTPROC_VISUALIZER #if CONFIG_POSTPROC_VISUALIZER