From 4fb1221e66dba5556cecf980b220792457cf7a83 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 3 Nov 2013 01:07:07 +0100 Subject: [PATCH] h264: reduce whitespace differences to libav Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 15 ++++++++------- libavcodec/h264_cabac.c | 11 +++++------ libavcodec/h264_cavlc.c | 24 ++++++++++++------------ libavcodec/h264_mb_template.c | 4 ++-- libavcodec/h264_mvpred.h | 2 +- libavcodec/h264dsp.c | 1 + libavcodec/vda_h264.c | 10 +++++----- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 35b8c8c093..d0d32d3717 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2159,7 +2159,7 @@ static void decode_postinit(H264Context *h, int setup_finished) if (cur->reference == 0) cur->reference = DELAYED_PIC_REF; - out = h->delayed_pic[0]; + out = h->delayed_pic[0]; out_idx = 0; for (i = 1; h->delayed_pic[i] && !h->delayed_pic[i]->f.key_frame && @@ -2983,8 +2983,7 @@ static int field_end(H264Context *h, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (CONFIG_ERROR_RESILIENCE && - !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { + if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { h->er.cur_pic = h->cur_pic_ptr; ff_er_frame_end(&h->er); } @@ -3302,8 +3301,8 @@ static int h264_slice_header_init(H264Context *h, int reinit) c->height = h->height; c->linesize = h->linesize; c->uvlinesize = h->uvlinesize; - c->chroma_x_shift = h->chroma_x_shift; - c->chroma_y_shift = h->chroma_y_shift; + c->chroma_x_shift = h->chroma_x_shift; + c->chroma_y_shift = h->chroma_y_shift; c->qscale = h->qscale; c->droppable = h->droppable; c->data_partitioning = h->data_partitioning; @@ -4758,7 +4757,9 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, decode_rbsp_trailing(h, ptr + dst_length - 1)); if (h->avctx->debug & FF_DEBUG_STARTCODE) - av_log(h->avctx, AV_LOG_DEBUG, "NAL %d/%d at %d/%d length %d pass %d\n", hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass); + av_log(h->avctx, AV_LOG_DEBUG, + "NAL %d/%d at %d/%d length %d pass %d\n", + hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass); if (h->is_avc && (nalsize != consumed) && nalsize) av_log(h->avctx, AV_LOG_DEBUG, @@ -4860,7 +4861,7 @@ again: } h->cur_pic_ptr->f.key_frame |= - (hx->nal_unit_type == NAL_IDR_SLICE); + (hx->nal_unit_type == NAL_IDR_SLICE); if (hx->nal_unit_type == NAL_IDR_SLICE || h->recovery_frame == h->frame_num) { diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 7b1ee05e3d..c0ca154bf7 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1684,7 +1684,6 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, } } - #define STORE_BLOCK(type) \ do { \ uint8_t *ctx = coeff_abs_level1_ctx[node_ctx] + abs_level_m1_ctx_base; \ @@ -1728,11 +1727,11 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, } \ } while ( coeff_count ); - if (h->pixel_shift) { - STORE_BLOCK(int32_t) - } else { - STORE_BLOCK(int16_t) - } + if (h->pixel_shift) { + STORE_BLOCK(int32_t) + } else { + STORE_BLOCK(int16_t) + } #ifdef CABAC_ON_STACK h->cabac.range = cc.range ; h->cabac.low = cc.low ; diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 8facf5571f..68e2b8c0d6 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -866,7 +866,7 @@ decode_intra_mb: } for(list=0; listlist_count; list++){ - int ref_count= IS_REF0(mb_type) ? 1 : local_ref_count[list]; + int ref_count = IS_REF0(mb_type) ? 1 : local_ref_count[list]; for(i=0; i<4; i++){ if(IS_DIRECT(h->sub_mb_type[i])) continue; if(IS_DIR(h->sub_mb_type[i], 0, list)){ @@ -948,11 +948,11 @@ decode_intra_mb: if(IS_DIR(mb_type, 0, list)){ if(local_ref_count[list]==1){ val= 0; - }else if(local_ref_count[list]==2){ + } else if(local_ref_count[list]==2){ val= get_bits1(&h->gb)^1; }else{ val= get_ue_golomb_31(&h->gb); - if(val >= local_ref_count[list]){ + if (val >= local_ref_count[list]){ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val); return -1; } @@ -976,13 +976,13 @@ decode_intra_mb: for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ - if(local_ref_count[list] == 1){ + if(local_ref_count[list] == 1) { val= 0; - }else if(local_ref_count[list] == 2){ + } else if(local_ref_count[list] == 2) { val= get_bits1(&h->gb)^1; }else{ val= get_ue_golomb_31(&h->gb); - if(val >= local_ref_count[list]){ + if (val >= local_ref_count[list]){ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val); return -1; } @@ -1015,11 +1015,11 @@ decode_intra_mb: if(IS_DIR(mb_type, i, list)){ //FIXME optimize if(local_ref_count[list]==1){ val= 0; - }else if(local_ref_count[list]==2){ + } else if(local_ref_count[list]==2){ val= get_bits1(&h->gb)^1; }else{ val= get_ue_golomb_31(&h->gb); - if(val >= local_ref_count[list]){ + if (val >= local_ref_count[list]){ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val); return -1; } @@ -1142,12 +1142,12 @@ decode_intra_mb: for(chroma_idx=0; chroma_idx<2; chroma_idx++){ const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[chroma_idx]]; int16_t *mb = h->mb + (16*(16 + 16*chroma_idx) << pixel_shift); - for (i8x8=0; i8x8flags & CODEC_FLAG_GRAY)) { if (!h->sps.chroma_format_idc) { for (i = 0; i < 8; i++) { - memset(dest_cb + i*uvlinesize, 1 << (bit_depth - 1), 8); - memset(dest_cr + i*uvlinesize, 1 << (bit_depth - 1), 8); + memset(dest_cb + i * uvlinesize, 1 << (bit_depth - 1), 8); + memset(dest_cr + i * uvlinesize, 1 << (bit_depth - 1), 8); } } else { const uint8_t *src_cb = h->intra_pcm_ptr + 256; diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 7015d8cdcf..afe327c57f 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -663,7 +663,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) ref_cache[4 - 1 * 8] = topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; } - if(ref_cache[2 - 1*8] < 0 || ref_cache[4 - 1*8] < 0){ + if(ref_cache[2 - 1*8] < 0 || ref_cache[4 - 1 * 8] < 0) { if (USES_LIST(topleft_type, list)) { const int b_xy = h->mb2b_xy[topleft_xy] + 3 + b_stride + (h->topleft_partition & 2 * b_stride); diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index 72f699f84d..1606e116b6 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -26,6 +26,7 @@ */ #include + #include "libavutil/attributes.h" #include "libavutil/avassert.h" diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index c01a21a533..e0561e2914 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -33,11 +33,11 @@ struct vda_buffer { }; /* Decoder callback that adds the vda frame to the queue in display order. */ -static void vda_decoder_callback (void *vda_hw_ctx, - CFDictionaryRef user_info, - OSStatus status, - uint32_t infoFlags, - CVImageBufferRef image_buffer) +static void vda_decoder_callback(void *vda_hw_ctx, + CFDictionaryRef user_info, + OSStatus status, + uint32_t infoFlags, + CVImageBufferRef image_buffer) { struct vda_context *vda_ctx = vda_hw_ctx;