summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000.c
Commit message (Collapse)AuthorAge
* Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'Michael Niedermayer2014-06-24
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9': jpeg2000: fix dereferencing invalid pointers during cleanup Conflicts: libavcodec/jpeg2000.c See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f See: 912ce9dd2080c5837285a471d750fa311e09b555 See: 9e477a37703318cb86d8ed1d426929235aa02b67 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: fix dereferencing invalid pointers during cleanupVittorio Giovara2014-06-23
| | | | | | | | | | | | CC: libav-stable@libav.org Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'Michael Niedermayer2014-06-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785': jpeg2000: Mark static data init functions as av_cold Conflicts: libavcodec/jpeg2000.c libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Mark static data init functions as av_coldDiego Biurrun2014-06-17
| |
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000: zero i/f_dataMichael Niedermayer2013-10-13
| | | | | | | | | | | | | | | | Fixes uninitialized use of variables Fixes part of Ticket2921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: fix null pointer dereference in case of malloc failureMichael Niedermayer2013-08-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: zero reslevel array on allocationMichael Niedermayer2013-08-23
| | | | | | | | | | | | prevent use of uninitialized values Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: fix dereferencing invalid pointersMichael Niedermayer2013-08-23
| | | | | | | | | | Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: fix overflow in dequantizationMichael Niedermayer2013-07-13
| | | | | | | | | | | | | | | | Fixes decoding of file generated with: ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2 Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788': jpeg2000: Proper cleanup on failure in decode_frame() Conflicts: libavcodec/jpeg2000.c See: 9d56ccf5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Proper cleanup on failure in decode_frame()Luca Barbato2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Compute corrections of sub-band coordinatesMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Remove unneeded variable initializationMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5bf208f659703895df7926238dcfa8a8175de36b': jpeg2000: Use separate fields for int and float codepaths jpeg2000: Split int/float codepaths depending on the DWT Conflicts: libavcodec/jpeg2000.c libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Use separate fields for int and float codepathsMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | 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>
* | Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea': jpeg2000: Improve reduced resolution decoding jpeg2000: Compute quantization for 'scalar derived' in the correct case. jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component() Conflicts: libavcodec/jpeg2000.c libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Compute quantization for 'scalar derived' in the correct case.Michael Niedermayer2013-07-02
| | | | | | | | | | | | Scalar derived case is represented by the JPEG2K_QSTY_SI define. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()Michael Niedermayer2013-07-02
| | | | | | | | | | | | 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>
| * jpeg2000: Fix compute precedence error in lut_gain indexMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Initialize code blocks structures in precincts to 0Michael Niedermayer2013-07-02
| | | | | | | | | | | | | | | | 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>
| * jpeg2000: Remove unneeded returnsMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f': jpeg2000: Propagate error code from get_cox() jpeg2000: Check that nreslevels2decode has been initialized before use Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Check that nreslevels2decode has been initialized before useMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | Avoid buffer overread. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | jpeg2000: Zero prec->cblkMichael Niedermayer2013-06-06
| | | | | | | | | | | | | | Prevent use of uninitialized memory / valgrind failure Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: check that nreslevels2decode has been initialized before useMichael Niedermayer2013-06-05
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: Fix unintended sign extension in malloc arguments of precMichael Niedermayer2013-06-03
| | | | | | | | | | Fixes: CID1026772/3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: Fix Unintended sign extension in malloc arguments of cblk.Michael Niedermayer2013-06-03
| | | | | | | | | | Fixes CID1026770 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000dec: mergeMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer2013-05-30
| | | | | | | | | | | | Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: remove unneeded castsMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: merges quantization fixes from j2kMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: remove unneeded variable initializationMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: tag_tree_size: replace check by assertMichael Niedermayer2013-05-30
| | | | | | | | | | | | | | This function is never called with values large enough for the error condition to occur Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer2013-05-30
| | | | | | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | This is more clear and less prone to mistakes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: fix typo in lut_gain indexMichael Niedermayer2013-05-28
| | | | | | | | | | | | no testcase Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec/jpeg2000dec: partially merge quantization codeMichael Niedermayer2013-05-28
| | | | | | | | | | | | | | The quantization code needs more work, not so much work merging but more work investigating what is correct. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: Partially merge quantization codeMichael Niedermayer2013-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: merge a few whitespacesMichael Niedermayer2013-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: restructure cblk coordMichael Niedermayer2013-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k: cosmetics from jpeg2000Michael Niedermayer2013-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge getsigctxno()Michael Niedermayer2013-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-22
|/ | | | | | | | | | | | | | | | | | | | | | * 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-22
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 00:46:49 +0000