diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 15:55:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 19:25:35 +0200 |
| commit | 3bcf61f495dcadbc9679a00e6b1023531288498d (patch) | |
| tree | 886372c43961ed5c64b0301a65e01174bcb70196 /libavcodec/jpeg2000dwt.c | |
| parent | 5de3a589f16e2899aaf4a09e550027319f6e76ac (diff) | |
avcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X
Even if the jpeg2000 spec uses a wrong value this does not
make mathematics work this way, also this has been corrected in the 2004
version AFAIK
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dwt.c')
| -rw-r--r-- | libavcodec/jpeg2000dwt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index b7363a0358..5c2ec679c8 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -38,10 +38,7 @@ #define F_LFTG_GAMMA 0.882911075530934f #define F_LFTG_DELTA 0.443506852043971f #define F_LFTG_K 1.230174104914001f -#define F_LFTG_X 1.625732422f -/* FIXME: Why use 1.625732422 instead of 1/F_LFTG_K? - * Incorrect value in JPEG2000 norm. - * see (ISO/IEC 15444:1 (version 2002) F.3.8.2 */ +#define F_LFTG_X 1.625786132231922f /* Lifting parameters in integer format. * Computed as param = (float param) * (1 << 16) */ @@ -50,7 +47,7 @@ #define I_LFTG_GAMMA 57862 #define I_LFTG_DELTA 29066 #define I_LFTG_K 80621 -#define I_LFTG_X 106544 +#define I_LFTG_X 106548 static inline void extend53(int *p, int i0, int i1) { |