summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddata.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2014-01-27 18:10:44 +0000
committerLuca Barbato <lu_zero@gentoo.org>2014-02-09 19:53:35 +0100
commite95018b694c0774477abec5bbf86ecc7946a9a28 (patch)
treeceb1ef65be32b959410d967cad64041894061e06 /libavcodec/dnxhddata.c
parent2f6eec65acc953faed3951fb8f1eabed830fdd2f (diff)
dnxhd: Support DNx444
Bug-Id: 99 Bug-Id: videolan/9620 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/dnxhddata.c')
-rw-r--r--libavcodec/dnxhddata.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 96895daf62..a8d713b45f 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -220,6 +220,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,
};
@@ -1133,6 +1144,13 @@ const CIDEntry ff_dnxhd_cid_table[] = {
dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag,
dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
{ 36, 45, 75, 90 } },
+ { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10,
+ 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_run_flag, dnxhd_1235_1241_ac_index_flag,
+ dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run,
+ { 350, 390, 440, 730, 880 } },
};
int ff_dnxhd_get_cid_table(int cid)