Commits · c4604b8792cad3194e6c1dd107735a79037dc77f · Linshizhi / ffmpeg.wasm-core

02 Jul, 2013 40 commits

jpeg2000: Merge rescaling with interleaving in 9/7 IDWT · c4604b87
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
c4604b87

jpeg2000: Optimize output sample conversion · 22e18ea3

Michael Niedermayer authored Jul 01, 2013

67935 -> 29984 kcycles
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

22e18ea3

jpeg2000: Reset s->numX/Ytiles on tile deallocation · f0552e63
Michael Niedermayer authored Jul 01, 2013
```
Keep the structure fields more consistent after cleanup.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
f0552e63

jpeg2000: Optimize dequantization · e11099db

Michael Niedermayer authored Jul 01, 2013

Float:   4700 -> 2700 cycles
Integer: 4400 -> 2800 cycles

(sandybridge  i7)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

e11099db

jpeg2000: Do not assume a single tile · c1dcbc59

Michael Niedermayer authored Jul 01, 2013

In preparation of supporting multiple tiles.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

c1dcbc59

jpeg2000: Speed up jpeg2000_decode_tile() · 53d5d89c
Michael Niedermayer authored Jul 01, 2013
```
Skip processing bands with dimension set to 0.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
53d5d89c
jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk() · 64f6570c
Michael Niedermayer authored Jul 01, 2013
```
Speed it up a bit.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
64f6570c

jpeg2000: Simplify jpeg2000_decode_packets() · d57c737a

Michael Niedermayer authored Jul 01, 2013

Raise PATCHWELCOME error in case of non-implemented progression order.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

d57c737a

jpeg2000: Do not crash on NULL node in tag_tree_decode · 09d5929f
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
09d5929f
jpeg2000: Refactor SOT marker parsing · aa16bbaf
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
aa16bbaf
jpeg2000: Proper cleanup on failure in decode_frame() · daeb4e30
Luca Barbato authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
daeb4e30
jpeg2000: Use the correct sizeof in memset for T1 data · 589e5b52
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
589e5b52
jpeg2000: Simplify init_tile() · 5b73916d
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
5b73916d
jpeg2000: Update pixel format support · 33e665a6
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
33e665a6
jpeg2000: Compute corrections of sub-band coordinates · db13e02c
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
db13e02c
jpeg2000: Remove unneeded variable initialization · 690c8af9
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
690c8af9

jpeg2000: Use separate fields for int and float codepaths · 5bf208f6

Michael Niedermayer authored Jul 01, 2013

Split stepsize and data into int and float variants.
Eliminates a number of casts and simplifies spotting errors.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

5bf208f6

jpeg2000: Split int/float codepaths depending on the DWT · a458b91c
Michael Niedermayer authored Jul 01, 2013
```
DWT53 is always int, DWT97 is always float.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
a458b91c

jpeg2000: Improve reduced resolution decoding · f9581f14

Michael Niedermayer authored Jul 01, 2013

Correctly scale down the component coordinates and
clean up some redundant code.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

f9581f14

jpeg2000: Compute quantization for 'scalar derived' in the correct case. · 952f7ed3
Michael Niedermayer authored Jul 01, 2013
```
Scalar derived case is represented by the JPEG2K_QSTY_SI define.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
952f7ed3

jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component() · 4e11b155

Michael Niedermayer authored Jul 01, 2013

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

4e11b155

jpeg2000: Fix compute precedence error in lut_gain index · 4cbd5ed1
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
4cbd5ed1

jpeg2000: Initialize code blocks structures in precincts to 0 · b44925ae

Michael Niedermayer authored Jul 01, 2013

Prevent use of uninitialized memory / valgrind failure.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

b44925ae

jpeg2000: Check that we have enough components for MCT · cf04af20

Michael Niedermayer authored Jul 01, 2013

Avoid overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

cf04af20

jpeg2000: Check that there is a SOT before SOD · b564784a

Michael Niedermayer authored Jul 01, 2013

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

b564784a

jpeg2000: Remove unneeded returns · 2c3901b2
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
2c3901b2

jpeg2000: Propagate error code from get_cox() · ef35d6db

Michael Niedermayer authored Jul 01, 2013

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

ef35d6db

jpeg2000: Check that nreslevels2decode has been initialized before use · 78962d3d

Michael Niedermayer authored Jul 01, 2013

Avoid buffer overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

78962d3d

jpeg2000: Drop unused and writeonly fields · 86a2602e
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
86a2602e
jpeg2000: Correctly calculate sgnd · ac921338
Michael Niedermayer authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
ac921338

jpeg2000: check len before parsing header · fd54dd02

Michael Niedermayer authored Jul 01, 2013

Avoid overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

fd54dd02

jpeg2000: Check component number in get_coc() and get_qcc() · eae63e3c

Michael Niedermayer authored Jul 01, 2013

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

eae63e3c

jpeg2000: Check zero bit-plane validity · 17e5d614
Michael Niedermayer authored Jul 01, 2013
```
Prevent integer overflows.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
17e5d614

jpeg2000: Validate block lengthinc · 7e201d57

Luca Barbato authored Jul 01, 2013

Currently we are using an array with a static data size.

Similar to a patch with the same purpose by Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

7e201d57

jpeg2000: Validate SIZ parsing · 278a923c

Michael Niedermayer authored Jul 01, 2013

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

278a923c

jpeg2000: Validate SOT parsing · d3cb302b
Michael Niedermayer authored Jul 01, 2013
```
Avoid some overreads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
d3cb302b

jpeg2000: Use bytestream2 · 1a3598aa

Michael Niedermayer authored Jul 01, 2013

Prevent a number of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

1a3598aa

jpeg2000: Clean up return paths and error messages · 5efadcb8
Luca Barbato authored Jul 01, 2013
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
5efadcb8
jpeg2000: Define the maximum decomposition levels · be327100
Luca Barbato authored Jul 01, 2013
```
And define the resolution levels according.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
be327100

jpeg2000: Check code-block size · fbcc03db

Michael Niedermayer authored Jul 01, 2013

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

fbcc03db