Re: [FFmpeg-devel] [PATCH 6/7] dnxhddata: deduplicate table

2015-09-29 Thread Michael Niedermayer 
On Tue, Sep 29, 2015 at 08:29:32PM +0200, Christophe Gisquet wrote:
> 2015-09-28 11:21 GMT+02:00 Christophe Gisquet :
> > 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

>  dnxhddata.c |   13 +
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 5384571f8a8554e84b3eb12b6c2c32b2043bd4b6  
> 0001-dnxhddata-deduplicate-table.patch
> From bfbb0bdde4eee8d44d9c158e04b50fb4177c428f Mon Sep 17 00:00:00 2001
> From: Christophe Gisquet 
> 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(-)

applied

thanks

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is what and why we do it that matters, not just one of them.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 6/7] dnxhddata: deduplicate table

2015-09-29 Thread Christophe Gisquet 
2015-09-28 11:21 GMT+02:00 Christophe Gisquet :
> 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 
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 }, { 3, 1001 }, { 50, 1 }, { 6, 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

Re: [FFmpeg-devel] [PATCH 6/7] dnxhddata: deduplicate table

2015-09-28 Thread Christophe Gisquet 
Hi,

2015-09-27 10:09 GMT+02:00 Christophe Gisquet :
> CID 1256 chroma table is the same as luma table for CID 1235 and 1256,
> which is consistent with the content being (normally) RGB.

Please ignore for now.

-- 
Christophe
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 6/7] dnxhddata: deduplicate table

2015-09-27 Thread Christophe Gisquet 
CID 1256 chroma table is the same as luma table for CID 1235 and 1256,
which is consistent with the content being (normally) RGB.

CID 1244 weight tables are identica to CID 1244, but as this was not
tested against a real sample, it was not added.
---
 libavcodec/dnxhddata.c | 16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index cc304e4..2fbc162 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -25,7 +25,7 @@
 
 /* The quantization tables below are in zigzag order! */
 
-/* Used in CID 1235, 1256 */
+/* Used in CID 1235, 1256 luma/chroma*/
 static const uint8_t dnxhd_1235_luma_weight[] = {
  0, 32, 32, 32, 33, 32, 32, 32,
 32, 31, 32, 33, 33, 33, 33, 35,
@@ -228,17 +228,7 @@ 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,
-};
-
+/* Also used in CID 1244, but not yet implemented */
 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 +1031,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
   { 36, 36, 45, 75, 90 },
   { { 24000, 1001 }, { 25, 1 }, { 3, 1001 }, { 50, 1 }, { 6, 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