Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.h
AgeCommit message (Collapse)Author
2019-09-02lavc/mjpegdec: Decode Huffman-coded lossless JPEGs embedded in DNGsNick Renieris
Main image data in DNGs is usually comprised of tiles, each of which is a Huffman-encoded lossless JPEG. Tested for ljpeg regressions with: `ffmpeg -f lavfi -i testsrc=d=1 -vcodec ljpeg test.avi` `ffmpeg test.avi out.avi` The modified code in ljpeg_decode_rgb_scan runs without issues. Signed-off-by: Nick Renieris <velocityra@gmail.com>
2018-04-13avcodec/mjpegdec: Check input buffer size.Michael Niedermayer
Fixes: Timeout Fixes: 6381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5665032743419904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-02-22mjpegdec: Add hwaccel hooksMark Thompson
Also adds some extra fields to the main context structure that may be needed by a hwaccel decoder.
2017-12-10fix MSVC compilation errorsMateusz
After commit 3701d49 'error_resilience: remove avpriv_atomic usage' we have included windows.h in much more files and we should avoid conflicts with defines/function declarations. Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-04libavcodec/blockdsp : add AVX versionMartin Vignali
Also modify the required alignment, to 32 instead of 16 for several codecs Signed-off-by: James Almer <jamrial@gmail.com>
2017-08-25mjpeg: Add support for ICC side dataDerek Buitenhuis
JPEGs store embedded profiles under the APP2 marker, signified with a "ICC_PROFILE" null-terminated string header, and can be split across multiple APP2 markers, out of order. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2017-03-20avcodec/mjpegdec: quant_matrixes can be up to 65535, use uint16_tMichael Niedermayer
Fixes invalid shift Fixes: 870/clusterfuzz-testcase-5649105424482304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-06-21avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 materialMichael Niedermayer
Fixes Ticket4535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-19avcodec/mjpegdec: Change upscale_* to an array instead of a bitmaskMichael Niedermayer
This allows storing integer factors instead of just 0 and 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30dsputil: Split off IDCT bits into their own contextDiego Biurrun
2014-06-19Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun
2014-04-01avcodec/jpeglsdec: add PAL8 supportMichael Niedermayer
Fixes Ticket3478 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-27avcodec/mjpegdec: parse adobe_transformMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask sizeMichael Niedermayer
Fixes: heap array overread Fixes: asan_heap-oob_149b2bc_6577_m1.mxg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30mjpegdec: parse JPS extension and save relevant stereo3d informationKirill Gavrilov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mjpegdec: apply flipping after decoding, not before Conflicts: libavcodec/mjpegdec.c libavcodec/mjpegdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09mjpegdec: apply flipping after decoding, not beforeAnton Khirnov
This is simpler and removes a silly restriction on edges being present.
2013-12-09Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'Michael Niedermayer
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5': mjpegdec: use the AVFrame API properly. Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09mjpegdec: use the AVFrame API properly.Anton Khirnov
2013-08-13avcodec/mjpegdec: Read EXIF metadata in JPEG input.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: parse app-xfrmMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: parse app-colrMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: Fix used quant index for gbrMichael Niedermayer
Fixes Ticket1651 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20mjpeg: Use hpeldsp instead of dsputil for half-pel functionsRonald S. Bultje
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13mjpeg: use hpeldsp instead of dsputil for half-pel functions.Ronald S. Bultje
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-12-05Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer
* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov
It's got_frame, not data size
2012-06-29cosmetics: minor libavcodec spelling errorsLou Logan
Also update some common misspelled words in patcheck Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06Support decoding of some unusual jpeg samples.Carl Eugen Hoyos
Avoid unsupported pix_fmts by upscaling chroma. Fixes ticket #878.
2011-12-27Support decoding yuv442 and yuv421 jpeg images.Carl Eugen Hoyos
Fixes ticket #787.
2011-09-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-31mjpegdec: add 'extern_huff' private option.Anton Khirnov
Deprecate CODEC_FLAG_EXTERN_HUFF
2011-04-27Add support for picture_ptr field in MJpegDecodeContextanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27Move MJPEG's input buffer preprocessing in separate public functionanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27Support reference picture defined by bitmask in MJPEG's SOS decoderanatoly
With cleanup & simplification by me Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-30Add support for picture_ptr field in MJpegDecodeContextanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-30Move MJPEG's input buffer preprocessing in separate public functionanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-30Support reference picture defined by bitmask in MJPEG's SOS decoderanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-10-22Add a seperate VLC table for progressive jpeg so we dont have to subtract 16 ↵Michael Niedermayer
in the inner loop. Originally committed as revision 25545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård
These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-02Avoid huge array for rgb ljpeg on the stack.Michael Niedermayer
Code tested with an ljpeg i had laying around. Originally committed as revision 20433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19Flip (M)JPEG frames encoded by Intel JPEG library.Carl Eugen Hoyos
Fixes issues 1464 and 1468. Originally committed as revision 20312 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 12:57:34 +0300