Mercurial > libavcodec.hg
comparison dv.c @ 8088:728e0e4fcb95 libavcodec
renaming macro in order to conform with the rest of libavcodec
| author | romansh |
|---|---|
| date | Thu, 30 Oct 2008 15:43:00 +0000 |
| parents | fed91eaa6444 |
| children | 890df98a7848 |
comparison
equal
deleted
inserted
replaced
| 8087:661cd381d996 | 8088:728e0e4fcb95 |
|---|---|
| 71 | 71 |
| 72 static void* dv_anchor[DV_ANCHOR_SIZE]; | 72 static void* dv_anchor[DV_ANCHOR_SIZE]; |
| 73 | 73 |
| 74 #define TEX_VLC_BITS 9 | 74 #define TEX_VLC_BITS 9 |
| 75 | 75 |
| 76 #ifdef DV_CODEC_TINY_TARGET | 76 #if ENABLE_SMALL |
| 77 #define DV_VLC_MAP_RUN_SIZE 15 | 77 #define DV_VLC_MAP_RUN_SIZE 15 |
| 78 #define DV_VLC_MAP_LEV_SIZE 23 | 78 #define DV_VLC_MAP_LEV_SIZE 23 |
| 79 #else | 79 #else |
| 80 #define DV_VLC_MAP_RUN_SIZE 64 | 80 #define DV_VLC_MAP_RUN_SIZE 64 |
| 81 #define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check | 81 #define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check |
| 186 free_vlc(&dv_vlc); | 186 free_vlc(&dv_vlc); |
| 187 | 187 |
| 188 for (i = 0; i < NB_DV_VLC - 1; i++) { | 188 for (i = 0; i < NB_DV_VLC - 1; i++) { |
| 189 if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) | 189 if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) |
| 190 continue; | 190 continue; |
| 191 #ifdef DV_CODEC_TINY_TARGET | 191 #if ENABLE_SMALL |
| 192 if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) | 192 if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) |
| 193 continue; | 193 continue; |
| 194 #endif | 194 #endif |
| 195 | 195 |
| 196 if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) | 196 if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) |
| 200 dv_vlc_bits[i] << (!!dv_vlc_level[i]); | 200 dv_vlc_bits[i] << (!!dv_vlc_level[i]); |
| 201 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size = | 201 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size = |
| 202 dv_vlc_len[i] + (!!dv_vlc_level[i]); | 202 dv_vlc_len[i] + (!!dv_vlc_level[i]); |
| 203 } | 203 } |
| 204 for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { | 204 for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { |
| 205 #ifdef DV_CODEC_TINY_TARGET | 205 #if ENABLE_SMALL |
| 206 for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { | 206 for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { |
| 207 if (dv_vlc_map[i][j].size == 0) { | 207 if (dv_vlc_map[i][j].size == 0) { |
| 208 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | | 208 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | |
| 209 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); | 209 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); |
| 210 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + | 210 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + |
| 550 } | 550 } |
| 551 } | 551 } |
| 552 } | 552 } |
| 553 } | 553 } |
| 554 | 554 |
| 555 #ifdef DV_CODEC_TINY_TARGET | 555 #if ENABLE_SMALL |
| 556 /* Converts run and level (where level != 0) pair into vlc, returning bit size */ | 556 /* Converts run and level (where level != 0) pair into vlc, returning bit size */ |
| 557 static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc) | 557 static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc) |
| 558 { | 558 { |
| 559 int size; | 559 int size; |
| 560 if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) { | 560 if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) { |