summaryrefslogtreecommitdiffstats
path: root/libavcodec/jpeg2000dec.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/jpeg2000dec: More completely check cdefMichael Niedermayer2016-01-271-5/+9
| | | | | | | | Fixes out of array read Fixes: j2k-poc.bin Found-by: Lucas Leong <wmliang.tw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'Hendrik Leppkes2016-01-011-10/+2
|\ | | | | | | | | | | | | * commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6': lavc: add profiles to AVCodecDescriptor Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: add profiles to AVCodecDescriptorAnton Khirnov2015-12-121-10/+2
| | | | | | | | | | The profiles are a property of the codec, so it makes sense to export them through AVCodecDescriptors, not just the codec implementations.
| * jpeg2000: Refactor decode_packetsLuca Barbato2015-09-141-65/+83
| | | | | | | | Move the packet-specific parsers in separate functions.
* | avcodec/jpeg2000dec: Check bpno in decode_cblk()Michael Niedermayer2015-12-041-0/+4
| | | | | | | | | | | | | | | | Fixes: undefined shift Fixes: c409ef86f892335a0a164b5871174d5a/asan_heap-oob_1dff564_2159_162b7234616deab02b544410455eb07b.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind 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-1/+2
| | | | | | | | | | | | | | | | | | 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/jpeg2000dec: Fix potential integer overflow with tile dimensionsMichael Niedermayer2015-11-151-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Check SIZ dimensions to be within the supported rangeMichael Niedermayer2015-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | Fixes potential integer overflows Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi This fix is choosen to be simple to backport, better solution for master is planed Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Check for duplicate SIZ markerMichael Niedermayer2015-11-141-0/+5
| | | | | | | | | | | | | | Fixes: 0231a17345734228011c6f35a64e4594/asan_heap-oob_1d92a72_3218_1213809a9e3affec77e4c191fdfdc0a9.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Clip all tile coordinatesMichael Niedermayer2015-11-071-4/+4
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: b877a6b788a25c70e8b1d014f8628549/asan_heap-oob_1da2c3f_2324_5a1b329b0b3c4bb6b1d775660ac56717.r3d Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Clear properties in jpeg2000_dec_cleanup() tooMichael Niedermayer2015-10-151-0/+1
| | | | | | | | | | | | Fixes: Ticket4878 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Check that step_x/y are valid before use in ↵Michael Niedermayer2015-10-111-0/+4
| | | | | | | | | | | | | | | | JPEG2000_PGOD_PCRL Fixes: CID1322305 and CID1322304 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'Hendrik Leppkes2015-09-161-96/+66
|\ \ | |/ | | | | | | | | | | * commit '29b00f880faa404aa1d0d6820310c510c5996479': jpeg2000: Templatize the frame writer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Templatize the frame writerLuca Barbato2015-09-141-83/+58
| |
* | Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'Hendrik Leppkes2015-09-161-1/+3
|\ \ | |/ | | | | | | | | | | * commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e': jpeg2000: Split codeblock decoding from the main tile decoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Split codeblock decoding from the main tile decodingLuca Barbato2015-09-141-1/+3
| | | | | | | | That loop is completely stand-alone.
* | Merge commit '5788623d29c3e806a7879210986110aced758dc2'Hendrik Leppkes2015-09-121-9/+18
|\ \ | |/ | | | | | | | | | | * commit '5788623d29c3e806a7879210986110aced758dc2': jpeg2000: Split codeblock decoding from the main tile decoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Split codeblock decoding from the main tile decodingLuca Barbato2015-09-111-5/+14
| | | | | | | | That loop is completely stand-alone.
* | Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'Hendrik Leppkes2015-09-121-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776': jpeg2000: Do not warn about known and skippable markers Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Do not warn about known and skippable markersLuca Barbato2015-09-111-0/+4
| | | | | | | | Matches the openjpeg behaviour.
* | Replace all remaining occurances of step/depth_minus1 and offset_plus1Hendrik Leppkes2015-09-081-4/+4
| |
* | avcodec/jpeg2000dec: Initialize ret to avoid warning and make the code more ↵Michael Niedermayer2015-09-051-1/+2
| | | | | | | | | | | | | | | | robust "Fixes" CID1322361 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Assert that step_x/y are validMichael Niedermayer2015-09-051-0/+1
| | | | | | | | | | | | Fixes CID1322304, CID1322305 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc: Remove newline from avpriv_request_sample() calls.Carl Eugen Hoyos2015-08-111-4/+4
| |
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavc/jpeg2000: Signal lossless / bit-exact video stream.Carl Eugen Hoyos2015-07-201-0/+3
| |
* | avcodec/jpeg2000dec: Fix decoding of subsampled multi tile imagesMichael Niedermayer2015-07-031-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'Michael Niedermayer2015-07-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '007e27d363ba7d994019dc897dc9c39071bb204a': avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer() Conflicts: libavcodec/atrac3plusdec.c libavcodec/sp5xdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()Janne Grunau2015-07-011-1/+1
| |
| * jpeg2000: split off inverse MCT as Jpeg2000DSPJames Almer2014-10-081-54/+18
| | | | | | | | | | | | | | This makes the addition of arch optimized functions easier. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * jpeg2000: enable 4 component pixel formatsVittorio Giovara2014-08-061-1/+1
| | | | | | | | | | | | Bug-Id: 721 CC: libav-stable@libav.org Sample-Id: 31230.mov
* | avcodec/jpeg2000dec: Remove unused variablesMichael Niedermayer2015-06-281-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequantMichael Niedermayer2015-06-281-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Check for mismatching per expected terminationMichael Niedermayer2015-06-271-0/+6
| | | | | | | | | | | | not just at the end Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Limit poc end fields to whats available in ↵Michael Niedermayer2015-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | jpeg2000_decode_packets() Fixes: Ticket4677 Solution based on information from https://code.google.com/p/openjpeg/issues/detail?id=80 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Fix tp_index for POCMichael Niedermayer2015-06-261-9/+10
| | | | | | | | | | | | Fixes Ticket2586 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Print what is found in place of EPH if EPH is not foundMichael Niedermayer2015-06-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Support progression order changesMichael Niedermayer2015-06-261-22/+56
| | | | | | | | | | | | Fixes Ticket4657 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Parse POCsMichael Niedermayer2015-06-261-0/+88
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: iterate in tile sample space for CPRL & RPCLMichael Niedermayer2015-06-261-18/+12
| | | | | | | | | | | | | | | | Thats what the spec says should be done aka iterate in the wrong space and use special cases to patch that up. It sometimes can result in different order Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Add missing \n to av_log()Michael Niedermayer2015-06-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: iterate over positions with the special cases from jpeg2000Michael Niedermayer2015-06-261-5/+4
| | | | | | | | | | | | | | | | The order in j2k is not the simple and logic one Fixes Ticket4670 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Add coords to Jpeg2000TileMichael Niedermayer2015-06-261-4/+10
| | | | | | | | | | | | These will be needed in subsequent commits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000: Remove CBLK limitMichael Niedermayer2015-06-261-36/+31
| | | | | | | | | | | | | | | | | | 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/jpeg2000dec: Limit x/y step to 1<<30Michael Niedermayer2015-06-251-3/+2
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket4663 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Check PPx / PPy valuesMichael Niedermayer2015-06-251-0/+7
| | | | | | | | 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>
OpenPOWER on IntegriCloud