From eda7571ea1a41c835e3a02fa9517e5bc67d7adce Mon Sep 17 00:00:00 2001 From: Gabriel Dume Date: Tue, 2 Sep 2014 15:28:51 -0400 Subject: wmv2: K&R formatting cosmetics Signed-off-by: Diego Biurrun --- libavcodec/wmv2.c | 131 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 63 deletions(-) (limited to 'libavcodec/wmv2.c') diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 7b1ea57c05..555d30e627 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -26,8 +26,9 @@ #include "wmv2.h" -av_cold void ff_wmv2_common_init(Wmv2Context * w){ - MpegEncContext * const s= &w->s; +av_cold void ff_wmv2_common_init(Wmv2Context *w) +{ + MpegEncContext *const s = &w->s; ff_blockdsp_init(&s->bdsp, s->avctx); ff_wmv2dsp_init(&w->wdsp); @@ -51,84 +52,87 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){ s->idsp.idct = NULL; } -static void wmv2_add_block(Wmv2Context *w, int16_t *block1, uint8_t *dst, int stride, int n){ - MpegEncContext * const s= &w->s; - - if (s->block_last_index[n] >= 0) { - switch(w->abt_type_table[n]){ - case 0: - w->wdsp.idct_add(dst, stride, block1); - break; - case 1: - ff_simple_idct84_add(dst , stride, block1); - ff_simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]); - s->bdsp.clear_block(w->abt_block2[n]); - break; - case 2: - ff_simple_idct48_add(dst , stride, block1); - ff_simple_idct48_add(dst + 4 , stride, w->abt_block2[n]); - s->bdsp.clear_block(w->abt_block2[n]); - break; - default: - av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n"); +static void wmv2_add_block(Wmv2Context *w, int16_t *block1, + uint8_t *dst, int stride, int n) +{ + MpegEncContext *const s = &w->s; + + if (s->block_last_index[n] >= 0) { + switch (w->abt_type_table[n]) { + case 0: + w->wdsp.idct_add(dst, stride, block1); + break; + case 1: + ff_simple_idct84_add(dst, stride, block1); + ff_simple_idct84_add(dst + 4 * stride, stride, w->abt_block2[n]); + s->bdsp.clear_block(w->abt_block2[n]); + break; + case 2: + ff_simple_idct48_add(dst, stride, block1); + ff_simple_idct48_add(dst + 4, stride, w->abt_block2[n]); + s->bdsp.clear_block(w->abt_block2[n]); + break; + default: + av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n"); + } } - } } -void ff_wmv2_add_mb(MpegEncContext *s, int16_t block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){ - Wmv2Context * const w= (Wmv2Context*)s; +void ff_wmv2_add_mb(MpegEncContext *s, int16_t block1[6][64], + uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr) +{ + Wmv2Context *const w = (Wmv2Context *) s; - wmv2_add_block(w, block1[0], dest_y , s->linesize, 0); - wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1); - wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2); - wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3); + wmv2_add_block(w, block1[0], dest_y, s->linesize, 0); + wmv2_add_block(w, block1[1], dest_y + 8, s->linesize, 1); + wmv2_add_block(w, block1[2], dest_y + 8 * s->linesize, s->linesize, 2); + wmv2_add_block(w, block1[3], dest_y + 8 + 8 * s->linesize, s->linesize, 3); - if(s->flags&CODEC_FLAG_GRAY) return; + if (s->flags & CODEC_FLAG_GRAY) + return; - wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4); - wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5); + wmv2_add_block(w, block1[4], dest_cb, s->uvlinesize, 4); + wmv2_add_block(w, block1[5], dest_cr, s->uvlinesize, 5); } -void ff_mspel_motion(MpegEncContext *s, - uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, - uint8_t **ref_picture, op_pixels_func (*pix_op)[4], - int motion_x, int motion_y, int h) +void ff_mspel_motion(MpegEncContext *s, uint8_t *dest_y, + uint8_t *dest_cb, uint8_t *dest_cr, + uint8_t **ref_picture, op_pixels_func (*pix_op)[4], + int motion_x, int motion_y, int h) { - Wmv2Context * const w= (Wmv2Context*)s; + Wmv2Context *const w = (Wmv2Context *) s; uint8_t *ptr; int dxy, offset, mx, my, src_x, src_y, v_edge_pos; ptrdiff_t linesize, uvlinesize; - int emu=0; + int emu = 0; - dxy = ((motion_y & 1) << 1) | (motion_x & 1); - dxy = 2*dxy + w->hshift; + dxy = ((motion_y & 1) << 1) | (motion_x & 1); + dxy = 2 * dxy + w->hshift; src_x = s->mb_x * 16 + (motion_x >> 1); src_y = s->mb_y * 16 + (motion_y >> 1); /* WARNING: do no forget half pels */ v_edge_pos = s->v_edge_pos; - src_x = av_clip(src_x, -16, s->width); - src_y = av_clip(src_y, -16, s->height); + src_x = av_clip(src_x, -16, s->width); + src_y = av_clip(src_y, -16, s->height); - if(src_x<=-16 || src_x >= s->width) + if (src_x <= -16 || src_x >= s->width) dxy &= ~3; - if(src_y<=-16 || src_y >= s->height) + if (src_y <= -16 || src_y >= s->height) dxy &= ~4; linesize = s->linesize; uvlinesize = s->uvlinesize; - ptr = ref_picture[0] + (src_y * linesize) + src_x; - - if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos - || src_y + h+1 >= v_edge_pos){ - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, - ptr - 1 - s->linesize, - s->linesize, s->linesize, - 19, 19, + ptr = ref_picture[0] + (src_y * linesize) + src_x; + + if (src_x < 1 || src_y < 1 || src_x + 17 >= s->h_edge_pos || + src_y + h + 1 >= v_edge_pos) { + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, + s->linesize, s->linesize, 19, 19, src_x - 1, src_y - 1, s->h_edge_pos, s->v_edge_pos); - ptr= s->edge_emu_buffer + 1 + s->linesize; - emu=1; + ptr = s->edge_emu_buffer + 1 + s->linesize; + emu = 1; } w->wdsp.put_mspel_pixels_tab[dxy](dest_y, ptr, linesize); @@ -136,7 +140,8 @@ void ff_mspel_motion(MpegEncContext *s, w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 * linesize, ptr + 8 * linesize, linesize); w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 + 8 * linesize, ptr + 8 + 8 * linesize, linesize); - if(s->flags&CODEC_FLAG_GRAY) return; + if (s->flags & CODEC_FLAG_GRAY) + return; if (s->out_format == FMT_H263) { dxy = 0; @@ -147,9 +152,9 @@ void ff_mspel_motion(MpegEncContext *s, mx = motion_x >> 2; my = motion_y >> 2; } else { - mx = motion_x / 2; - my = motion_y / 2; - dxy = ((my & 1) << 1) | (mx & 1); + mx = motion_x / 2; + my = motion_y / 2; + dxy = ((my & 1) << 1) | (mx & 1); mx >>= 1; my >>= 1; } @@ -163,25 +168,25 @@ void ff_mspel_motion(MpegEncContext *s, if (src_y == (s->height >> 1)) dxy &= ~2; offset = (src_y * uvlinesize) + src_x; - ptr = ref_picture[1] + offset; - if(emu){ + ptr = ref_picture[1] + offset; + if (emu) { s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); - ptr= s->edge_emu_buffer; + ptr = s->edge_emu_buffer; } pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1); ptr = ref_picture[2] + offset; - if(emu){ + if (emu) { s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); - ptr= s->edge_emu_buffer; + ptr = s->edge_emu_buffer; } pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1); } -- cgit v1.2.3