summaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdata.c
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-10-25 11:19:25 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-10-26 19:21:59 +0100
commit05da586fef865274d44da57f841068b5f17c812c (patch)
tree29feeeda4157d8d64c7840c156d2c5a7c2410ab8 /libavcodec/dvdata.c
parent6fe02d25ee6816e44de8d8b23b6905d307e1ed28 (diff)
downloadffmpeg-streaming-05da586fef865274d44da57f841068b5f17c812c.zip
ffmpeg-streaming-05da586fef865274d44da57f841068b5f17c812c.tar.gz
dv: move inverse weight tables to decoder
The encoder has its own tables and does not access the idct_factor member of the DVVideoContext structure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdata.c')
-rw-r--r--libavcodec/dvdata.c65
1 files changed, 0 insertions, 65 deletions
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 5f0a239..231569a 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -69,71 +69,6 @@ const uint8_t ff_dv_quant_shifts[22][4] = {
const uint8_t ff_dv_quant_offset[4] = { 6, 3, 0, 1 };
-const uint16_t ff_dv_iweight_88[64] = {
- 32768, 16705, 16705, 17734, 17032, 17734, 18205, 18081,
- 18081, 18205, 18725, 18562, 19195, 18562, 18725, 19266,
- 19091, 19705, 19705, 19091, 19266, 21407, 19643, 20267,
- 20228, 20267, 19643, 21407, 22725, 21826, 20853, 20806,
- 20806, 20853, 21826, 22725, 23170, 23170, 21407, 21400,
- 21407, 23170, 23170, 24598, 23786, 22018, 22018, 23786,
- 24598, 25251, 24465, 22654, 24465, 25251, 25972, 25172,
- 25172, 25972, 26722, 27969, 26722, 29692, 29692, 31521,
-};
-const uint16_t ff_dv_iweight_248[64] = {
- 32768, 16384, 16705, 16705, 17734, 17734, 17734, 17734,
- 18081, 18081, 18725, 18725, 21407, 21407, 19091, 19091,
- 19195, 19195, 18205, 18205, 18725, 18725, 19705, 19705,
- 20267, 20267, 21826, 21826, 23170, 23170, 20806, 20806,
- 20267, 20267, 19266, 19266, 21407, 21407, 20853, 20853,
- 21400, 21400, 23786, 23786, 24465, 24465, 22018, 22018,
- 23170, 23170, 22725, 22725, 24598, 24598, 24465, 24465,
- 25172, 25172, 27969, 27969, 25972, 25972, 29692, 29692
-};
-
-/**
- * The "inverse" DV100 weights are actually just the spec weights (zig-zagged).
- */
-const uint16_t ff_dv_iweight_1080_y[64] = {
- 128, 16, 16, 17, 17, 17, 18, 18,
- 18, 18, 18, 18, 19, 18, 18, 19,
- 19, 19, 19, 19, 19, 42, 38, 40,
- 40, 40, 38, 42, 44, 43, 41, 41,
- 41, 41, 43, 44, 45, 45, 42, 42,
- 42, 45, 45, 48, 46, 43, 43, 46,
- 48, 49, 48, 44, 48, 49, 101, 98,
- 98, 101, 104, 109, 104, 116, 116, 123,
-};
-const uint16_t ff_dv_iweight_1080_c[64] = {
- 128, 16, 16, 17, 17, 17, 25, 25,
- 25, 25, 26, 25, 26, 25, 26, 26,
- 26, 27, 27, 26, 26, 42, 38, 40,
- 40, 40, 38, 42, 44, 43, 41, 41,
- 41, 41, 43, 44, 91, 91, 84, 84,
- 84, 91, 91, 96, 93, 86, 86, 93,
- 96, 197, 191, 177, 191, 197, 203, 197,
- 197, 203, 209, 219, 209, 232, 232, 246,
-};
-const uint16_t ff_dv_iweight_720_y[64] = {
- 128, 16, 16, 17, 17, 17, 18, 18,
- 18, 18, 18, 18, 19, 18, 18, 19,
- 19, 19, 19, 19, 19, 42, 38, 40,
- 40, 40, 38, 42, 44, 43, 41, 41,
- 41, 41, 43, 44, 68, 68, 63, 63,
- 63, 68, 68, 96, 92, 86, 86, 92,
- 96, 98, 96, 88, 96, 98, 202, 196,
- 196, 202, 208, 218, 208, 232, 232, 246,
-};
-const uint16_t ff_dv_iweight_720_c[64] = {
- 128, 24, 24, 26, 26, 26, 36, 36,
- 36, 36, 36, 36, 38, 36, 36, 38,
- 38, 38, 38, 38, 38, 84, 76, 80,
- 80, 80, 76, 84, 88, 86, 82, 82,
- 82, 82, 86, 88, 182, 182, 168, 168,
- 168, 182, 182, 192, 186, 192, 172, 186,
- 192, 394, 382, 354, 382, 394, 406, 394,
- 394, 406, 418, 438, 418, 464, 464, 492,
-};
-
/*
* There's a catch about the following three tables: the mapping they establish
* between (run, level) and vlc is not 1-1. So you have to watch out for that
OpenPOWER on IntegriCloud