RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dnxhddata: Keep a single CID in the table names 

Use a comment to list the reused tables, since it's more flexible than a
table name to keep information like this. The list will expand in later
commits.
This commit is contained in:
Vittorio Giovara 2015-07-30 15:55:33 +01:00
parent e23f84d965
commit fdd021884d
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libavcodec/dnxhddata.c
View File

@ -526,7 +526,8 @@ static const uint8_t dnxhd_1238_ac_index_flag[257] = {
1, 1,
}; };
static const uint16_t dnxhd_1235_1238_1241_run_codes[62] = { /* Used in CID 1235, 1238, 1241 */
static const uint16_t dnxhd_1235_run_codes[62] = {
0, 4, 10, 11, 24, 25, 26, 27, 0, 4, 10, 11, 24, 25, 26, 27,
56, 57, 58, 59, 120, 242, 486, 487, 56, 57, 58, 59, 120, 242, 486, 487,
488, 489, 980, 981, 982, 983, 984, 985, 488, 489, 980, 981, 982, 983, 984, 985,
@ -537,7 +538,8 @@ static const uint16_t dnxhd_1235_1238_1241_run_codes[62] = {
1018, 1019, 1020, 1021, 1022, 1023, 1018, 1019, 1020, 1021, 1022, 1023,
}; };
static const uint8_t dnxhd_1235_1238_1241_run_bits[62] = { /* Used in CID 1235, 1238, 1241 */
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, 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, 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,
@ -551,15 +553,18 @@ static const uint8_t dnxhd_1238_run[62] = {
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
}; };
static const uint8_t dnxhd_1235_1241_dc_codes[14] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_dc_codes[14] = {
10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127, 10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127,
}; };
static const uint8_t dnxhd_1235_1241_dc_bits[14] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_dc_bits[14] = {
4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7, 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7,
}; };
static const uint16_t dnxhd_1235_1241_ac_codes[257] = { /* Used in CID 1235, 1241 */
static const uint16_t dnxhd_1235_ac_codes[257] = {
0, 1, 4, 10, 11, 24, 25, 26, 0, 1, 4, 10, 11, 24, 25, 26,
54, 55, 56, 57, 116, 117, 118, 119, 54, 55, 56, 57, 116, 117, 118, 119,
240, 241, 242, 243, 244, 245, 492, 493, 240, 241, 242, 243, 244, 245, 492, 493,
@ -595,7 +600,8 @@ static const uint16_t dnxhd_1235_1241_ac_codes[257] = {
65535, 65535,
}; };
static const uint8_t dnxhd_1235_1241_ac_bits[257] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_ac_bits[257] = {
2, 2, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 2, 2, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@ -615,7 +621,8 @@ static const uint8_t dnxhd_1235_1241_ac_bits[257] = {
16, 16,
}; };
static const uint8_t dnxhd_1235_1241_ac_level[257] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_ac_level[257] = {
1, 1, 2, 3, 0, 4, 5, 2, 6, 7, 8, 3, 9, 10, 11, 4, 1, 1, 2, 3, 0, 4, 5, 2, 6, 7, 8, 3, 9, 10, 11, 4,
12, 13, 14, 15, 16, 5, 17, 18, 19, 20, 21, 6, 7, 22, 23, 24, 12, 13, 14, 15, 16, 5, 17, 18, 19, 20, 21, 6, 7, 22, 23, 24,
25, 26, 27, 28, 29, 8, 9, 30, 31, 32, 33, 34, 35, 36, 37, 38, 25, 26, 27, 28, 29, 8, 9, 30, 31, 32, 33, 34, 35, 36, 37, 38,
@ -635,7 +642,8 @@ static const uint8_t dnxhd_1235_1241_ac_level[257] = {
64, 64,
}; };
static const uint8_t dnxhd_1235_1241_ac_run_flag[257] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_ac_run_flag[257] = {
0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -655,7 +663,8 @@ static const uint8_t dnxhd_1235_1241_ac_run_flag[257] = {
1, 1,
}; };
static const uint8_t dnxhd_1235_1241_ac_index_flag[257] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -675,7 +684,8 @@ static const uint8_t dnxhd_1235_1241_ac_index_flag[257] = {
1, 1,
}; };
static const uint8_t dnxhd_1235_1241_run[62] = { /* Used in CID 1235, 1241 */
static const uint8_t dnxhd_1235_run[62] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 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, 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, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
@ -1106,10 +1116,10 @@ static const uint8_t dnxhd_1258_dc_bits[14] = {
const CIDEntry ff_dnxhd_cid_table[] = { const CIDEntry ff_dnxhd_cid_table[] = {
{ 1235, 1920, 1080, 0, 917504, 917504, 6, 10, { 1235, 1920, 1080, 0, 917504, 917504, 6, 10,
dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight, dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight,
dnxhd_1235_1241_dc_codes, dnxhd_1235_1241_dc_bits, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
dnxhd_1235_1241_ac_codes, dnxhd_1235_1241_ac_bits, dnxhd_1235_1241_ac_level, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
dnxhd_1235_1241_ac_run_flag, dnxhd_1235_1241_ac_index_flag, dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag,
dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1235_run,
{ 175, 185, 365, 440 } }, { 175, 185, 365, 440 } },
{ 1237, 1920, 1080, 0, 606208, 606208, 4, 8, { 1237, 1920, 1080, 0, 606208, 606208, 4, 8,
dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight, dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight,
@ -1123,14 +1133,14 @@ const CIDEntry ff_dnxhd_cid_table[] = {
dnxhd_1238_dc_codes, dnxhd_1238_dc_bits, dnxhd_1238_dc_codes, dnxhd_1238_dc_bits,
dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1238_run, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run,
{ 175, 185, 220, 365, 440 } }, { 175, 185, 220, 365, 440 } },
{ 1241, 1920, 1080, 1, 917504, 458752, 6, 10, { 1241, 1920, 1080, 1, 917504, 458752, 6, 10,
dnxhd_1241_luma_weight, dnxhd_1241_chroma_weight, dnxhd_1241_luma_weight, dnxhd_1241_chroma_weight,
dnxhd_1235_1241_dc_codes, dnxhd_1235_1241_dc_bits, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
dnxhd_1235_1241_ac_codes, dnxhd_1235_1241_ac_bits, dnxhd_1235_1241_ac_level, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
dnxhd_1235_1241_ac_run_flag, dnxhd_1235_1241_ac_index_flag, dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag,
dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1235_run,
{ 185, 220 } }, { 185, 220 } },
{ 1242, 1920, 1080, 1, 606208, 303104, 4, 8, { 1242, 1920, 1080, 1, 606208, 303104, 4, 8,
dnxhd_1242_luma_weight, dnxhd_1242_chroma_weight, dnxhd_1242_luma_weight, dnxhd_1242_chroma_weight,
@ -1144,7 +1154,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
dnxhd_1238_dc_codes, dnxhd_1238_dc_bits, dnxhd_1238_dc_codes, dnxhd_1238_dc_bits,
dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1238_run, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run,
{ 185, 220 } }, { 185, 220 } },
{ 1250, 1280, 720, 0, 458752, 458752, 6, 10, { 1250, 1280, 720, 0, 458752, 458752, 6, 10,
dnxhd_1250_luma_weight, dnxhd_1250_chroma_weight, dnxhd_1250_luma_weight, dnxhd_1250_chroma_weight,
@ -1176,10 +1186,10 @@ const CIDEntry ff_dnxhd_cid_table[] = {
{ 36, 45, 75, 90 } }, { 36, 45, 75, 90 } },
{ 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10,
dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight, dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight,
dnxhd_1235_1241_dc_codes, dnxhd_1235_1241_dc_bits, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
dnxhd_1235_1241_ac_codes, dnxhd_1235_1241_ac_bits, dnxhd_1235_1241_ac_level, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
dnxhd_1235_1241_ac_run_flag, dnxhd_1235_1241_ac_index_flag, dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag,
dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1235_run,
{ 350, 390, 440, 730, 880 } }, { 350, 390, 440, 730, 880 } },
{ 1258, 960, 720, 0, 212992, 212992, 4, 8, { 1258, 960, 720, 0, 212992, 212992, 4, 8,
dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight, dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight,