diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 03:42:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 03:42:06 +0100 |
| commit | 51290068fa12995f68cff0ee309064f4cf6e788d (patch) | |
| tree | a90a1167763c86e0c2451b38468c491da50be025 /libavcodec/dnxhddata.c | |
| parent | d84f1a60e07cf78c4b4092ce00e6e6a2c751ea7a (diff) | |
| parent | e95018b694c0774477abec5bbf86ecc7946a9a28 (diff) | |
| download | ffmpeg-51290068fa12995f68cff0ee309064f4cf6e788d.tar.gz | |
Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'
* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
dnxhd: Support DNx444
Conflicts:
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddata.c')
| -rw-r--r-- | libavcodec/dnxhddata.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 669b8067e9..80f5337288 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -222,6 +222,17 @@ 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, 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_1237_dc_codes[12] = { 0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, }; @@ -1026,6 +1037,14 @@ const CIDEntry ff_dnxhd_cid_table[] = { dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run, { 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_1241_dc_codes, dnxhd_1235_1241_dc_bits, + dnxhd_1235_1241_ac_codes, dnxhd_1235_1241_ac_bits, dnxhd_1235_1241_ac_level, + dnxhd_1235_1241_ac_flags, + dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run, + { 350, 390, 440, 730, 880 }, + { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } }, }; int ff_dnxhd_get_cid_table(int cid) |