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
anatoly
8f0bd2c07d
Support reference picture defined by bitmask in MJPEG's SOS decoder
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Carl Eugen Hoyos
2e3c56a29f
Set maximum lowres value for the MJPEG decoder to 3.
...
While 4 works for some samples, 3 is the correct value since 8x8
DCT is used by (m)jpeg.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
Reinhard Tartler
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
14 years ago
Reinhard Tartler
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
14 years ago
Carl Eugen Hoyos
27a275e4bb
Set maximum lowres value for the MJPEG decoder to 3.
...
While 4 works for some samples, 3 is the correct value since 8x8
DCT is used by (m)jpeg.
14 years ago
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
14 years ago
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
14 years ago
Diego Elio Pettenò
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
)
14 years ago
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Mans Rullgard
d232e09d51
Sanitise get_bits macros, part 1
...
Some of the macros in get_bits.h include a final semicolon,
some do not. This removes these or adds do {} while(0) around
the macros as appropriate and adds semicolons where needed in
calling code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bf5f9b528b
)
14 years ago
Mans Rullgard
bf5f9b528b
Sanitise get_bits macros, part 1
...
Some of the macros in get_bits.h include a final semicolon,
some do not. This removes these or adds do {} while(0) around
the macros as appropriate and adds semicolons where needed in
calling code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Carl Eugen Hoyos
a0f593d00d
Values >4 for lowres corrupt output.
...
Originally committed as revision 26386 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
4c3267aaad
Fix memleak in mjpeg decoder.
...
Originally committed as revision 25549 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
a2d4dfd493
Optimize EOB check in mjpeg decode_block() by adjusting the VLC symbol.
...
Originally committed as revision 25548 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
e4463f21ee
Simplify last coeff check in mjpeg decode_block()
...
Originally committed as revision 25547 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
2111a191eb
Check index in mjpeg AC decode against overflowing.
...
This fixes a possibly exploitable buffer overflow and it will likely also be needed for future overreading fixes.
Originally committed as revision 25546 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
5675a11f92
Add a seperate VLC table for progressive jpeg so we dont have to subtract 16 in the inner loop.
...
Originally committed as revision 25545 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
8870b25140
Factor code&0xf out of if() in decode_block_progressive().
...
Originally committed as revision 25544 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
7f4a1e8f6c
Cleanup decode_block_progressive()
...
Originally committed as revision 25543 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
614252863d
Factorize ((unsigned) code) >> 4 out of decode_block_progressive() in jpeg.
...
Originally committed as revision 25542 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
76c80ef569
Move if() in mjpeg decode_block() to simplify condition.
...
Originally committed as revision 25541 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
1932182498
Simplify build_vlc() by using init_vlc_sparse() in mjpeg.
...
Originally committed as revision 25540 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
e16f217ceb
Use new imgutils.h API names, fix deprecation warnings.
...
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alex Converse
4c399dc82b
Fix undefined expressions that use multiple calls to get_bits().
...
Because the order of evaluation of subexpressions is undefined, two
get_bits() calls may not be part of the same expression.
See also r24902.
Originally committed as revision 24906 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
6ce9b4310c
Remove use of the deprecated function avcodec_check_dimensions(), use
...
av_check_image_size() instead.
Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Måns Rullgård
8fc0162ac4
Add av_ prefix to bswap macros
...
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Måns Rullgård
e6b22522c9
bswap: change ME to NE in macro names
...
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.
Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Carl Eugen Hoyos
0fd0ef7947
Add new decoder property max_lowres and do not init decoder if requested value is higher.
...
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
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
15 years ago