Commit Graph

78 Commits

Author SHA1 Message Date
Alex Converse df6c3f9fb3 tiffdec: Add support for GRAY16LE.
Tested with the GraphicsMagick TIFF archive and Libav generated files.
2012-09-19 11:05:36 -07:00
Martin Storsjö 1d9c2dc89a Don't include common.h from avutil.h
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
Anton Khirnov 36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Alex Converse f346b6bbeb tiffdec: K&R cosmetics 2012-04-13 12:58:19 -07:00
Alex Converse 90a4306007 tiffdec: Add a malloc check and refactor another. 2012-04-13 09:49:13 -07:00
Martin Storsjö 00c3b67b8a cosmetics: Align codec declarations
Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-04-06 22:37:38 +03:00
Diego Biurrun a92be9b856 Replace memset(0) by zero initializations.
Also remove one pointless zero initialization in rangecoder.c.
2012-03-28 09:38:33 +02:00
Alex Converse fd0be63049 tiffdec: Prevent illegal memory access caused by recycled pointers.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2012-03-07 15:40:42 -08:00
Diego Biurrun 324deaa268 Replace AVFrame pointer type punning by proper struct member assignments. 2012-03-01 23:11:13 +01:00
Diego Biurrun 562b6c744a Remove unnecessary AVFrame pointer casts. 2012-03-01 23:11:10 +01:00
Alex Converse 447363870f tiff: Prevent overreads in the type_sizes array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2012-02-23 16:23:51 -08:00
Alex Converse e32548d133 tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
TIFF v6.0 (unimplemented) adds signed equivalents.
2012-02-23 16:23:51 -08:00
Laurent Aimar 04a845caa7 tiffdec: fix out of bound reads/writes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-10-10 21:36:13 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs.
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +02:00
Diego Biurrun f6f95d4e49 doxygen: consistently place brief description 2011-07-14 20:49:37 +02:00
Stefano Sabatini 1863a3c7aa tiff: print log in case of unknown / unsupported tag.
Helps debugging.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-05 12:49:14 +02:00
Stefano Sabatini a43458d7eb tiff: fix linesize for mono-white/black formats.
Fix decoding of file Test_1bpp.tif

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-05 12:49:14 +02:00
Stefano Sabatini 7ca5338b49 tiff: set palette in the context when specified in TIFF_PAL tag
Since image initialization was moved after tag parsing, the
palette needs to be specified in the context and then copied
to the allocated image in init_image().

Fixes a regression with TIFF images that have palette data,
trac issue #230, file Test_Flate_8bpp.tif.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-24 19:33:40 +02:00
Stefano Sabatini bbc572a2c4 tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
Format detection and internal frame initialization is moved to a
separate init_image() function, which is called when all the tags have
been read, and so both BitsPerSample and SamplesPerPixel information
has been collected.

This fixes decoding of the file 11.tiff from roundup issue #1925.

Based on a patch by Kostya Shishkov <kostya.shishkov@gmail.com>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-12 17:59:56 +02:00
Stefano Sabatini 8102d886be tiff: Prefer enum TiffCompr over int for TiffContext.compr.
This is safer and helps debugging.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-12 17:37:08 +02:00
Stefano Sabatini b437f5b055 tiff: add support for inverted FillOrder for uncompressed data
Fix decoding of file b.tif, trac issue #168.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-11 13:55:44 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
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>
2011-02-15 16:18:21 +01:00
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>
2011-01-26 16:08:45 +00:00
Daniel Kang a4db272a92 Return on negative soff sizes, fixes issue 2515.
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-09 19:29:39 +00:00
Daniel Kang d381249bb8 Fix a crash when decoding tiff by moving check
for invalid header up before reading data.
Fixes issue 2500.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 22:12:55 +00:00
Daniel Kang 1ba44140a3 Fix crash for files with strip size larger than the buffer.
Fixes issue 2498.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 14:44:50 +00:00
Stefano Sabatini e16f217ceb Use new imgutils.h API names, fix deprecation warnings.
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 19:15:29 +00:00
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
2010-08-06 09:37:04 +00:00
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
2010-04-20 14:45:34 +00:00
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Baptiste Coudurier bdcc13f2bf lzw.h does not need get_bits.h, tiff.c needs intreadwrite.h for AV_R* though
Originally committed as revision 20724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 19:19:57 +00:00
Francesco Lavra 91cc5d3767 Move ff_reverse in libavcodec to av_reverse in libavutil.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 20484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 09:11:35 +00:00
Kostya Shishkov a8b95021e5 Do not attempt to decode TIFF files containing fax data with uncompressed
mode allowed for there is no code to decode it (yet).

Originally committed as revision 20114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 06:31:49 +00:00
Kostya Shishkov 53f9f9c91b When BitsPerSample tag is not present in TIFF, that means file is
monochrome, so initialize picture before decoding.
This fixes decoding monochrome files produced by lavc TIFF encoder.

Originally committed as revision 20091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 05:49:18 +00:00
Kostya Shishkov 8da5d3dc37 Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them
will be decoded correctly.
This fixes issue 1423.

Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-28 05:17:20 +00:00
Kostya Shishkov 7c6f5238c6 Make TIFF decoder load compression options only for corresponding codec
Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-28 05:15:27 +00:00
Martin Storsjö eec69b399a Do not compile ZLib data uncompressing function in TIFF decoder when ZLib is
not present.
Patch by Martin Storsjö
($firstname <at> $firstname <dot> two first letters of $lastname)

Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 09:43:11 +00:00
Kostya Shishkov e96f885aa0 Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,
so replace it with custom code.
This fixes issue 1419.

Originally committed as revision 20054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 07:01:01 +00:00
Kostya Shishkov a58e96be0e Support both LSB and MSB orders for TIFF CCITT G.x compressed data.
This fixes issue 1410.

Originally committed as revision 20016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-24 18:30:28 +00:00
Baptiste Coudurier a08e67e70d tiff image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:46:04 +00:00
Kostya Shishkov 9706d1c766 Check combined depth and number of components in TIFF decoder, thus eliminating
additional checks for each depth (like 48-bit gray vs. 48-bit RGB)

Originally committed as revision 19076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 15:31:51 +00:00
Kostya Shishkov 512cfd9d54 Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message
Originally committed as revision 18755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06 06:49:04 +00:00
Kostya Shishkov 1c86db80a9 Remove useless assignment during initialization for some decoders
Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-24 14:09:24 +00:00
Thilo Borgmann 7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Michael Niedermayer 92799d3213 Enable faxcompr.
Originally committed as revision 16349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:42:26 +00:00
Kostya Shishkov 108c96d5e7 Decode TIFF image only after all tags have been decoded
Originally committed as revision 16268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 06:50:18 +00:00
Kostya Shishkov 8eedffde31 Some TIFFs declare -1 for the single strip height
Originally committed as revision 16267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 06:47:51 +00:00