RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dnxhddata: Deduplicate cid 1256 chroma 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.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Christophe Gisquet 2015-10-01 16:54:57 +02:00 committed by Vittorio Giovara
parent 1fb63d6f43
commit e54d7e4e8e
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/dnxhddata.c
View File

@ -37,6 +37,7 @@ static const uint8_t dnxhd_1235_luma_weight[] = {
50, 50, 53, 55, 55, 56, 60, 60, 50, 50, 53, 55, 55, 56, 60, 60,
}; };
/* Used in CID 1235, 1256 */
static const uint8_t dnxhd_1235_chroma_weight[] = { static const uint8_t dnxhd_1235_chroma_weight[] = {
0, 32, 33, 34, 34, 33, 34, 35, 0, 32, 33, 34, 34, 33, 34, 35,
37, 40, 43, 42, 39, 38, 39, 41, 37, 40, 43, 42, 39, 38, 39, 41,
@ -228,17 +229,6 @@ static const uint8_t dnxhd_1252_chroma_weight[] = {
114, 128, 125, 129, 134, 125, 116, 116, 114, 128, 125, 129, 134, 125, 116, 116,
}; };
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_1260_luma_weight[] = { static const uint8_t dnxhd_1260_luma_weight[] = {
0, 32, 33, 34, 36, 37, 37, 36, 0, 32, 33, 34, 36, 37, 37, 36,
34, 33, 34, 35, 37, 38, 40, 41, 34, 33, 34, 35, 37, 38, 40, 41,
@ -1156,7 +1146,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run, dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
{ 36, 45, 75, 90 } }, { 36, 45, 75, 90 } },
{ 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10,
dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight, dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight,
dnxhd_1235_dc_codes, dnxhd_1235_dc_bits, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag, dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag,