From 428424fe75206753ab2039e624031c9643623ea0 Mon Sep 17 00:00:00 2001 From: Jeremy James Date: Fri, 25 Sep 2015 18:57:18 +0200 Subject: [PATCH] dnxhddata: correct weight tables CID 1260 (as evidenced by incorrect decoding of a sample from ticket 4876) seems to use incorrect weight tables. It appears those tables were not zigzag-scanned. Apply zigzag on weight tables for new CIDs 1258, 1259, and 1260, and fix an incorrect chroma table for CID 1256. Fixes last issue from ticket #4876. Found-by: Christophe Gisquet Signed-off-by: Christophe Gisquet Signed-off-by: Michael Niedermayer --- libavcodec/dnxhddata.c | 103 +++++++++++++---------------------------- 1 file changed, 31 insertions(+), 72 deletions(-) diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 9d2e4e888d..cc304e4eee 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -48,7 +48,7 @@ static const uint8_t dnxhd_1235_chroma_weight[] = { 90, 90, 85, 79, 73, 73, 73, 73, }; -/* Used in CID 1237, 1253 */ +/* Used in CID 1237, 1253, 1259 */ static const uint8_t dnxhd_1237_luma_weight[] = { 0, 32, 33, 34, 34, 36, 37, 36, 36, 37, 38, 38, 38, 39, 41, 44, @@ -60,7 +60,7 @@ static const uint8_t dnxhd_1237_luma_weight[] = { 97, 100, 104, 102, 98, 98, 99, 99, }; -/* Used in CID 1237, 1253 */ +/* Used in CID 1237, 1253, 1259 */ static const uint8_t dnxhd_1237_chroma_weight[] = { 0, 32, 36, 39, 39, 38, 39, 41, 45, 51, 57, 58, 53, 48, 47, 51, @@ -204,6 +204,7 @@ static const uint8_t dnxhd_1251_chroma_weight[] = { 61, 59, 59, 59, 61, 62, 62, 62, }; +/* Used in CID 1252, 1258 */ static const uint8_t dnxhd_1252_luma_weight[] = { 0, 32, 34, 35, 36, 36, 36, 37, 36, 37, 39, 40, 41, 40, 40, 40, @@ -214,6 +215,8 @@ static const uint8_t dnxhd_1252_luma_weight[] = { 71, 82, 90, 90, 88, 87, 90, 95, 100, 107, 103, 97, 95, 93, 99, 99, }; + +/* Used in CID 1252, 1258 */ static const uint8_t dnxhd_1252_chroma_weight[] = { 0, 32, 35, 36, 37, 37, 38, 40, 42, 46, 49, 50, 50, 49, 49, 53, @@ -226,80 +229,36 @@ static const uint8_t dnxhd_1252_chroma_weight[] = { }; static const uint8_t dnxhd_1256_chroma_weight[] = { - 0, 32, 32, 32, 32, 32, 32, 33, - 32, 32, 32, 32, 32, 32, 32, 34, - 32, 32, 32, 32, 32, 32, 33, 37, - 32, 32, 32, 32, 32, 32, 36, 39, - 32, 32, 32, 32, 32, 34, 39, 44, - 32, 37, 32, 32, 35, 40, 43, 49, - 32, 33, 36, 36, 40, 43, 50, 60, - 34, 37, 39, 44, 51, 56, 61, 70, -}; - -static const uint8_t dnxhd_1258_luma_weight[] = { - 0, 32, 36, 36, 40, 40, 55, 60, - 34, 36, 37, 40, 41, 48, 57, 82, - 35, 36, 41, 41, 46, 52, 73, 82, - 37, 40, 42, 45, 50, 65, 80, 87, - 39, 41, 44, 49, 62, 78, 88, 90, - 41, 44, 49, 58, 73, 90, 95, 95, - 43, 52, 55, 68, 90, 100, 97, 93, - 52, 53, 71, 82, 107, 103, 99, 99, -}; - -static const uint8_t dnxhd_1258_chroma_weight[] = { - 0, 32, 37, 38, 49, 53, 65, 66, - 35, 37, 40, 49, 56, 64, 65, 82, - 36, 42, 50, 56, 64, 67, 73, 85, - 46, 50, 57, 63, 71, 72, 89, 87, - 49, 58, 65, 72, 78, 88, 88, 90, - 60, 64, 74, 81, 84, 90, 95, 134, - 62, 74, 77, 80, 90, 114, 129, 125, - 74, 74, 90, 100, 128, 125, 116, 116, -}; - -static const uint8_t dnxhd_1259_luma_weight[] = { - 0, 32, 36, 37, 41, 44, 54, 60, - 33, 34, 36, 39, 43, 51, 62, 78, - 34, 36, 38, 41, 49, 59, 73, 79, - 37, 38, 40, 47, 55, 66, 80, 95, - 38, 41, 46, 54, 63, 79, 93, 96, - 46, 47, 56, 64, 78, 90, 97, 98, - 49, 58, 66, 78, 89, 97, 102, 98, - 61, 65, 82, 87, 100, 104, 99, 99, -}; - -static const uint8_t dnxhd_1259_chroma_weight[] = { - 0, 32, 38, 39, 47, 51, 77, 83, - 36, 39, 41, 48, 55, 74, 85, 95, - 39, 45, 53, 58, 72, 83, 105, 89, - 51, 58, 66, 73, 82, 109, 92, 95, - 57, 75, 78, 89, 105, 95, 93, 96, - 81, 82, 99, 99, 94, 90, 97, 98, - 83, 96, 97, 93, 89, 97, 102, 98, - 90, 94, 92, 88, 100, 104, 99, 99, + 0, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 37, 32, + 32, 32, 32, 32, 33, 32, 32, 32, + 32, 32, 33, 34, 37, 36, 32, 32, + 32, 33, 34, 37, 36, 34, 35, 36, + 39, 44, 40, 40, 39, 39, 44, 43, + 43, 51, 56, 50, 49, 60, 61, 70, }; static const uint8_t dnxhd_1260_luma_weight[] = { - 0, 32, 37, 37, 40, 41, 52, 53, - 33, 36, 36, 38, 40, 48, 49, 52, - 34, 34, 37, 39, 44, 47, 49, 54, - 33, 35, 38, 40, 45, 46, 54, 51, - 34, 37, 37, 42, 44, 49, 52, 48, - 34, 34, 38, 43, 44, 51, 50, 50, - 33, 36, 41, 44, 51, 52, 50, 54, - 36, 38, 44, 47, 53, 53, 54, 54, + 0, 32, 33, 34, 36, 37, 37, 36, + 34, 33, 34, 35, 37, 38, 40, 41, + 40, 39, 38, 37, 34, 33, 34, 37, + 40, 44, 48, 52, 53, 49, 47, 45, + 42, 38, 36, 36, 38, 41, 43, 44, + 46, 49, 52, 54, 54, 49, 44, 44, + 44, 47, 51, 51, 52, 51, 48, 50, + 52, 53, 53, 50, 50, 54, 54, 54, }; static const uint8_t dnxhd_1260_chroma_weight[] = { - 0, 32, 40, 38, 42, 40, 45, 45, - 34, 42, 36, 43, 38, 46, 46, 49, - 38, 35, 43, 39, 44, 47, 47, 49, - 35, 42, 43, 42, 46, 47, 49, 52, - 38, 43, 43, 44, 50, 49, 56, 50, - 42, 43, 44, 50, 51, 57, 52, 53, - 41, 45, 46, 53, 53, 56, 53, 54, - 46, 46, 51, 49, 56, 53, 58, 58, + 0, 32, 34, 38, 42, 40, 38, 36, + 35, 35, 38, 42, 43, 43, 42, 40, + 38, 39, 43, 43, 42, 41, 43, 43, + 42, 44, 46, 45, 45, 46, 47, 46, + 44, 44, 45, 46, 46, 46, 50, 50, + 47, 47, 49, 49, 49, 49, 51, 53, + 51, 49, 53, 57, 56, 52, 50, 52, + 56, 56, 53, 53, 53, 54, 58, 58, }; /* Used in CID 1235, 1241, 1250, 1256 */ @@ -1090,14 +1049,14 @@ const CIDEntry ff_dnxhd_cid_table[] = { { 350, 390, 440, 730, 880 }, { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } }, { 1258, 960, 720, 0, 212992, 212992, 4, 8, 5, - dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight, + dnxhd_1252_luma_weight, dnxhd_1252_chroma_weight, dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, dnxhd_1252_ac_codes, dnxhd_1252_ac_bits, dnxhd_1252_ac_level, dnxhd_1252_ac_flags, dnxhd_1250_run_codes, dnxhd_1250_run_bits, dnxhd_1250_run, { 42, 60, 75, 115 } }, { 1259, 1440, 1080, 0, 417792, 417792, 4, 8, 3, - dnxhd_1259_luma_weight, dnxhd_1259_chroma_weight, + dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight, dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level, dnxhd_1237_ac_flags,