|
|
|
@ -282,14 +282,6 @@ static const uint8_t dnxhd_1241_ac_index_flag[257] = { |
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static const uint16_t dnxhd_1241_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, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static const uint8_t dnxhd_1241_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_1241_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, |
|
|
|
|
}; |
|
|
|
@ -346,15 +338,6 @@ static const uint8_t dnxhd_1252_ac_run_flag[257] = { |
|
|
|
|
static const uint8_t dnxhd_1252_ac_index_flag[257] = { |
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
|
|
|
|
}; |
|
|
|
|
static const uint16_t dnxhd_1252_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_1252_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_1252_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[] = { |
|
|
|
|
{ 1237, 1920, 1080, 0, 606208, 606208, 4, 8, |
|
|
|
@ -376,7 +359,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { |
|
|
|
|
dnxhd_1241_dc_codes, dnxhd_1241_dc_bits, |
|
|
|
|
dnxhd_1241_ac_codes, dnxhd_1241_ac_bits, dnxhd_1241_ac_level, |
|
|
|
|
dnxhd_1241_ac_run_flag, dnxhd_1241_ac_index_flag, |
|
|
|
|
dnxhd_1241_run_codes, dnxhd_1241_run_bits, dnxhd_1241_run, |
|
|
|
|
dnxhd_1238_run_codes, dnxhd_1238_run_bits, dnxhd_1241_run, |
|
|
|
|
{ 185, 220 } }, |
|
|
|
|
{ 1242, 1920, 1080, 1, 606208, 303104, 4, 8, |
|
|
|
|
dnxhd_1242_luma_weight, dnxhd_1242_chroma_weight, |
|
|
|
@ -404,7 +387,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { |
|
|
|
|
dnxhd_1252_dc_codes, dnxhd_1252_dc_bits, |
|
|
|
|
dnxhd_1252_ac_codes, dnxhd_1252_ac_bits, dnxhd_1252_ac_level, |
|
|
|
|
dnxhd_1252_ac_run_flag, dnxhd_1252_ac_index_flag, |
|
|
|
|
dnxhd_1252_run_codes, dnxhd_1252_run_bits, dnxhd_1252_run, |
|
|
|
|
dnxhd_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run, |
|
|
|
|
{ 60, 75, 115, 145 } }, |
|
|
|
|
{ 1253, 1920, 1080, 0, 188416, 188416, 4, 8, |
|
|
|
|
dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight, |
|
|
|
|