summaryrefslogtreecommitdiffstats
path: root/libavcodec/jpeg2000.h
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/jpeg2000dec: Allocate lengthinc and data_start arrays as neededMichael Niedermayer2017-12-211-2/+2
| | | | | | | | | Decreases memory requirements Fixes: OOM Fixes: 4525/clusterfuzz-testcase-minimized-6400713073623040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Only allocate Jpeg2000Pass for the encoderMichael Niedermayer2017-12-011-1/+1
| | | | | | | | | Reduces memory needed. Fixes: OOM Fixes: 4427/clusterfuzz-testcase-minimized-5106919271301120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Dynamically allocate codeblock dataMichael Niedermayer2017-11-221-2/+2
| | | | | | | | | | | Fixes: OOM Fixes: 3541/clusterfuzz-testcase-minimized-6469958596820992 Adds support for decoding codeblock data larger than 8kb Reduces decoder memory consumption Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Fixes integer overflow in ff_jpeg2000_ceildivpow2()Michael Niedermayer2017-06-161-1/+1
| | | | | | | | Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 2231/clusterfuzz-testcase-minimized-4565181982048256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Fix runtime error: signed integer overflow: 4185 + ↵Michael Niedermayer2017-05-281-1/+1
| | | | | | | | | 2147483394 cannot be represented in type 'int' Fixes: 1870/clusterfuzz-testcase-minimized-4686788029317120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Change coord to 32bit to support larger than 32k width or ↵Michael Niedermayer2015-11-151-9/+9
| | | | | | | | | height Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000: Support 32 decomposition levelsMichael Niedermayer2015-06-281-1/+1
| | | | | | Fixes Ticket4680 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000: support >32bit in ff_jpeg2000_ceildivpow2()Michael Niedermayer2015-06-281-1/+1
| | | | | | Fixes part of Ticket4680 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000: Avoid one shift in ff_jpeg2000_ceildivpow2()Michael Niedermayer2015-06-281-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: Support progression order changesMichael Niedermayer2015-06-261-0/+1
| | | | | | Fixes Ticket4657 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000: Remove CBLK limitMichael Niedermayer2015-06-261-6/+3
| | | | | | | | | This also reduces the amount of memory needed Fixes Ticket4672 The new code seems slightly faster as well, probably due to better cache usage Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000: change flags array type to 16bitMichael Niedermayer2015-06-241-1/+1
| | | | | | reduce memory needed for flags Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vcodec/jpeg2000: Increase cblk size limit to 128Michael Niedermayer2015-06-241-2/+2
| | | | | | Fixes Ticket4649 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: Properly flush the end of the truncated AC streamMichael Niedermayer2015-06-171-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: Improve readability of SOP checkMichael Niedermayer2015-06-151-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: Fix Selective arithmetic coding bypass and Multiple ↵Michael Niedermayer2015-06-121-2/+23
| | | | | | | | | | codeword segments These 2 are highly related so they are in the same commit Fixes part of Ticket4605 Fixes p0_04.j2k Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: add some sanity checking on newpassesMichael Niedermayer2015-06-121-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'Michael Niedermayer2013-07-031-3/+5
|\ | | | | | | | | | | | | | | | | | | * commit 'be3271009ef893fbed9640e8edbd771685fd957b': jpeg2000: Define the maximum decomposition levels Conflicts: libavcodec/jpeg2000.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Define the maximum decomposition levelsLuca Barbato2013-07-021-3/+5
| | | | | | | | | | | | And define the resolution levels according. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | jpeg2000: Make nreslevel fields intMichael Niedermayer2013-06-051-2/+2
| | | | | | | | | | | | This prevents potential integer overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer2013-05-301-0/+2
| | | | | | | | | | | | Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer2013-05-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a TODO item and unifies both decoders structures It also fixes undefined behavior due to aliasing violations I choose 2 fields instead of a union because mistakely using the wrong type with a union will lead to hard to debug "wrong output" while with 2 fields mistakely using the wrong type will crash with a null pointer derefernce which is much easier to debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split stepsize in float & int variablesMichael Niedermayer2013-05-281-3/+2
| | | | | | | | | | | | This is more clear and less prone to mistakes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: merge mant type from j2kMichael Niedermayer2013-05-271-1/+1
| | | | | | | | | | | | mant fits in 16bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000PrecMichael Niedermayer2013-05-271-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000 headers: Cblk/Prec cleanup & mergeMichael Niedermayer2013-05-271-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: log2_prec size cleanupMichael Niedermayer2013-05-261-2/+0
| | | | | | | | | | | | This also changes the cblk size storage method to what jpeg2000 uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-221-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Bump minor for JPEG 2000 decoder JPEG 2000 decoder for DCinema The mqc code is merged, the rest is added independent of the existing jpeg2000 decoder and encoder. Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/mqc.c libavcodec/mqc.h libavcodec/mqcdec.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* JPEG 2000 decoder for DCinemaNicolas Bertrand2013-04-221-0/+268
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> Updated to current programming standards, style and many more small fixes by Diego Biurrun <diego@biurrun.de>. Signed-off-by: Diego Biurrun <diego@biurrun.de>
OpenPOWER on IntegriCloud