Mercurial > libavcodec.hg
comparison vp3.c @ 6903:0f63fc62ea8b libavcodec
consistency cosmetics: indices --> indexes
author | diego |
---|---|
date | Mon, 26 May 2008 23:14:25 +0000 |
parents | b9a57d71425d |
children | 480faa9f79dd |
comparison
equal
deleted
inserted
replaced
6902:b6e110c575ff | 6903:0f63fc62ea8b |
---|---|
267 uint8_t base_matrix[384][64]; | 267 uint8_t base_matrix[384][64]; |
268 uint8_t qr_count[2][3]; | 268 uint8_t qr_count[2][3]; |
269 uint8_t qr_size [2][3][64]; | 269 uint8_t qr_size [2][3][64]; |
270 uint16_t qr_base[2][3][64]; | 270 uint16_t qr_base[2][3][64]; |
271 | 271 |
272 /* this is a list of indices into the all_fragments array indicating | 272 /* this is a list of indexes into the all_fragments array indicating |
273 * which of the fragments are coded */ | 273 * which of the fragments are coded */ |
274 int *coded_fragment_list; | 274 int *coded_fragment_list; |
275 int coded_fragment_list_index; | 275 int coded_fragment_list_index; |
276 int pixel_addresses_initialized; | 276 int pixel_addresses_initialized; |
277 | 277 |
289 /* these arrays need to be on 16-byte boundaries since SSE2 operations | 289 /* these arrays need to be on 16-byte boundaries since SSE2 operations |
290 * index into them */ | 290 * index into them */ |
291 DECLARE_ALIGNED_16(int16_t, qmat[2][4][64]); //<qmat[is_inter][plane] | 291 DECLARE_ALIGNED_16(int16_t, qmat[2][4][64]); //<qmat[is_inter][plane] |
292 | 292 |
293 /* This table contains superblock_count * 16 entries. Each set of 16 | 293 /* This table contains superblock_count * 16 entries. Each set of 16 |
294 * numbers corresponds to the fragment indices 0..15 of the superblock. | 294 * numbers corresponds to the fragment indexes 0..15 of the superblock. |
295 * An entry will be -1 to indicate that no entry corresponds to that | 295 * An entry will be -1 to indicate that no entry corresponds to that |
296 * index. */ | 296 * index. */ |
297 int *superblock_fragments; | 297 int *superblock_fragments; |
298 | 298 |
299 /* This table contains superblock_count * 4 entries. Each set of 4 | 299 /* This table contains superblock_count * 4 entries. Each set of 4 |
300 * numbers corresponds to the macroblock indices 0..3 of the superblock. | 300 * numbers corresponds to the macroblock indexes 0..3 of the superblock. |
301 * An entry will be -1 to indicate that no entry corresponds to that | 301 * An entry will be -1 to indicate that no entry corresponds to that |
302 * index. */ | 302 * index. */ |
303 int *superblock_macroblocks; | 303 int *superblock_macroblocks; |
304 | 304 |
305 /* This table contains macroblock_count * 6 entries. Each set of 6 | 305 /* This table contains macroblock_count * 6 entries. Each set of 6 |
306 * numbers corresponds to the fragment indices 0..5 which comprise | 306 * numbers corresponds to the fragment indexes 0..5 which comprise |
307 * the macroblock (4 Y fragments and 2 C fragments). */ | 307 * the macroblock (4 Y fragments and 2 C fragments). */ |
308 int *macroblock_fragments; | 308 int *macroblock_fragments; |
309 /* This is an array that indicates how a particular macroblock | 309 /* This is an array that indicates how a particular macroblock |
310 * is coded. */ | 310 * is coded. */ |
311 unsigned char *macroblock_coding; | 311 unsigned char *macroblock_coding; |
1221 int dc_c_table; | 1221 int dc_c_table; |
1222 int ac_y_table; | 1222 int ac_y_table; |
1223 int ac_c_table; | 1223 int ac_c_table; |
1224 int residual_eob_run = 0; | 1224 int residual_eob_run = 0; |
1225 | 1225 |
1226 /* fetch the DC table indices */ | 1226 /* fetch the DC table indexes */ |
1227 dc_y_table = get_bits(gb, 4); | 1227 dc_y_table = get_bits(gb, 4); |
1228 dc_c_table = get_bits(gb, 4); | 1228 dc_c_table = get_bits(gb, 4); |
1229 | 1229 |
1230 /* unpack the Y plane DC coefficients */ | 1230 /* unpack the Y plane DC coefficients */ |
1231 debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n", | 1231 debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n", |
1237 debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n", | 1237 debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n", |
1238 dc_c_table); | 1238 dc_c_table); |
1239 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, | 1239 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, |
1240 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); | 1240 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1241 | 1241 |
1242 /* fetch the AC table indices */ | 1242 /* fetch the AC table indexes */ |
1243 ac_y_table = get_bits(gb, 4); | 1243 ac_y_table = get_bits(gb, 4); |
1244 ac_c_table = get_bits(gb, 4); | 1244 ac_c_table = get_bits(gb, 4); |
1245 | 1245 |
1246 /* unpack the group 1 AC coefficients (coeffs 1-5) */ | 1246 /* unpack the group 1 AC coefficients (coeffs 1-5) */ |
1247 for (i = 1; i <= 5; i++) { | 1247 for (i = 1; i <= 5; i++) { |
1329 int predicted_dc; | 1329 int predicted_dc; |
1330 | 1330 |
1331 /* DC values for the left, up-left, up, and up-right fragments */ | 1331 /* DC values for the left, up-left, up, and up-right fragments */ |
1332 int vl, vul, vu, vur; | 1332 int vl, vul, vu, vur; |
1333 | 1333 |
1334 /* indices for the left, up-left, up, and up-right fragments */ | 1334 /* indexes for the left, up-left, up, and up-right fragments */ |
1335 int l, ul, u, ur; | 1335 int l, ul, u, ur; |
1336 | 1336 |
1337 /* | 1337 /* |
1338 * The 6 fields mean: | 1338 * The 6 fields mean: |
1339 * 0: up-left multiplier | 1339 * 0: up-left multiplier |