2015-09-28 11:21 GMT+02:00 Christophe Gisquet <christophe.gisq...@gmail.com>:
> Please ignore for now.
The specs explicitly says it is the same for luma and chroma. Here's a
patch that confidently reflects that.
--
Christophe
From bfbb0bdde4eee8d44d9c158e04b50fb4177c428f Mon Sep 17 00:00:00 2001
From: Christophe Gisquet <christophe.gisq...@gmail.com>
Date: Mon, 28 Sep 2015 17:30:55 +0200
Subject: [PATCH 1/9] dnxhddata: deduplicate table
CID 1256 is specified as using the same table for luma and chroma,
which is the same as CID 1235 luma table. This is consistent with
the format supposedly being RGB, although most sequences seem to
actually be YCbCr-encoded.
---
libavcodec/dnxhddata.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index cc304e4..0cbc57b 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -228,17 +228,6 @@ static const uint8_t dnxhd_1252_chroma_weight[] = {
114, 128, 125, 129, 134, 125, 116, 116,
};
-static const uint8_t dnxhd_1256_chroma_weight[] = {
- 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, 33, 34, 36, 37, 37, 36,
34, 33, 34, 35, 37, 38, 40, 41,
@@ -1041,7 +1030,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
{ 36, 36, 45, 75, 90 },
{ { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
{ 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, 4,
- dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight,
+ dnxhd_1235_luma_weight, dnxhd_1235_luma_weight,
dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
dnxhd_1235_ac_flags,
--
2.5.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
