Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -105,7 +105,7 @@ extern const uint8_t ff_fc_2pulses_9bits_track2_gray[32]; · 104 unmodified lines | |||
| 105 | * \param fc_v [out] decoded fixed codebook vector (2.13) | 105 | * \param fc_v [out] decoded fixed codebook vector (2.13) |
| 106 | * \param tab1 table used for first pulse_count pulses | 106 | * \param tab1 table used for first pulse_count pulses |
| 107 | * \param tab2 table used for last pulse | 107 | * \param tab2 table used for last pulse |
| 108 | * \param pulse_indices fixed codebook indeces | 108 | * \param pulse_indices fixed codebook indexes |
| 109 | * \param pulse_signs signs of the excitation pulses (0 bit value | 109 | * \param pulse_signs signs of the excitation pulses (0 bit value |
| 110 | * means negative sign) | 110 | * means negative sign) |
| 111 | * \param bits number of bits per one pulse index | 111 | * \param bits number of bits per one pulse index |
| @@ -349,7 +349,7 @@ static int cook_decode_close(AVCodecContext *avctx) · 348 unmodified lines | |||
| 349 | * Fill the gain array for the timedomain quantization. | 349 | * Fill the gain array for the timedomain quantization. |
| 350 | * | 350 | * |
| 351 | * @param q pointer to the COOKContext | 351 | * @param q pointer to the COOKContext |
| 352 | * @param gaininfo[9] array of gain indices | 352 | * @param gaininfo[9] array of gain indexes |
| 353 | */ | 353 | */ |
| 354 | 354 | ||
| 355 | static void decode_gain_info(GetBitContext *gb, int *gaininfo) | 355 | static void decode_gain_info(GetBitContext *gb, int *gaininfo) |
| @@ -47,7 +47,7 @@ typedef struct DNXHDEncContext { · 46 unmodified lines | |||
| 47 | AVFrame frame; | 47 | AVFrame frame; |
| 48 | int cid; | 48 | int cid; |
| 49 | const CIDEntry *cid_table; | 49 | const CIDEntry *cid_table; |
| 50 | uint8_t *msip; ///< Macroblock Scan Indices Payload | 50 | uint8_t *msip; ///< Macroblock Scan Indexes Payload |
| 51 | uint32_t *slice_size; | 51 | uint32_t *slice_size; |
| 52 | 52 | ||
| 53 | struct DNXHDEncContext *thread[MAX_THREADS]; | 53 | struct DNXHDEncContext *thread[MAX_THREADS]; |
| @@ -6505,7 +6505,7 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 · 6504 unmodified lines | |||
| 6505 | int dir; | 6505 | int dir; |
| 6506 | /* FIXME: A given frame may occupy more than one position in | 6506 | /* FIXME: A given frame may occupy more than one position in |
| 6507 | * the reference list. So ref2frm should be populated with | 6507 | * the reference list. So ref2frm should be populated with |
| 6508 | * frame numbers, not indices. */ | 6508 | * frame numbers, not indexes. */ |
| 6509 | static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, | 6509 | static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, |
| 6510 | 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31}; | 6510 | 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31}; |
| 6511 | 6511 | ||
| @@ -1431,7 +1431,7 @@ static void qdm2_decode_fft_packets (QDM2Context *q) · 1430 unmodified lines | |||
| 1431 | if (q->sub_packet_list_B[0].packet == NULL) | 1431 | if (q->sub_packet_list_B[0].packet == NULL) |
| 1432 | return; | 1432 | return; |
| 1433 | 1433 | ||
| 1434 | /* reset minimum indices for FFT coefficients */ | 1434 | /* reset minimum indexes for FFT coefficients */ |
| 1435 | q->fft_coefs_index = 0; | 1435 | q->fft_coefs_index = 0; |
| 1436 | for (i=0; i < 5; i++) | 1436 | for (i=0; i < 5; i++) |
| 1437 | q->fft_coefs_min_index[i] = -1; | 1437 | q->fft_coefs_min_index[i] = -1; |
| @@ -1481,7 +1481,7 @@ static void qdm2_decode_fft_packets (QDM2Context *q) · 43 unmodified lines | |||
| 1481 | } | 1481 | } |
| 1482 | } // Loop on B packets | 1482 | } // Loop on B packets |
| 1483 | 1483 | ||
| 1484 | /* calculate maximum indices for FFT coefficients */ | 1484 | /* calculate maximum indexes for FFT coefficients */ |
| 1485 | for (i = 0, j = -1; i < 5; i++) | 1485 | for (i = 0, j = -1; i < 5; i++) |
| 1486 | if (q->fft_coefs_min_index[i] >= 0) { | 1486 | if (q->fft_coefs_min_index[i] >= 0) { |
| 1487 | if (j >= 0) | 1487 | if (j >= 0) |
| @@ -79,7 +79,7 @@ static void qtrle_decode_4bpp(QtrleContext *s) · 78 unmodified lines | |||
| 79 | int rle_code; | 79 | int rle_code; |
| 80 | int row_ptr, pixel_ptr; | 80 | int row_ptr, pixel_ptr; |
| 81 | int row_inc = s->frame.linesize[0]; | 81 | int row_inc = s->frame.linesize[0]; |
| 82 | unsigned char pi1, pi2, pi3, pi4, pi5, pi6, pi7, pi8; /* 8 palette indices */ | 82 | unsigned char pi1, pi2, pi3, pi4, pi5, pi6, pi7, pi8; /* 8 palette indexes */ |
| 83 | unsigned char *rgb = s->frame.data[0]; | 83 | unsigned char *rgb = s->frame.data[0]; |
| 84 | int pixel_limit = s->frame.linesize[0] * s->avctx->height; | 84 | int pixel_limit = s->frame.linesize[0] * s->avctx->height; |
| 85 | 85 | ||
| @@ -122,7 +122,7 @@ static void qtrle_decode_4bpp(QtrleContext *s) · 36 unmodified lines | |||
| 122 | /* decode the run length code */ | 122 | /* decode the run length code */ |
| 123 | rle_code = -rle_code; | 123 | rle_code = -rle_code; |
| 124 | /* get the next 4 bytes from the stream, treat them as palette | 124 | /* get the next 4 bytes from the stream, treat them as palette |
| 125 | * indices, and output them rle_code times */ | 125 | * indexes, and output them rle_code times */ |
| 126 | CHECK_STREAM_PTR(4); | 126 | CHECK_STREAM_PTR(4); |
| 127 | pi1 = ((s->buf[stream_ptr]) >> 4) & 0x0f; | 127 | pi1 = ((s->buf[stream_ptr]) >> 4) & 0x0f; |
| 128 | pi2 = (s->buf[stream_ptr++]) & 0x0f; | 128 | pi2 = (s->buf[stream_ptr++]) & 0x0f; |
| @@ -170,7 +170,7 @@ static void qtrle_decode_8bpp(QtrleContext *s) · 41 unmodified lines | |||
| 170 | int rle_code; | 170 | int rle_code; |
| 171 | int row_ptr, pixel_ptr; | 171 | int row_ptr, pixel_ptr; |
| 172 | int row_inc = s->frame.linesize[0]; | 172 | int row_inc = s->frame.linesize[0]; |
| 173 | unsigned char pi1, pi2, pi3, pi4; /* 4 palette indices */ | 173 | unsigned char pi1, pi2, pi3, pi4; /* 4 palette indexes */ |
| 174 | unsigned char *rgb = s->frame.data[0]; | 174 | unsigned char *rgb = s->frame.data[0]; |
| 175 | int pixel_limit = s->frame.linesize[0] * s->avctx->height; | 175 | int pixel_limit = s->frame.linesize[0] * s->avctx->height; |
| 176 | 176 | ||
| @@ -213,7 +213,7 @@ static void qtrle_decode_8bpp(QtrleContext *s) · 36 unmodified lines | |||
| 213 | /* decode the run length code */ | 213 | /* decode the run length code */ |
| 214 | rle_code = -rle_code; | 214 | rle_code = -rle_code; |
| 215 | /* get the next 4 bytes from the stream, treat them as palette | 215 | /* get the next 4 bytes from the stream, treat them as palette |
| 216 | * indices, and output them rle_code times */ | 216 | * indexes, and output them rle_code times */ |
| 217 | CHECK_STREAM_PTR(4); | 217 | CHECK_STREAM_PTR(4); |
| 218 | pi1 = s->buf[stream_ptr++]; | 218 | pi1 = s->buf[stream_ptr++]; |
| 219 | pi2 = s->buf[stream_ptr++]; | 219 | pi2 = s->buf[stream_ptr++]; |
| @@ -3017,7 +3017,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 3016 unmodified lines | |||
| 3017 | offset_table[6] = { 0, 1, 3, 7, 15, 31 }; | 3017 | offset_table[6] = { 0, 1, 3, 7, 15, 31 }; |
| 3018 | int mb_has_coeffs = 1; /* last_flag */ | 3018 | int mb_has_coeffs = 1; /* last_flag */ |
| 3019 | int dmv_x, dmv_y; /* Differential MV components */ | 3019 | int dmv_x, dmv_y; /* Differential MV components */ |
| 3020 | int index, index1; /* LUT indices */ | 3020 | int index, index1; /* LUT indexes */ |
| 3021 | int val, sign; /* temp values */ | 3021 | int val, sign; /* temp values */ |
| 3022 | int first_block = 1; | 3022 | int first_block = 1; |
| 3023 | int dst_idx, off; | 3023 | int dst_idx, off; |
| @@ -3246,7 +3246,7 @@ static void vc1_decode_b_mb(VC1Context *v) · 222 unmodified lines | |||
| 3246 | static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, | 3246 | static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, |
| 3247 | offset_table[6] = { 0, 1, 3, 7, 15, 31 }; | 3247 | offset_table[6] = { 0, 1, 3, 7, 15, 31 }; |
| 3248 | int mb_has_coeffs = 0; /* last_flag */ | 3248 | int mb_has_coeffs = 0; /* last_flag */ |
| 3249 | int index, index1; /* LUT indices */ | 3249 | int index, index1; /* LUT indexes */ |
| 3250 | int val, sign; /* temp values */ | 3250 | int val, sign; /* temp values */ |
| 3251 | int first_block = 1; | 3251 | int first_block = 1; |
| 3252 | int dst_idx, off; | 3252 | int dst_idx, off; |
| @@ -269,7 +269,7 @@ typedef struct Vp3DecodeContext { · 268 unmodified lines | |||
| 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; |
| @@ -291,19 +291,19 @@ typedef struct Vp3DecodeContext { · 15 unmodified lines | |||
| 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 |
| @@ -1223,7 +1223,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) · 913 unmodified lines | |||
| 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 | ||
| @@ -1239,7 +1239,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) · 9 unmodified lines | |||
| 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 | ||
| @@ -1331,7 +1331,7 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, · 85 unmodified lines | |||
| 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 | /* |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | |||
| 54 | * file. This is an interesting technique, although it makes random file | 54 | * file. This is an interesting technique, although it makes random file |
| 55 | * seeking difficult despite the fact that the frames are all intracoded. | 55 | * seeking difficult despite the fact that the frames are all intracoded. |
| 56 | * | 56 | * |
| 57 | * V1,2 VQA uses 12-bit codebook indices. If the 12-bit indices were | 57 | * V1,2 VQA uses 12-bit codebook indexes. If the 12-bit indexes were |
| 58 | * packed into bytes and then RLE compressed, bytewise, the results would | 58 | * packed into bytes and then RLE compressed, bytewise, the results would |
| 59 | * be poor. That is why the coding method divides each index into 2 parts, | 59 | * be poor. That is why the coding method divides each index into 2 parts, |
| 60 | * the top 4 bits and the bottom 8 bits, then RL encodes the 4-bit pieces | 60 | * the top 4 bits and the bottom 8 bits, then RL encodes the 4-bit pieces |
| @@ -421,7 +421,7 @@ struct AVFilterContext · 420 unmodified lines | |||
| 421 | 421 | ||
| 422 | /** | 422 | /** |
| 423 | * A link between two filters. This contains pointers to the source and | 423 | * A link between two filters. This contains pointers to the source and |
| 424 | * destination filters between which this link exists, and the indices of | 424 | * destination filters between which this link exists, and the indexes of |
| 425 | * the pads involved. In addition, this link also contains the parameters | 425 | * the pads involved. In addition, this link also contains the parameters |
| 426 | * which have been negotiated and agreed upon between the filter, such as | 426 | * which have been negotiated and agreed upon between the filter, such as |
| 427 | * image dimensions, format, etc | 427 | * image dimensions, format, etc |
| @@ -996,7 +996,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp · 995 unmodified lines | |||
| 996 | 996 | ||
| 997 | if (ENABLE_DV_DEMUXER && avi->dv_demux) { | 997 | if (ENABLE_DV_DEMUXER && avi->dv_demux) { |
| 998 | /* One and only one real stream for DV in AVI, and it has video */ | 998 | /* One and only one real stream for DV in AVI, and it has video */ |
| 999 | /* offsets. Calling with other stream indices should have failed */ | 999 | /* offsets. Calling with other stream indexes should have failed */ |
| 1000 | /* the av_index_search_timestamp call above. */ | 1000 | /* the av_index_search_timestamp call above. */ |
| 1001 | assert(stream_index == 0); | 1001 | assert(stream_index == 0); |
| 1002 | 1002 | ||
| @@ -446,7 +446,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, · 445 unmodified lines | |||
| 446 | last_color = first_color + AV_RL16(&scratch[2]) - 1; | 446 | last_color = first_color + AV_RL16(&scratch[2]) - 1; |
| 447 | /* sanity check (since they are 16 bit values) */ | 447 | /* sanity check (since they are 16 bit values) */ |
| 448 | if ((first_color > 0xFF) || (last_color > 0xFF)) { | 448 | if ((first_color > 0xFF) || (last_color > 0xFF)) { |
| 449 | debug_ipmovie("demux_ipmovie: set_palette indices out of range (%d -> %d)\n", | 449 | debug_ipmovie("demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", |
| 450 | first_color, last_color); | 450 | first_color, last_color); |
| 451 | chunk_type = CHUNK_BAD; | 451 | chunk_type = CHUNK_BAD; |
| 452 | break; | 452 | break; |
| @@ -140,7 +140,7 @@ struct nsv_pcm_header { · 139 unmodified lines | |||
| 140 | #define TB_NSVF MKBETAG('N', 'S', 'V', 'f') | 140 | #define TB_NSVF MKBETAG('N', 'S', 'V', 'f') |
| 141 | #define TB_NSVS MKBETAG('N', 'S', 'V', 's') | 141 | #define TB_NSVS MKBETAG('N', 'S', 'V', 's') |
| 142 | 142 | ||
| 143 | /* hardcoded stream indices */ | 143 | /* hardcoded stream indexes */ |
| 144 | #define NSV_ST_VIDEO 0 | 144 | #define NSV_ST_VIDEO 0 |
| 145 | #define NSV_ST_AUDIO 1 | 145 | #define NSV_ST_AUDIO 1 |
| 146 | #define NSV_ST_SUBT 2 | 146 | #define NSV_ST_SUBT 2 |
| @@ -42,7 +42,7 @@ · 41 unmodified lines | |||
| 42 | #define RLV3_TAG MKBETAG('R', 'L', 'V', '3') | 42 | #define RLV3_TAG MKBETAG('R', 'L', 'V', '3') |
| 43 | 43 | ||
| 44 | typedef struct Rl2DemuxContext { | 44 | typedef struct Rl2DemuxContext { |
| 45 | unsigned int index_pos[2]; ///< indices in the sample tables | 45 | unsigned int index_pos[2]; ///< indexes in the sample tables |
| 46 | } Rl2DemuxContext; | 46 | } Rl2DemuxContext; |
| 47 | 47 | ||
| 48 | 48 | ||
| @@ -408,7 +408,7 @@ static int rm_write_trailer(AVFormatContext *s) · 407 unmodified lines | |||
| 408 | put_be16(pb, 0); | 408 | put_be16(pb, 0); |
| 409 | 409 | ||
| 410 | for(i=0;i<s->nb_streams;i++) { | 410 | for(i=0;i<s->nb_streams;i++) { |
| 411 | put_be32(pb, 0); /* zero indices */ | 411 | put_be32(pb, 0); /* zero indexes */ |
| 412 | put_be16(pb, i); /* stream number */ | 412 | put_be16(pb, i); /* stream number */ |
| 413 | put_be32(pb, 0); /* next index */ | 413 | put_be32(pb, 0); /* next index */ |
| 414 | } | 414 | } |