From 5e129ed655bff5b6d90355c0b713d7aaba3898ec Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 30 Jul 2015 15:55:35 +0100 Subject: dnxhddata: Group together DC-related tables This helps in finding duplicates. --- libavcodec/dnxhddata.c | 102 +++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 50 deletions(-) (limited to 'libavcodec/dnxhddata.c') diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index e53d4f6da6..de894103f9 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -256,6 +256,16 @@ static const uint8_t dnxhd_1258_chroma_weight[] = { 74, 74, 90, 100, 128, 125, 116, 116, }; +/* Used in CID 1235, 1241, 1256 */ +static const uint8_t dnxhd_1235_dc_codes[14] = { + 10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127, +}; + +/* Used in CID 1235, 1241, 1256 */ +static const uint8_t dnxhd_1235_dc_bits[14] = { + 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7, +}; + /* Used in CID 1237, 1242, 1253 */ static const uint8_t dnxhd_1237_dc_codes[12] = { 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, @@ -266,6 +276,48 @@ static const uint8_t dnxhd_1237_dc_bits[12] = { 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, }; +/* Used in CID 1238, 1243 */ +static const uint8_t dnxhd_1238_dc_codes[12] = { + 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, +}; + +/* Used in CID 1238, 1243 */ +static const uint8_t dnxhd_1238_dc_bits[12] = { + 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, +}; + +static const uint8_t dnxhd_1250_dc_codes[14] = { + 10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127 +}; + +static const uint8_t dnxhd_1250_dc_bits[14] = { + 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7 +}; + +static const uint8_t dnxhd_1251_dc_codes[12] = { + 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, +}; + +static const uint8_t dnxhd_1251_dc_bits[12] = { + 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, +}; + +static const uint8_t dnxhd_1252_dc_codes[12] = { + 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, +}; + +static const uint8_t dnxhd_1252_dc_bits[12] = { + 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, +}; + +static const uint8_t dnxhd_1258_dc_codes[14] = { + 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, 0, 0, +}; + +static const uint8_t dnxhd_1258_dc_bits[14] = { + 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, 0, 0, +}; + /* Used in CID 1237, 1242, 1253 */ static const uint16_t dnxhd_1237_ac_codes[257] = { 0, 1, 4, 5, 12, 26, 27, 56, @@ -415,16 +467,6 @@ static const uint8_t dnxhd_1237_run[62] = { 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 56, }; -/* Used in CID 1238, 1243 */ -static const uint8_t dnxhd_1238_dc_codes[12] = { - 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, -}; - -/* Used in CID 1238, 1243 */ -static const uint8_t dnxhd_1238_dc_bits[12] = { - 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, -}; - /* Used in CID 1238, 1243 */ static const uint16_t dnxhd_1238_ac_codes[257] = { 0, 1, 4, 10, 11, 24, 25, 26, @@ -573,16 +615,6 @@ static const uint8_t dnxhd_1238_run[62] = { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, }; -/* Used in CID 1235, 1241, 1256 */ -static const uint8_t dnxhd_1235_dc_codes[14] = { - 10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127, -}; - -/* Used in CID 1235, 1241, 1256 */ -static const uint8_t dnxhd_1235_dc_bits[14] = { - 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7, -}; - /* Used in CID 1235, 1241, 1256 */ static const uint16_t dnxhd_1235_ac_codes[257] = { 0, 1, 4, 10, 11, 24, 25, 26, @@ -712,12 +744,6 @@ static const uint8_t dnxhd_1235_run[62] = { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, }; -static const uint8_t dnxhd_1250_dc_codes[14] = { - 10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127 -}; -static const uint8_t dnxhd_1250_dc_bits[14] = { - 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7 -}; 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, @@ -852,14 +878,6 @@ static const uint8_t dnxhd_1250_run[62] = { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62 }; -static const uint8_t dnxhd_1251_dc_codes[12] = { - 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, -}; - -static const uint8_t dnxhd_1251_dc_bits[12] = { - 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, -}; - static const uint16_t dnxhd_1251_ac_codes[257] = { 0, 1, 4, 10, 11, 24, 25, 26, 54, 55, 56, 57, 116, 117, 118, 119, @@ -1004,14 +1022,6 @@ static const uint8_t dnxhd_1251_run[62] = { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, }; -static const uint8_t dnxhd_1252_dc_codes[12] = { - 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, -}; - -static const uint8_t dnxhd_1252_dc_bits[12] = { - 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, -}; - /* Used in CID 1252, 1258 */ static const uint16_t dnxhd_1252_ac_codes[257] = { 0, 1, 4, 10, 11, 12, 26, 27, @@ -1133,14 +1143,6 @@ static const uint8_t dnxhd_1252_ac_index_flag[257] = { 1, }; -static const uint8_t dnxhd_1258_dc_codes[14] = { - 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, 0, 0, -}; - -static const uint8_t dnxhd_1258_dc_bits[14] = { - 3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, 0, 0, -}; - const CIDEntry ff_dnxhd_cid_table[] = { { 1235, 1920, 1080, 0, 917504, 917504, 6, 10, dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight, -- cgit v1.2.3