From ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47 Mon Sep 17 00:00:00 2001 From: Gabriel Dume Date: Mon, 8 Sep 2014 13:40:28 -0400 Subject: dv: K&R formatting cosmetics Signed-off-by: Diego Biurrun --- libavcodec/dv.h | 73 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) (limited to 'libavcodec/dv.h') diff --git a/libavcodec/dv.h b/libavcodec/dv.h index 019c15add9..b458aeab29 100644 --- a/libavcodec/dv.h +++ b/libavcodec/dv.h @@ -28,13 +28,13 @@ #define AVCODEC_DV_H #include "avcodec.h" -#include "me_cmp.h" -#include "get_bits.h" #include "dv_profile.h" +#include "get_bits.h" +#include "me_cmp.h" typedef struct DVwork_chunk { - uint16_t buf_offset; - uint16_t mb_coordinates[5]; + uint16_t buf_offset; + uint16_t mb_coordinates[5]; } DVwork_chunk; typedef struct DVVideoContext { @@ -43,7 +43,7 @@ typedef struct DVVideoContext { AVCodecContext *avctx; uint8_t *buf; - uint8_t dv_zigzag[2][64]; + uint8_t dv_zigzag[2][64]; void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size); void (*fdct[2])(int16_t *block); @@ -54,26 +54,26 @@ typedef struct DVVideoContext { } DVVideoContext; enum dv_section_type { - dv_sect_header = 0x1f, - dv_sect_subcode = 0x3f, - dv_sect_vaux = 0x56, - dv_sect_audio = 0x76, - dv_sect_video = 0x96, + dv_sect_header = 0x1f, + dv_sect_subcode = 0x3f, + dv_sect_vaux = 0x56, + dv_sect_audio = 0x76, + dv_sect_video = 0x96, }; enum dv_pack_type { - dv_header525 = 0x3f, /* see dv_write_pack for important details on */ - dv_header625 = 0xbf, /* these two packs */ - dv_timecode = 0x13, - dv_audio_source = 0x50, - dv_audio_control = 0x51, - dv_audio_recdate = 0x52, - dv_audio_rectime = 0x53, - dv_video_source = 0x60, - dv_video_control = 0x61, - dv_video_recdate = 0x62, - dv_video_rectime = 0x63, - dv_unknown_pack = 0xff, + dv_header525 = 0x3f, /* see dv_write_pack for important details on */ + dv_header625 = 0xbf, /* these two packs */ + dv_timecode = 0x13, + dv_audio_source = 0x50, + dv_audio_control = 0x51, + dv_audio_recdate = 0x52, + dv_audio_rectime = 0x53, + dv_video_source = 0x60, + dv_video_control = 0x61, + dv_video_recdate = 0x62, + dv_video_rectime = 0x63, + dv_unknown_pack = 0xff, }; #define DV_PROFILE_IS_HD(p) ((p)->video_stype & 0x10) @@ -81,8 +81,8 @@ enum dv_pack_type { #define DV_PROFILE_IS_720p50(p) (((p)->video_stype == 0x18) && ((p)->dsf == 1)) /* minimum number of bytes to read from a DV stream in order to - determine the profile */ -#define DV_PROFILE_BYTES (6*80) /* 6 DIF blocks */ + * determine the profile */ +#define DV_PROFILE_BYTES (6 * 80) /* 6 DIF blocks */ /** * largest possible DV frame, in bytes (1080i50) @@ -103,23 +103,26 @@ int ff_dvvideo_init(AVCodecContext *avctx); static inline int dv_work_pool_size(const AVDVProfile *d) { - int size = d->n_difchan*d->difseg_size*27; + int size = d->n_difchan * d->difseg_size * 27; if (DV_PROFILE_IS_1080i50(d)) - size -= 3*27; + size -= 3 * 27; if (DV_PROFILE_IS_720p50(d)) - size -= 4*27; + size -= 4 * 27; return size; } -static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chunk, int m, int *mb_x, int *mb_y) +static inline void dv_calculate_mb_xy(DVVideoContext *s, + DVwork_chunk *work_chunk, + int m, int *mb_x, int *mb_y) { - *mb_x = work_chunk->mb_coordinates[m] & 0xff; - *mb_y = work_chunk->mb_coordinates[m] >> 8; - - /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */ - if (s->sys->height == 720 && !(s->buf[1]&0x0C)) { - *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */ - } + *mb_x = work_chunk->mb_coordinates[m] & 0xff; + *mb_y = work_chunk->mb_coordinates[m] >> 8; + + /* We work with 720p frames split in half. + * The odd half-frame (chan == 2,3) is displaced :-( */ + if (s->sys->height == 720 && !(s->buf[1] & 0x0C)) + /* shifting the Y coordinate down by 72/2 macro blocks */ + *mb_y -= (*mb_y > 17) ? 18 : -72; } #endif /* AVCODEC_DV_H */ -- cgit v1.2.3