mirror of https://git.ffmpeg.org/ffmpeg.git
VC1: Do not needlessly use signed types.
This might even have prevented the compiler from some optimizations, since both signed and unsigned types are used for the dezigzag tables/ table pointers, and if a branches uses both the compiler needs to create more complex code. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
parent
31ff2cb266
commit
6d797ac70f
|
@ -349,7 +349,7 @@ typedef struct VC1Context{
|
||||||
uint8_t fourmvbp;
|
uint8_t fourmvbp;
|
||||||
uint8_t* fieldtx_plane;
|
uint8_t* fieldtx_plane;
|
||||||
int fieldtx_is_raw;
|
int fieldtx_is_raw;
|
||||||
int8_t zzi_8x8[64];
|
uint8_t zzi_8x8[64];
|
||||||
uint8_t *blk_mv_type_base, *blk_mv_type; ///< 0: frame MV, 1: field MV (interlaced frame)
|
uint8_t *blk_mv_type_base, *blk_mv_type; ///< 0: frame MV, 1: field MV (interlaced frame)
|
||||||
uint8_t *mv_f_base, *mv_f[2]; ///< 0: MV obtained from same field, 1: opposite field
|
uint8_t *mv_f_base, *mv_f[2]; ///< 0: MV obtained from same field, 1: opposite field
|
||||||
uint8_t *mv_f_last_base, *mv_f_last[2];
|
uint8_t *mv_f_last_base, *mv_f_last[2];
|
||||||
|
|
|
@ -1019,21 +1019,21 @@ const uint8_t ff_vc1_mv_diff_bits[4][73] = {
|
||||||
/* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
|
/* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
|
||||||
|
|
||||||
/* Table 232 */
|
/* Table 232 */
|
||||||
const int8_t ff_vc1_simple_progressive_4x4_zz [16] = {
|
const uint8_t ff_vc1_simple_progressive_4x4_zz [16] = {
|
||||||
0, 8, 16, 1,
|
0, 8, 16, 1,
|
||||||
9, 24, 17, 2,
|
9, 24, 17, 2,
|
||||||
10, 18, 25, 3,
|
10, 18, 25, 3,
|
||||||
11, 26, 19, 27
|
11, 26, 19, 27
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_progressive_8x4_zz [32] = { /* Table 233 */
|
const uint8_t ff_vc1_adv_progressive_8x4_zz [32] = { /* Table 233 */
|
||||||
0, 8, 1, 16, 2, 9, 10, 3,
|
0, 8, 1, 16, 2, 9, 10, 3,
|
||||||
24, 17, 4, 11, 18, 12, 5, 19,
|
24, 17, 4, 11, 18, 12, 5, 19,
|
||||||
25, 13, 20, 26, 27, 6, 21, 28,
|
25, 13, 20, 26, 27, 6, 21, 28,
|
||||||
14, 22, 29, 7, 30, 15, 23, 31
|
14, 22, 29, 7, 30, 15, 23, 31
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_progressive_4x8_zz [32] = { /* Table 234 */
|
const uint8_t ff_vc1_adv_progressive_4x8_zz [32] = { /* Table 234 */
|
||||||
0, 1, 8, 2,
|
0, 1, 8, 2,
|
||||||
9, 16, 17, 24,
|
9, 16, 17, 24,
|
||||||
10, 32, 25, 18,
|
10, 32, 25, 18,
|
||||||
|
@ -1044,7 +1044,7 @@ const int8_t ff_vc1_adv_progressive_4x8_zz [32] = { /* Table 234 */
|
||||||
35, 43, 51, 59
|
35, 43, 51, 59
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_interlaced_8x8_zz [64] = { /* Table 235 */
|
const uint8_t ff_vc1_adv_interlaced_8x8_zz [64] = { /* Table 235 */
|
||||||
0, 8, 1, 16, 24, 9, 2, 32,
|
0, 8, 1, 16, 24, 9, 2, 32,
|
||||||
40, 48, 56, 17, 10, 3, 25, 18,
|
40, 48, 56, 17, 10, 3, 25, 18,
|
||||||
11, 4, 33, 41, 49, 57, 26, 34,
|
11, 4, 33, 41, 49, 57, 26, 34,
|
||||||
|
@ -1055,14 +1055,14 @@ const int8_t ff_vc1_adv_interlaced_8x8_zz [64] = { /* Table 235 */
|
||||||
61, 62, 54, 46, 39, 47, 55, 63
|
61, 62, 54, 46, 39, 47, 55, 63
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_interlaced_8x4_zz [32] = { /* Table 236 */
|
const uint8_t ff_vc1_adv_interlaced_8x4_zz [32] = { /* Table 236 */
|
||||||
0, 8, 16, 24, 1, 9, 2, 17,
|
0, 8, 16, 24, 1, 9, 2, 17,
|
||||||
25, 10, 3, 18, 26, 4, 11, 19,
|
25, 10, 3, 18, 26, 4, 11, 19,
|
||||||
12, 5, 13, 20, 27, 6, 21, 28,
|
12, 5, 13, 20, 27, 6, 21, 28,
|
||||||
14, 22, 29, 7, 30, 15, 23, 31
|
14, 22, 29, 7, 30, 15, 23, 31
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_interlaced_4x8_zz [32] = { /* Table 237 */
|
const uint8_t ff_vc1_adv_interlaced_4x8_zz [32] = { /* Table 237 */
|
||||||
0, 1, 2, 8,
|
0, 1, 2, 8,
|
||||||
16, 9, 24, 17,
|
16, 9, 24, 17,
|
||||||
10, 3, 32, 40,
|
10, 3, 32, 40,
|
||||||
|
@ -1073,7 +1073,7 @@ const int8_t ff_vc1_adv_interlaced_4x8_zz [32] = { /* Table 237 */
|
||||||
35, 43, 51, 59
|
35, 43, 51, 59
|
||||||
};
|
};
|
||||||
|
|
||||||
const int8_t ff_vc1_adv_interlaced_4x4_zz [16] = { /* Table 238 */
|
const uint8_t ff_vc1_adv_interlaced_4x4_zz [16] = { /* Table 238 */
|
||||||
0, 8, 16, 24,
|
0, 8, 16, 24,
|
||||||
1, 9, 17, 2,
|
1, 9, 17, 2,
|
||||||
25, 10, 18, 3,
|
25, 10, 18, 3,
|
||||||
|
|
|
@ -183,15 +183,15 @@ extern const uint8_t ff_vc1_2ref_mvdata_bits[8][126];
|
||||||
/* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
|
/* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
|
||||||
|
|
||||||
/* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */
|
/* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */
|
||||||
extern const int8_t ff_vc1_simple_progressive_4x4_zz [16];
|
extern const uint8_t ff_vc1_simple_progressive_4x4_zz [16];
|
||||||
extern const int8_t ff_vc1_adv_progressive_8x4_zz [32];
|
extern const uint8_t ff_vc1_adv_progressive_8x4_zz [32];
|
||||||
extern const int8_t ff_vc1_adv_progressive_4x8_zz [32];
|
extern const uint8_t ff_vc1_adv_progressive_4x8_zz [32];
|
||||||
extern const int8_t ff_vc1_adv_interlaced_8x8_zz [64];
|
extern const uint8_t ff_vc1_adv_interlaced_8x8_zz [64];
|
||||||
extern const int8_t ff_vc1_adv_interlaced_8x4_zz [32];
|
extern const uint8_t ff_vc1_adv_interlaced_8x4_zz [32];
|
||||||
extern const int8_t ff_vc1_adv_interlaced_4x8_zz [32];
|
extern const uint8_t ff_vc1_adv_interlaced_4x8_zz [32];
|
||||||
extern const int8_t ff_vc1_adv_interlaced_4x4_zz [16];
|
extern const uint8_t ff_vc1_adv_interlaced_4x4_zz [16];
|
||||||
extern const int8_t ff_vc1_intra_horz_8x8_zz [64];
|
extern const uint8_t ff_vc1_intra_horz_8x8_zz [64];
|
||||||
extern const int8_t ff_vc1_intra_vert_8x8_zz [64];
|
extern const uint8_t ff_vc1_intra_vert_8x8_zz [64];
|
||||||
|
|
||||||
/* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */
|
/* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */
|
||||||
extern const int32_t ff_vc1_dqscale[63];
|
extern const int32_t ff_vc1_dqscale[63];
|
||||||
|
|
Loading…
Reference in New Issue