generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
43,290 Commits 24 Branches 241 Tags 173 MiB
29d1df66ad
Commit Graph

116 Commits

Author SHA1 Message Date
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
Michael Niedermayer
612122b187 Merge remote branch 'qatar/master' 
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-12 04:51:24 +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
Stefano Sabatini
aa909d300f tiff: prefer enum TiffCompr over int for TiffContext.compr 
Help debugging, safer.
 2011-05-11 00:03:26 +02:00
Stefano Sabatini
1e97700fba tiff: remove duplicated author information, fix @file doxy 2011-05-11 00:03:18 +02:00
Baptiste Coudurier
dbfdb288c1 Set alpha of palettes to 0xff. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 21:49:45 +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
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01: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ò
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)
 2011-01-28 03:15:34 +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
Kostya Shishkov
89b4ec5c33 Add monochrome TIFF support 
Originally committed as revision 16266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 06:43:14 +00:00
Kostya Shishkov
4386ed6922 Calculate line size variable correctly for lower bitdepths and use it for raw data copying 
Originally committed as revision 16265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 06:39:31 +00:00
Kostya Shishkov
6a4583e925 4l: TIFF stores short strings inside tag, do not interpret it is as an offset 
Fixes issue 753

Originally committed as revision 16189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 17:39:35 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
bcdb2378f7 Add long names to some AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 21:31:21 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Michael Niedermayer
08e5052930 const 
Originally committed as revision 11747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:28:22 +00:00
Kostya Shishkov
329851e032 TIFF may omit compression tag. 
This fixes issue 276.

Originally committed as revision 11121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-01 15:41:35 +00:00
Måns Rullgård
640b73e17d use correct type for palette 
Originally committed as revision 9554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-09 00:08:47 +00:00
Måns Rullgård
4a64abdc63 kill warnings 
Originally committed as revision 9550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 23:15:04 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Diego Biurrun
ee5c8a9bc4 Add some Doxygen comments, by Kamil Nowosad, k.nowosad students.mimuw.edu pl. 
Originally committed as revision 8624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-04 11:43:08 +00:00
Michael Niedermayer
716222db17 tiff encoder by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl) 
Originally committed as revision 8608 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 13:43:57 +00:00
Kostya Shishkov
615259a33e Some TIFFs do not set rows per strip for single strip. 
Originally committed as revision 7701 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-25 06:44:53 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Kostya Shishkov
ee0a035820 Support for 16-bit grayscale 
Originally committed as revision 7012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:39:28 +00:00
Kostya Shishkov
2878cecd6d Give error about planar RGB 
Originally committed as revision 7011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:38:42 +00:00
Kostya Shishkov
b39cf84cca Update error message 
Originally committed as revision 7010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:36:22 +00:00
Kostya Shishkov
339aabd5a8 Use table for determining type sizes 
Originally committed as revision 7009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:34:46 +00:00
Kostya Shishkov
213309782d Decoder can decode many ZLib-packed strips 
Originally committed as revision 7007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:27:36 +00:00
Kostya Shishkov
d00026d062 Print error message for unsupported mode (RGB planar,CMYK,YCrCb) 
Originally committed as revision 7006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:20:50 +00:00
Kostya Shishkov
e2570297c0 8-bit images support for TIFF 
Originally committed as revision 7005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 05:32:10 +00:00
Kostya Shishkov
380fd08fe6 Rows per strip may be >= height 
Originally committed as revision 7004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 05:30:50 +00:00
Kostya Shishkov
27c189394b Warn about JPEG in TIFF 
Originally committed as revision 7003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 05:29:45 +00:00
Kostya Shishkov
ec8a152b6f Correctly detect 4-component images 
Originally committed as revision 7002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 05:28:55 +00:00
Kostya Shishkov
ffc5430bc3 LZW decoder as separate module plus TIFF LZW support 
Originally committed as revision 6795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-26 04:15:48 +00:00
Kostya Shishkov
b0c32a70b4 10l predictor should not skip first line 
Originally committed as revision 6794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-26 04:06:08 +00:00
Kostya Shishkov
a991b1fecb TIFF decoder 
Originally committed as revision 6682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 10:48:29 +00:00