summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000dec.c
Commit message (Collapse)AuthorAge
* Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-22
| |
* | lavc/jpeg2000dec: silent warning discards qualifiersLukasz Marek2014-02-08
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: fix error detection in pix_fmt_match()Michael Niedermayer2014-01-20
| | | | | | | | | | | | Fixes out of array accesses with CODEC_FLAG_EMU_EDGE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: calculate planar and pixelsize from pixel format descriptorMichael Niedermayer2014-01-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: zero Jpeg2000QuantStyle structure before use in get_qcd()Michael Niedermayer2013-12-28
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f50b84aac30_6823_mjp2.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRLMichael Niedermayer2013-11-24
| | | | | | | | | | | | | | | | Fixes out of array reads Fixes: asan_heap-oob_f0de57_6823_mjp2.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: non zero image offsets are not supportedMichael Niedermayer2013-10-26
| | | | | | | | | | | | | | Fixes out of array accesses Fixes Ticket3080 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: fix context consistency with too large lowresMichael Niedermayer2013-10-15
| | | | | | | | | | | | | | Fixes out of array accesses Fixes Ticket2898 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: prevent out of array accesses in pixel addressingMichael Niedermayer2013-10-13
| | | | | | | | | | | | Fixes Ticket2921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: check transform equality in MCTMichael Niedermayer2013-10-13
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket2843 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'Michael Niedermayer2013-10-10
|\| | | | | | | | | | | | | | | | | * commit '1018a92219a38a812cf97761c6b3a5e66a400f4b': jpeg2000: Check block length See: 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2 See: 582f53349eabd75164d4389503eb95048982cfdc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Check block lengthLuca Barbato2013-10-09
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | avcodec/jpeg2000dec: Zero code and quant styleMichael Niedermayer2013-10-03
| | | | | | | | | | | | | | | | | | | | This prevents future frames from using half initialized/inconsistent structures Fixes assertion failure Fixes Ticket2897 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: move "missing SIZ" check upMichael Niedermayer2013-09-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'Michael Niedermayer2013-09-18
|\| | | | | | | | | | | | | | | | | | | * commit '18a245a2aea31b92bc435f2962a71e060d83b5f7': jpeg2000dec: Add more checks when parsing headers The check cannot be true in FFmpeg, but does no harm. I will move it in a subsequent commit so it can detect missing SIZ Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: Add more checks when parsing headersMartin Storsjö2013-09-17
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * jpeg2000: Initialize only once mqc arraysNicolas Bertrand2013-07-13
| | | | | | | | | | | | Improves decoding speed. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Use the matching coding style struct for transform selectionMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | | | Fixes a null pointer dereference. 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>
* | avcodec: typo fix sepera* → separa*Clément Bœsch2013-09-15
| |
* | avcodec/jpeg2000dec: print invalid cdx/y valuesMichael Niedermayer2013-09-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set bits_per_raw_sample when reading j2k frames.Carl Eugen Hoyos2013-09-12
| |
* | avcodec/jpeg2000dec: make SOC finding code more robustMichael Niedermayer2013-09-05
| | | | | | | | | | | | Fixes file from Ticket860 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: check log2_cblk dimensionsMichael Niedermayer2013-08-24
| | | | | | | | | | | | | | | | Fixes out of array access Fixes Ticket2895 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Check cdx/y values more carefullyMichael Niedermayer2013-08-23
| | | | | | | | | | | | | | | | | | | | Some invalid values where not handled correctly in the later pixel format matching code. Fixes out of array accesses Fixes Ticket2848 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: fix near null pointer dereferenceMichael Niedermayer2013-08-18
| | | | | | | | | | | | Fixes Ticket2840 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: check sample sepration for validityMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | Fixes division by 0 Fixes Ticket2841 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: simplify jpeg2000_read_bitstream_packets()Michael Niedermayer2013-08-02
| | | | | | | | | | | | | | 23 lines less less error prone as theres no more need to update *_size on every read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: Support non subsampled 9-16bit planar pixel formatsMichael Niedermayer2013-07-21
| | | | | | | | | | | | | | This applies changes similar to fc6de70c44be05eb0368ab519bfb790431d8dee5 to the >8bit codepath Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: silence unused variable warningMichael Niedermayer2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: Support non subsampled 8bit planar pixel formatsMichael Niedermayer2013-07-18
| | | | | | | | | | | | Fixes file2.jp2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: parse CDEFMichael Niedermayer2013-07-18
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: libavcodec/jpeg2000dec.c Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix pix_fmt detection in the native jpeg2000 decoder.Carl Eugen Hoyos2013-07-18
| | | | | | | | | | | | | | Based on b7a928b by Michael Bradshaw. Fixes ticket #2683. Reviewed-by: Nicolas Bertrand
* | 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>
* | jpeg2000: Initialize only once mqc arraysNicolas Bertrand2013-07-12
| | | | | | | | | | | | Increases encoding and decoding speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22e18ea39e371030cc78973d1b46aae45a7ea215': jpeg2000: Optimize output sample conversion jpeg2000: Reset s->numX/Ytiles on tile deallocation jpeg2000: Optimize dequantization jpeg2000: Do not assume a single tile jpeg2000: Speed up jpeg2000_decode_tile() jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk() Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Optimize output sample conversionMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | | | 67935 -> 29984 kcycles Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Reset s->numX/Ytiles on tile deallocationMichael Niedermayer2013-07-02
| | | | | | | | | | | | Keep the structure fields more consistent after cleanup. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Optimize dequantizationMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | | | | | Float: 4700 -> 2700 cycles Integer: 4400 -> 2800 cycles (sandybridge i7) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Do not assume a single tileMichael Niedermayer2013-07-02
| | | | | | | | | | | | In preparation of supporting multiple tiles. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Speed up jpeg2000_decode_tile()Michael Niedermayer2013-07-02
| | | | | | | | | | | | Skip processing bands with dimension set to 0. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()Michael Niedermayer2013-07-02
| | | | | | | | | | | | Speed it up a bit. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9': jpeg2000: Simplify jpeg2000_decode_packets() jpeg2000: Do not crash on NULL node in tag_tree_decode jpeg2000: Refactor SOT marker parsing Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Simplify jpeg2000_decode_packets()Michael Niedermayer2013-07-02
| | | | | | | | | | | | | | | | 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>
| * jpeg2000: Do not crash on NULL node in tag_tree_decodeMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000: Refactor SOT marker parsingMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | 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>
* | Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'Michael Niedermayer2013-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '589e5b52f634f6b2d307a167a19eef7e7328cb08': jpeg2000: Use the correct sizeof in memset for T1 data jpeg2000: Simplify init_tile() jpeg2000: Update pixel format support Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Use the correct sizeof in memset for T1 dataMichael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 13:37:57 +0000