diff options
author | John Koleszar <jkoleszar@google.com> | 2011-12-21 16:11:31 -0800 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-12-22 10:09:46 -0800 |
commit | 0c2b2c79aed688daf5f4cc1745493b0e4172e57b (patch) | |
tree | 1684a597a928153134e34100552fb1621bf79bd1 /vp8/encoder | |
parent | f56918ba9c8c964a7532ddac925fc5af8d330355 (diff) | |
download | libvpx-0c2b2c79aed688daf5f4cc1745493b0e4172e57b.tar libvpx-0c2b2c79aed688daf5f4cc1745493b0e4172e57b.tar.gz libvpx-0c2b2c79aed688daf5f4cc1745493b0e4172e57b.tar.bz2 libvpx-0c2b2c79aed688daf5f4cc1745493b0e4172e57b.zip |
Remove unnecessary ternary constructs
The code had a number of constructs like (condition)?1:0,
which is redundant with C's semantics. In the cases where a boolean
operator was used in the condition, simply remove the ternary part.
Otherwise adjust the surrounding expression to remove the condition
(eg, for rounding up. See pickinter.c and rdopt.c)
Change-Id: Icb2372defa3783cf31857d90b2630d06b2c7e1be
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/bitstream.c | 10 | ||||
-rw-r--r-- | vp8/encoder/onyx_if.c | 8 | ||||
-rw-r--r-- | vp8/encoder/pickinter.c | 8 | ||||
-rw-r--r-- | vp8/encoder/picklpf.c | 8 | ||||
-rw-r--r-- | vp8/encoder/rdopt.c | 10 | ||||
-rw-r--r-- | vp8/encoder/temporal_filter.c | 2 |
6 files changed, 22 insertions, 24 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 2a5502f88..fa6c28581 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1644,20 +1644,20 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest // Signal whether or not Segmentation is enabled - vp8_write_bit(bc, (xd->segmentation_enabled) ? 1 : 0); + vp8_write_bit(bc, xd->segmentation_enabled); // Indicate which features are enabled if (xd->segmentation_enabled) { // Signal whether or not the segmentation map is being updated. - vp8_write_bit(bc, (xd->update_mb_segmentation_map) ? 1 : 0); - vp8_write_bit(bc, (xd->update_mb_segmentation_data) ? 1 : 0); + vp8_write_bit(bc, xd->update_mb_segmentation_map); + vp8_write_bit(bc, xd->update_mb_segmentation_data); if (xd->update_mb_segmentation_data) { signed char Data; - vp8_write_bit(bc, (xd->mb_segement_abs_delta) ? 1 : 0); + vp8_write_bit(bc, xd->mb_segement_abs_delta); // For each segmentation feature (Quant and loop filter level) for (i = 0; i < MB_LVL_MAX; i++) @@ -1714,7 +1714,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest vp8_write_literal(bc, pc->sharpness_level, 3); // Write out loop filter deltas applied at the MB level based on mode or ref frame (if they are enabled). - vp8_write_bit(bc, (xd->mode_ref_lf_delta_enabled) ? 1 : 0); + vp8_write_bit(bc, xd->mode_ref_lf_delta_enabled); if (xd->mode_ref_lf_delta_enabled) { diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 4faaf2bd9..62f362f5a 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1775,7 +1775,7 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) cpi->active_best_quality = cpi->oxcf.worst_allowed_q; } - cpi->buffered_mode = (cpi->oxcf.optimal_buffer_level > 0) ? 1 : 0; + cpi->buffered_mode = cpi->oxcf.optimal_buffer_level > 0; cpi->cq_target_quality = cpi->oxcf.cq_level; @@ -4035,7 +4035,7 @@ static void encode_frame_to_data_rate else if (Q < q_low) Q = q_low; - Loop = ((Q != last_q)) ? 1 : 0; + Loop = Q != last_q; } // Is the projected frame size out of range and are we allowed to attempt to recode. @@ -4154,8 +4154,8 @@ static void encode_frame_to_data_rate // Clamp cpi->zbin_over_quant cpi->zbin_over_quant = (cpi->zbin_over_quant < zbin_oq_low) ? zbin_oq_low : (cpi->zbin_over_quant > zbin_oq_high) ? zbin_oq_high : cpi->zbin_over_quant; - //Loop = ((Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant)) ? 1 : 0; - Loop = ((Q != last_q)) ? 1 : 0; + //Loop = (Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant); + Loop = Q != last_q; last_zbin_oq = cpi->zbin_over_quant; } else diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 2f58a4cef..31101d12f 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -760,10 +760,8 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int sadpb = x->sadperbit16; int_mv mvp_full; - int col_min = (best_ref_mv.as_mv.col>>3) - - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.col & 7)?1:0); - int row_min = (best_ref_mv.as_mv.row>>3) - - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.row & 7)?1:0); + int col_min = ((best_ref_mv.as_mv.col+7)>>3) - MAX_FULL_PEL_VAL; + int row_min = ((best_ref_mv.as_mv.row+7)>>3) - MAX_FULL_PEL_VAL; int col_max = (best_ref_mv.as_mv.col>>3) + MAX_FULL_PEL_VAL; int row_max = (best_ref_mv.as_mv.row>>3) @@ -1067,7 +1065,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, x->e_mbd.mode_info_context->mbmi.mv.as_int = 0; x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED; x->e_mbd.mode_info_context->mbmi.mb_skip_coeff = - (cpi->common.mb_no_coeff_skip) ? 1 : 0; + (cpi->common.mb_no_coeff_skip); x->e_mbd.mode_info_context->mbmi.partitioning = 0; return; diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 530e27b6a..2449ae540 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -186,7 +186,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) best_err = calc_partial_ssl_err(sd, cm->frame_to_show, IF_RTCD(&cpi->rtcd.variance)); - filt_val -= (1 + ((filt_val > 10) ? 1 : 0)); + filt_val -= 1 + (filt_val > 10); // Search lower filter levels while (filt_val >= min_filter_level) @@ -209,11 +209,11 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) break; // Adjust filter level - filt_val -= (1 + ((filt_val > 10) ? 1 : 0)); + filt_val -= 1 + (filt_val > 10); } // Search up (note that we have already done filt_val = cm->filter_level) - filt_val = cm->filter_level + (1 + ((filt_val > 10) ? 1 : 0)); + filt_val = cm->filter_level + 1 + (filt_val > 10); if (best_filt_val == cm->filter_level) { @@ -243,7 +243,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) break; // Adjust filter level - filt_val += (1 + ((filt_val > 10) ? 1 : 0)); + filt_val += 1 + (filt_val > 10); } } diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 9b9003495..638fa0c1d 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1385,8 +1385,8 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x, if (bsi.segment_rd < best_rd) { - int col_min = (best_ref_mv->as_mv.col>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv->as_mv.col & 7)?1:0); - int row_min = (best_ref_mv->as_mv.row>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv->as_mv.row & 7)?1:0); + int col_min = ((best_ref_mv->as_mv.col+7)>>3) - MAX_FULL_PEL_VAL; + int row_min = ((best_ref_mv->as_mv.row+7)>>3) - MAX_FULL_PEL_VAL; int col_max = (best_ref_mv->as_mv.col>>3) + MAX_FULL_PEL_VAL; int row_max = (best_ref_mv->as_mv.row>>3) + MAX_FULL_PEL_VAL; @@ -2016,8 +2016,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int sadpb = x->sadperbit16; int_mv mvp_full; - int col_min = (best_ref_mv.as_mv.col>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.col & 7)?1:0); - int row_min = (best_ref_mv.as_mv.row>>3) - MAX_FULL_PEL_VAL + ((best_ref_mv.as_mv.row & 7)?1:0); + int col_min = ((best_ref_mv.as_mv.col+7)>>3) - MAX_FULL_PEL_VAL; + int row_min = ((best_ref_mv.as_mv.row+7)>>3) - MAX_FULL_PEL_VAL; int col_max = (best_ref_mv.as_mv.col>>3) + MAX_FULL_PEL_VAL; int row_max = (best_ref_mv.as_mv.row>>3) + MAX_FULL_PEL_VAL; @@ -2386,7 +2386,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, x->e_mbd.mode_info_context->mbmi.mv.as_int = 0; x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED; x->e_mbd.mode_info_context->mbmi.mb_skip_coeff = - (cpi->common.mb_no_coeff_skip) ? 1 : 0; + (cpi->common.mb_no_coeff_skip); x->e_mbd.mode_info_context->mbmi.partitioning = 0; return; diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index b9ade1c6c..7162cc49a 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -186,7 +186,7 @@ static int vp8_temporal_filter_find_matching_mb_c if (cpi->Speed < 8) { step_param = cpi->sf.first_step + - ((cpi->Speed > 5) ? 1 : 0); + (cpi->Speed > 5); further_steps = (cpi->sf.max_step_search_steps - 1)-step_param; } |