Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'
* commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc': dnxhddata: Group together RUN-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
commit
f19a283867
@ -377,34 +377,6 @@ static const uint8_t dnxhd_1237_ac_flags[257] = {
|
||||
3,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint16_t dnxhd_1237_run_codes[62] = {
|
||||
0, 4, 10, 11, 24, 25, 26, 54,
|
||||
55, 56, 57, 58, 118, 119, 240, 482,
|
||||
483, 484, 485, 486, 487, 488, 489, 490,
|
||||
491, 492, 493, 494, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint8_t dnxhd_1237_run_bits[62] = {
|
||||
1, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 8, 9,
|
||||
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint8_t dnxhd_1237_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 53, 57, 58, 59, 60, 61, 62, 22, 23, 24, 25,
|
||||
26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 56,
|
||||
};
|
||||
|
||||
/* Used in CID 1238, 1243 */
|
||||
static const uint16_t dnxhd_1238_ac_codes[257] = {
|
||||
0, 1, 4, 10, 11, 24, 25, 26,
|
||||
@ -504,33 +476,6 @@ static const uint8_t dnxhd_1238_ac_flags[257] = {
|
||||
3,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1238, 1241, 1256 */
|
||||
static const uint16_t dnxhd_1235_run_codes[62] = {
|
||||
0, 4, 10, 11, 24, 25, 26, 27,
|
||||
56, 57, 58, 59, 120, 242, 486, 487,
|
||||
488, 489, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1238, 1241, 1243, 1256 */
|
||||
static const uint8_t dnxhd_1235_run_bits[62] = {
|
||||
1, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 8, 9, 9,
|
||||
9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
static const uint8_t dnxhd_1238_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1241, 1256 */
|
||||
static const uint16_t dnxhd_1235_ac_codes[257] = {
|
||||
0, 1, 4, 10, 11, 24, 25, 26,
|
||||
@ -631,14 +576,6 @@ static const uint8_t dnxhd_1235_ac_flags[257] = {
|
||||
3,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1241, 1256 */
|
||||
static const uint8_t dnxhd_1235_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
18, 20, 17, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
static const uint16_t dnxhd_1250_ac_codes[257] = {
|
||||
0, 1, 4, 10, 11, 24, 25, 26,
|
||||
54, 55, 56, 57, 116, 117, 118, 119,
|
||||
@ -731,28 +668,6 @@ static const uint8_t dnxhd_1250_ac_flags[257] = {
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3,
|
||||
};
|
||||
static const uint16_t dnxhd_1250_run_codes[62] = {
|
||||
0, 4, 5, 12, 26, 27, 28, 58,
|
||||
118, 119, 120, 242, 486, 487, 976, 977,
|
||||
978, 979, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023
|
||||
};
|
||||
static const uint8_t dnxhd_1250_run_bits[62] = {
|
||||
1, 3, 3, 4, 5, 5, 5, 6, 7, 7, 7, 8, 9, 9, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10
|
||||
};
|
||||
static const uint8_t dnxhd_1250_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62
|
||||
};
|
||||
|
||||
static const uint16_t dnxhd_1251_ac_codes[257] = {
|
||||
0, 1, 4, 10, 11, 24, 25, 26,
|
||||
@ -850,34 +765,6 @@ static const uint8_t dnxhd_1251_ac_flags[257] = {
|
||||
3,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint16_t dnxhd_1251_run_codes[62] = {
|
||||
0, 4, 5, 12, 26, 27, 28, 58,
|
||||
118, 119, 120, 242, 486, 487, 976, 977,
|
||||
978, 979, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint8_t dnxhd_1251_run_bits[62] = {
|
||||
1, 3, 3, 4, 5, 5, 5, 6, 7, 7, 7, 8, 9, 9, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint8_t dnxhd_1251_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
/* Used in CID 1252, 1258 */
|
||||
static const uint16_t dnxhd_1252_ac_codes[257] = {
|
||||
0, 1, 4, 10, 11, 12, 26, 27,
|
||||
@ -977,6 +864,122 @@ static const uint8_t dnxhd_1252_ac_flags[257] = {
|
||||
3,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1238, 1241, 1256 */
|
||||
static const uint16_t dnxhd_1235_run_codes[62] = {
|
||||
0, 4, 10, 11, 24, 25, 26, 27,
|
||||
56, 57, 58, 59, 120, 242, 486, 487,
|
||||
488, 489, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1238, 1241, 1243, 1256 */
|
||||
static const uint8_t dnxhd_1235_run_bits[62] = {
|
||||
1, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 8, 9, 9,
|
||||
9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
/* Used in CID 1235, 1241, 1256 */
|
||||
static const uint8_t dnxhd_1235_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
18, 20, 17, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint16_t dnxhd_1237_run_codes[62] = {
|
||||
0, 4, 10, 11, 24, 25, 26, 54,
|
||||
55, 56, 57, 58, 118, 119, 240, 482,
|
||||
483, 484, 485, 486, 487, 488, 489, 490,
|
||||
491, 492, 493, 494, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint8_t dnxhd_1237_run_bits[62] = {
|
||||
1, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 8, 9,
|
||||
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
/* Used in CID 1237, 1242, 1253 */
|
||||
static const uint8_t dnxhd_1237_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 53, 57, 58, 59, 60, 61, 62, 22, 23, 24, 25,
|
||||
26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 56,
|
||||
};
|
||||
|
||||
static const uint8_t dnxhd_1238_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
static const uint16_t dnxhd_1250_run_codes[62] = {
|
||||
0, 4, 5, 12, 26, 27, 28, 58,
|
||||
118, 119, 120, 242, 486, 487, 976, 977,
|
||||
978, 979, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
static const uint8_t dnxhd_1250_run_bits[62] = {
|
||||
1, 3, 3, 4, 5, 5, 5, 6, 7, 7, 7, 8, 9, 9, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
static const uint8_t dnxhd_1250_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint16_t dnxhd_1251_run_codes[62] = {
|
||||
0, 4, 5, 12, 26, 27, 28, 58,
|
||||
118, 119, 120, 242, 486, 487, 976, 977,
|
||||
978, 979, 980, 981, 982, 983, 984, 985,
|
||||
986, 987, 988, 989, 990, 991, 992, 993,
|
||||
994, 995, 996, 997, 998, 999, 1000, 1001,
|
||||
1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
|
||||
1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
|
||||
1018, 1019, 1020, 1021, 1022, 1023,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint8_t dnxhd_1251_run_bits[62] = {
|
||||
1, 3, 3, 4, 5, 5, 5, 6, 7, 7, 7, 8, 9, 9, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||
};
|
||||
|
||||
/* Used in CID 1251, 1252, 1258 */
|
||||
static const uint8_t dnxhd_1251_run[62] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
|
||||
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
|
||||
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
};
|
||||
|
||||
const CIDEntry ff_dnxhd_cid_table[] = {
|
||||
{ 1235, 1920, 1080, 0, 917504, 917504, 6, 10, 4,
|
||||
dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user