diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 19:28:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 19:30:55 +0200 |
| commit | 96b069450cd037d7e1406859e42f4a1650e31226 (patch) | |
| tree | 38bdf389558e660a12597304eafe32ded270a0f5 /libavcodec/dv_tablegen.h | |
| parent | 5309e7e6aa1e15e52b197930b7a1a2068eb0ac88 (diff) | |
| parent | ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47 (diff) | |
| download | ffmpeg-96b069450cd037d7e1406859e42f4a1650e31226.tar.gz | |
Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'
* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
dv: K&R formatting cosmetics
Conflicts:
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv_tablegen.h')
| -rw-r--r-- | libavcodec/dv_tablegen.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index cc6605bcc1..941b5572be 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -29,17 +29,17 @@ #include "dvdata.h" #if CONFIG_SMALL -#define DV_VLC_MAP_RUN_SIZE 15 -#define DV_VLC_MAP_LEV_SIZE 23 +#define DV_VLC_MAP_RUN_SIZE 15 +#define DV_VLC_MAP_LEV_SIZE 23 #else #define DV_VLC_MAP_RUN_SIZE 64 -#define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check +#define DV_VLC_MAP_LEV_SIZE 512 // FIXME sign was removed so this should be /2 but needs check #endif /* VLC encoding lookup table */ typedef struct dv_vlc_pair { - uint32_t vlc; - uint32_t size; + uint32_t vlc; + uint32_t size; } dv_vlc_pair; #if CONFIG_HARDCODED_TABLES @@ -52,44 +52,44 @@ static av_cold void dv_vlc_map_tableinit(void) { int i, j; for (i = 0; i < NB_DV_VLC - 1; i++) { - if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) - continue; + if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) + continue; #if CONFIG_SMALL - if (ff_dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) - continue; + if (ff_dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) + continue; #endif - if (dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size != 0) - continue; + if (dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size != 0) + continue; - dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc = - ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]); - dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size = - ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]); + dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc = + ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]); + dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size = + ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]); } for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { #if CONFIG_SMALL - for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { - if (dv_vlc_map[i][j].size == 0) { - dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | - (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); - dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + - dv_vlc_map[0][j].size; - } - } + for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { + if (dv_vlc_map[i][j].size == 0) { + dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | + (dv_vlc_map[i - 1][0].vlc << + dv_vlc_map[0][j].size); + dv_vlc_map[i][j].size = dv_vlc_map[i - 1][0].size + + dv_vlc_map[0][j].size; + } + } #else - for (j = 1; j < DV_VLC_MAP_LEV_SIZE/2; j++) { - if (dv_vlc_map[i][j].size == 0) { - dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | - (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); - dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + - dv_vlc_map[0][j].size; - } - dv_vlc_map[i][((uint16_t)(-j))&0x1ff].vlc = - dv_vlc_map[i][j].vlc | 1; - dv_vlc_map[i][((uint16_t)(-j))&0x1ff].size = - dv_vlc_map[i][j].size; - } + for (j = 1; j < DV_VLC_MAP_LEV_SIZE / 2; j++) { + if (dv_vlc_map[i][j].size == 0) { + dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | + (dv_vlc_map[i - 1][0].vlc << + dv_vlc_map[0][j].size); + dv_vlc_map[i][j].size = dv_vlc_map[i - 1][0].size + + dv_vlc_map[0][j].size; + } + dv_vlc_map[i][((uint16_t) (-j)) & 0x1ff].vlc = dv_vlc_map[i][j].vlc | 1; + dv_vlc_map[i][((uint16_t) (-j)) & 0x1ff].size = dv_vlc_map[i][j].size; + } #endif } } |