From 403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 30 Jul 2015 15:55:36 +0100 Subject: dnxhddata: Merge a few duplicated DC tables --- libavcodec/dnxhddata.c | 62 ++++++++------------------------------------------ 1 file changed, 10 insertions(+), 52 deletions(-) (limited to 'libavcodec/dnxhddata.c') diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index de894103f9..dc38bb82bf 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -256,68 +256,26 @@ static const uint8_t dnxhd_1258_chroma_weight[] = { 74, 74, 90, 100, 128, 125, 116, 116, }; -/* Used in CID 1235, 1241, 1256 */ +/* Used in CID 1235, 1241, 1250, 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 */ +/* Used in CID 1235, 1241, 1250, 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 */ +/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258 */ static const uint8_t dnxhd_1237_dc_codes[12] = { 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, }; -/* Used in CID 1237, 1242, 1253 */ +/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258 */ 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, @@ -1160,7 +1118,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { { 115, 120, 145, 240, 290 } }, { 1238, 1920, 1080, 0, 917504, 917504, 4, 8, dnxhd_1238_luma_weight, dnxhd_1238_chroma_weight, - dnxhd_1238_dc_codes, dnxhd_1238_dc_bits, + dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run, @@ -1181,28 +1139,28 @@ const CIDEntry ff_dnxhd_cid_table[] = { { 120, 145 } }, { 1243, 1920, 1080, 1, 917504, 458752, 4, 8, dnxhd_1243_luma_weight, dnxhd_1243_chroma_weight, - dnxhd_1238_dc_codes, dnxhd_1238_dc_bits, + dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run, { 185, 220 } }, { 1250, 1280, 720, 0, 458752, 458752, 6, 10, dnxhd_1250_luma_weight, dnxhd_1250_chroma_weight, - dnxhd_1250_dc_codes, dnxhd_1250_dc_bits, + dnxhd_1235_dc_codes, dnxhd_1235_dc_bits, dnxhd_1250_ac_codes, dnxhd_1250_ac_bits, dnxhd_1250_ac_level, dnxhd_1250_ac_run_flag, dnxhd_1250_ac_index_flag, dnxhd_1250_run_codes, dnxhd_1250_run_bits, dnxhd_1250_run, { 90, 180, 220 } }, { 1251, 1280, 720, 0, 458752, 458752, 4, 8, dnxhd_1251_luma_weight, dnxhd_1251_chroma_weight, - dnxhd_1251_dc_codes, dnxhd_1251_dc_bits, + dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, dnxhd_1251_ac_codes, dnxhd_1251_ac_bits, dnxhd_1251_ac_level, dnxhd_1251_ac_run_flag, dnxhd_1251_ac_index_flag, dnxhd_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run, { 90, 110, 175, 220 } }, { 1252, 1280, 720, 0, 303104, 303104, 4, 8, dnxhd_1252_luma_weight, dnxhd_1252_chroma_weight, - dnxhd_1252_dc_codes, dnxhd_1252_dc_bits, + dnxhd_1237_dc_codes, dnxhd_1237_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_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run, @@ -1223,7 +1181,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { { 350, 390, 440, 730, 880 } }, { 1258, 960, 720, 0, 212992, 212992, 4, 8, dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight, - dnxhd_1258_dc_codes, dnxhd_1258_dc_bits, + dnxhd_1237_dc_codes, dnxhd_1237_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_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run, -- cgit v1.2.3