* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
dnxhddata: Add tables for missing DNx100 profiles
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
... | ... |
@@ -258,6 +258,50 @@ static const uint8_t dnxhd_1258_chroma_weight[] = { |
258 | 258 |
74, 74, 90, 100, 128, 125, 116, 116, |
259 | 259 |
}; |
260 | 260 |
|
261 |
+static const uint8_t dnxhd_1259_luma_weight[] = { |
|
262 |
+ 0, 32, 36, 37, 41, 44, 54, 60, |
|
263 |
+ 33, 34, 36, 39, 43, 51, 62, 78, |
|
264 |
+ 34, 36, 38, 41, 49, 59, 73, 79, |
|
265 |
+ 37, 38, 40, 47, 55, 66, 80, 95, |
|
266 |
+ 38, 41, 46, 54, 63, 79, 93, 96, |
|
267 |
+ 46, 47, 56, 64, 78, 90, 97, 98, |
|
268 |
+ 49, 58, 66, 78, 89, 97, 102, 98, |
|
269 |
+ 61, 65, 82, 87, 100, 104, 99, 99, |
|
270 |
+}; |
|
271 |
+ |
|
272 |
+static const uint8_t dnxhd_1259_chroma_weight[] = { |
|
273 |
+ 0, 32, 38, 39, 47, 51, 77, 83, |
|
274 |
+ 36, 39, 41, 48, 55, 74, 85, 95, |
|
275 |
+ 39, 45, 53, 58, 72, 83, 105, 89, |
|
276 |
+ 51, 58, 66, 73, 82, 109, 92, 95, |
|
277 |
+ 57, 75, 78, 89, 105, 95, 93, 96, |
|
278 |
+ 81, 82, 99, 99, 94, 90, 97, 98, |
|
279 |
+ 83, 96, 97, 93, 89, 97, 102, 98, |
|
280 |
+ 90, 94, 92, 88, 100, 104, 99, 99, |
|
281 |
+}; |
|
282 |
+ |
|
283 |
+static const uint8_t dnxhd_1260_luma_weight[] = { |
|
284 |
+ 0, 32, 37, 37, 40, 41, 52, 53, |
|
285 |
+ 33, 36, 36, 38, 40, 48, 49, 52, |
|
286 |
+ 34, 34, 37, 39, 44, 47, 49, 54, |
|
287 |
+ 33, 35, 38, 40, 45, 46, 54, 51, |
|
288 |
+ 34, 37, 37, 42, 44, 49, 52, 48, |
|
289 |
+ 34, 34, 38, 43, 44, 51, 50, 50, |
|
290 |
+ 33, 36, 41, 44, 51, 52, 50, 54, |
|
291 |
+ 36, 38, 44, 47, 53, 53, 54, 54, |
|
292 |
+}; |
|
293 |
+ |
|
294 |
+static const uint8_t dnxhd_1260_chroma_weight[] = { |
|
295 |
+ 0, 32, 40, 38, 42, 40, 45, 45, |
|
296 |
+ 34, 42, 36, 43, 38, 46, 46, 49, |
|
297 |
+ 38, 35, 43, 39, 44, 47, 47, 49, |
|
298 |
+ 35, 42, 43, 42, 46, 47, 49, 52, |
|
299 |
+ 38, 43, 43, 44, 50, 49, 56, 50, |
|
300 |
+ 42, 43, 44, 50, 51, 57, 52, 53, |
|
301 |
+ 41, 45, 46, 53, 53, 56, 53, 54, |
|
302 |
+ 46, 46, 51, 49, 56, 53, 58, 58, |
|
303 |
+}; |
|
304 |
+ |
|
261 | 305 |
/* Used in CID 1235, 1241, 1250, 1256 */ |
262 | 306 |
static const uint8_t dnxhd_1235_dc_codes[14] = { |
263 | 307 |
10, 62, 11, 12, 13, 0, 1, 2, 3, 4, 14, 30, 126, 127, |
... | ... |
@@ -268,17 +312,17 @@ static const uint8_t dnxhd_1235_dc_bits[14] = { |
268 | 268 |
4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 4, 5, 7, 7, |
269 | 269 |
}; |
270 | 270 |
|
271 |
-/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258 */ |
|
271 |
+/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258, 1259, 1260 */ |
|
272 | 272 |
static const uint8_t dnxhd_1237_dc_codes[12] = { |
273 | 273 |
0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63, |
274 | 274 |
}; |
275 | 275 |
|
276 |
-/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258 */ |
|
276 |
+/* Used in CID 1237, 1238, 1242, 1243, 1251, 1252, 1253, 1258, 1259, 1260 */ |
|
277 | 277 |
static const uint8_t dnxhd_1237_dc_bits[12] = { |
278 | 278 |
3, 4, 4, 3, 3, 3, 3, 3, 4, 5, 6, 6, |
279 | 279 |
}; |
280 | 280 |
|
281 |
-/* Used in CID 1237, 1242, 1253 */ |
|
281 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
282 | 282 |
static const uint16_t dnxhd_1237_ac_codes[257] = { |
283 | 283 |
0, 1, 4, 5, 12, 26, 27, 56, |
284 | 284 |
57, 58, 59, 120, 121, 244, 245, 246, |
... | ... |
@@ -315,7 +359,7 @@ static const uint16_t dnxhd_1237_ac_codes[257] = { |
315 | 315 |
65535, |
316 | 316 |
}; |
317 | 317 |
|
318 |
-/* Used in CID 1237, 1242, 1253 */ |
|
318 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
319 | 319 |
static const uint8_t dnxhd_1237_ac_bits[257] = { |
320 | 320 |
2, 2, 3, 3, 4, 5, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8, |
321 | 321 |
8, 8, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 11, 11, 11, |
... | ... |
@@ -336,7 +380,7 @@ static const uint8_t dnxhd_1237_ac_bits[257] = { |
336 | 336 |
16, |
337 | 337 |
}; |
338 | 338 |
|
339 |
-/* Used in CID 1237, 1242, 1253 */ |
|
339 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
340 | 340 |
static const uint8_t dnxhd_1237_ac_level[257] = { |
341 | 341 |
3, 3, 5, 0, 7, 9, 5, 11, 13, 15, 7, 17, 19, 21, 23, 25, |
342 | 342 |
9, 11, 27, 29, 31, 33, 13, 35, 37, 39, 41, 43, 15, 45, 47, 49, |
... | ... |
@@ -357,6 +401,7 @@ static const uint8_t dnxhd_1237_ac_level[257] = { |
357 | 357 |
129, |
358 | 358 |
}; |
359 | 359 |
|
360 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
360 | 361 |
static const uint8_t dnxhd_1237_ac_flags[257] = { |
361 | 362 |
0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, |
362 | 363 |
2, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, |
... | ... |
@@ -892,7 +937,7 @@ static const uint8_t dnxhd_1235_run[62] = { |
892 | 892 |
49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, |
893 | 893 |
}; |
894 | 894 |
|
895 |
-/* Used in CID 1237, 1242, 1253 */ |
|
895 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
896 | 896 |
static const uint16_t dnxhd_1237_run_codes[62] = { |
897 | 897 |
0, 4, 10, 11, 24, 25, 26, 54, |
898 | 898 |
55, 56, 57, 58, 118, 119, 240, 482, |
... | ... |
@@ -904,7 +949,7 @@ static const uint16_t dnxhd_1237_run_codes[62] = { |
904 | 904 |
1018, 1019, 1020, 1021, 1022, 1023, |
905 | 905 |
}; |
906 | 906 |
|
907 |
-/* Used in CID 1237, 1242, 1253 */ |
|
907 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
908 | 908 |
static const uint8_t dnxhd_1237_run_bits[62] = { |
909 | 909 |
1, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 8, 9, |
910 | 910 |
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, |
... | ... |
@@ -912,7 +957,7 @@ static const uint8_t dnxhd_1237_run_bits[62] = { |
912 | 912 |
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, |
913 | 913 |
}; |
914 | 914 |
|
915 |
-/* Used in CID 1237, 1242, 1253 */ |
|
915 |
+/* Used in CID 1237, 1242, 1253, 1259, 1260 */ |
|
916 | 916 |
static const uint8_t dnxhd_1237_run[62] = { |
917 | 917 |
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, |
918 | 918 |
17, 18, 19, 20, 21, 53, 57, 58, 59, 60, 61, 62, 22, 23, 24, 25, |
... | ... |
@@ -1051,7 +1096,20 @@ const CIDEntry ff_dnxhd_cid_table[] = { |
1051 | 1051 |
dnxhd_1252_ac_flags, |
1052 | 1052 |
dnxhd_1250_run_codes, dnxhd_1250_run_bits, dnxhd_1250_run, |
1053 | 1053 |
{ 42, 60, 75, 115 } }, |
1054 |
- |
|
1054 |
+ { 1259, 1440, 1080, 0, 417792, 417792, 4, 8, 3, |
|
1055 |
+ dnxhd_1259_luma_weight, dnxhd_1259_chroma_weight, |
|
1056 |
+ dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, |
|
1057 |
+ dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level, |
|
1058 |
+ dnxhd_1237_ac_flags, |
|
1059 |
+ dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run, |
|
1060 |
+ { 63, 84, 100, 110 } }, |
|
1061 |
+ { 1260, 1440, 1080, 1, 417792, 417792, 4, 8, 3, |
|
1062 |
+ dnxhd_1260_luma_weight, dnxhd_1260_chroma_weight, |
|
1063 |
+ dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, |
|
1064 |
+ dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level, |
|
1065 |
+ dnxhd_1237_ac_flags, |
|
1066 |
+ dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run, |
|
1067 |
+ { 80, 90, 100, 110 } }, |
|
1055 | 1068 |
}; |
1056 | 1069 |
|
1057 | 1070 |
int ff_dnxhd_get_cid_table(int cid) |