Janne Grunau
e268a352af
mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
...
Check explicitly if enough bits are left to prevent an infinite loop
when the bitstream buffer is not followed by zero-padding.
Based on patches by Michael Niedermayer <michaelni@gmx.at>.
13 years ago
Michael Niedermayer
15b219fae9
jpegdec: Fix vlc table check for progressive jpegs.
...
Fixes Ticket834
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
45552371e3
jpegdec: non interleaved rgb ljpeg support.
...
Fixes Ticket856
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
465eb0eb48
jpegdec: 9-16 bit yuv/gray ljpeg support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
24964f21e4
jpegdec: Only enable rgb mode when there are 3 components.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
b0143da806
ljpegdec: fix point transform injection.
...
Fix Ticket842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
387d86077f
Support decoding yuv442 and yuv421 jpeg images.
...
Fixes ticket #787 .
13 years ago
Alex Converse
4bf3c8f226
mov: Don't stick the QuickTime field ordering atom in extradata.
...
The 'fiel' atoms can be found in H.264 tracks clobbering the extradata.
MJPEG supports non field based extradata, and this data should be
preserved when copying.
13 years ago
Michael Niedermayer
484b1cdd53
jpegdec: check return value of mjpeg_decode_dc()
...
Fixes Ticket754
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
f129f593f7
ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Diego Biurrun
da9cea77e3
Fix a bunch of common typos.
13 years ago
Carl Eugen Hoyos
51d7cd3596
Decode RGB ljpeg to RGB24.
...
No alpha channel is decoded, the output used to be completely transparent.
13 years ago
Michael Niedermayer
c36edf3899
jpeg: rgb support
...
Fixes Ticket297
Based on a patch by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Dustin Brody
9abc98737f
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
145f741e11
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
13 years ago
Michael Niedermayer
bfadca1faf
mjpegdec: print nb_components too in pict debug info
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
b002184fa1
mjpegdec: make sure we dont interpret things after the bitstream buffer as resync marker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
b6c04b6821
mjpegdec: Remove buggy avid hacks, they dont do anything good with any file i found
...
Fix multi plane jpeg
Fixes ticket471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
d55b06b8e7
mjpeg: interlaced buggy avid fix
...
Fix Ticket362
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e009432b50
mjpegdec: fix len for AVI1 reader
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
b34c7a5656
Revert "MJPEG: emulate EOI also on two consecutive SOI."
...
This causes Ticket463, fix will be in the next commits
This reverts commit 5e2ea138b7
.
13 years ago
Michael Niedermayer
be7eed72c8
mjpegdec; even better RSTn skiping
...
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
fea20d1ddc
Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
...
This broke mplayer
This reverts commit a18e04bcf9
.
13 years ago
Michael Niedermayer
94c2478d90
jpegdec: better rst skiping
...
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Reimar Döffinger
5e2ea138b7
MJPEG: emulate EOI also on two consecutive SOI.
...
Fixes issue #362 .
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Reimar Döffinger
55a1fe7a80
Reset cur_scan at more appropriate places.
...
Reset it when we actually process an EOI, not when we actually
decide to ignore it for bug-workarounds, and reset it on
SOF to make it more reliable in case of missing EOI.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Gavin Kinsey
2f870e262e
jpegdec: set color_range
13 years ago
Anton Khirnov
1f0c7020a1
mjpegdec: add 'extern_huff' private option.
...
Deprecate CODEC_FLAG_EXTERN_HUFF
13 years ago
Dustin Brody
a18e04bcf9
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Reimar Döffinger
b118255e91
Replace goto by break, it has the same effect.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Dustin Brody
21d7037234
mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years ago
Anton Khirnov
ec6402b7c5
lavc: use designated initialisers for all codecs.
...
It's more readable and less prone to breakage.
14 years ago
Michael Niedermayer
8c0fa61a97
jpegdec: actually search for and parse RSTn
...
Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".
References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 7b8ed831eb
)
14 years ago
Diego Biurrun
356be9307c
Remove unused structs and tables.
14 years ago
Mans Rullgard
b27565b143
Remove statements immediately following unconditional jumps
...
This removes a number of compiler warnings.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Mans Rullgard
050f2b3e7f
mjpeg: remove pointless braces around block of code
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Michael Niedermayer
9291faeb67
jpegdec: include mjpb_skiptosod in debug output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
a09a3e8213
jpegdec: fix CJPG decoding.
...
Fixes ticket133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
7b8ed831eb
jpegdec: actually search for and parse RSTn
...
Fixes Ticket267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Reimar Döffinger
3b6bbfa063
Check syntax even if DEBUG is not defined.
14 years ago
Stefano Sabatini
01042d4123
lavc: set defaults in internal codec frames
...
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.
In particular fix regressions occurring with the pending vsrc_buffer
patch.
14 years ago
Stefano Sabatini
ce5e49b0c2
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
14 years ago
Stefano Sabatini
975a1447f7
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
anatoly
dd1e5bfd5e
Add support for picture_ptr field in MJpegDecodeContext
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
anatoly
7e6a9e6444
Move MJPEG's input buffer preprocessing in separate public function
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
anatoly
34686566f3
Support reference picture defined by bitmask in MJPEG's SOS decoder
...
With cleanup & simplification by me
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
76cd98b445
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rbultje@google.com>
14 years ago
Michael Niedermayer
73a51e00a7
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
anatoly
e0e3b8b297
Add support for picture_ptr field in MJpegDecodeContext
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
anatoly
f16055eedf
Move MJPEG's input buffer preprocessing in separate public function
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago