generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
50,382 Commits 24 Branches 241 Tags 173 MiB
d9fad53f4b
Commit Graph

48 Commits

Author SHA1 Message Date
Nicolas George
bf63a474ca lavc/exr: use size_t instead of int for sizes. 
Fix a segfault on 64-bits archs.
 2013-02-28 19:13:58 +01:00
Paul B Mahol
9774145fe5 exr: simplify decompression path 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-27 16:28:32 +00:00
Paul B Mahol
7b12554c5a exr: make sure that data_size is not bigger than expected 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-24 14:27:39 +00:00
Paul B Mahol
74a78bfe6c exr: simplify filling channel_buffer[] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-24 14:27:39 +00:00
Paul B Mahol
645f96f129 exr: check color channel subsampling too 
If there is unsupported subsampling encountered abort
early instead of failing decoding later.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-24 14:27:39 +00:00
Paul B Mahol
1a08758e7c exr: slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-24 14:27:39 +00:00
Paul B Mahol
89c77b6b15 exr: shorter channel buffer names 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 19:31:00 +00:00
Paul B Mahol
7a930f310a exr: remove superfluous check 
get_header_variable_length() already check for
out of array read and returns 0 in such case.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:55 +00:00
Paul B Mahol
fefd4b0924 exr: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:55 +00:00
Paul B Mahol
9c75c24de4 exr: check if line offset table is complete only once per frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:54 +00:00
Paul B Mahol
cc0bd78413 exr: support more line orders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:54 +00:00
Paul B Mahol
1178868683 exr: fix overflow check in lineoffset processing 
Also read data size for raw compressions too and
make sure its value is sane.

Remove code that fills missing blocks with zeroes.
It is marginally useful and make implementation
of actually useful features harder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:54 +00:00
Paul B Mahol
88d7259fd2 exr: merge multiple if () blocks 
Remove useless comments.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:54 +00:00
Paul B Mahol
3456891291 exr: check version too 
Separate version from flags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-22 18:59:54 +00:00
Paul B Mahol
59015c1118 exr: constify s in rle_uncompress() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 12:02:18 +00:00
Paul B Mahol
a3d890527e exr: reset compression in decode_frame() 
This fixes decoding of images if compression changes.
Regression since b040ffc84c.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 12:02:18 +00:00
Paul B Mahol
4012cd6c4f lavc: fix decode_frame() third parameter semantics for rest of video decoders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 18:24:43 +00:00
Michael Niedermayer
0d002de4a4 exr: fix twin ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 17:58:15 +02:00
Paul B Mahol
a51540d811 lavc: do not use av_pix_fmt_descriptors directly 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 15:31:42 +00:00
Michael Niedermayer
ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:06:57 +02:00
Paul B Mahol
e4fff08f5b exr: fix decoding ZIP16 and height not multiple of 16 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-29 09:33:41 +00:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 22:45:46 +02:00
Paul B Mahol
b040ffc84c exr: display warning if multiple compression attributes are found 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
Paul B Mahol
01f76a779c exr: merge common code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
Paul B Mahol
a2dab7512e exr: compression attribute is mandatory 
Do not continue decoding if one is missing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
Paul B Mahol
7543fd80e5 exr: check size of uncompressed buffer returned by uncompress() 
The actual size of uncompressed buffer returned by uncompress() may be
smaller than expected, so abort decoding in such cases.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-16 00:39:37 +00:00
Paul B Mahol
2c31ed3330 exr: make channel_offsets int instead of int8_t 
Prior to this change max number of channels for float data which was
going to be correctly decoded was 32, which is rather small
considering that exr allows multiple channel layers.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-15 02:53:51 +00:00
Paul B Mahol
bc0ef29cf0 exr: fix scan_line_size calculation 
This one will also work in cases when file have channels
we are not going to use.

Only compressed files where affected by this bug.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 23:48:50 +00:00
Paul B Mahol
cd3136e84a exr: print channel names not yet supported 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 23:02:11 +00:00
Paul B Mahol
fedefe4a87 exr: remove double ;; 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 21:14:01 +00:00
Paul B Mahol
1033807313 exr: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 21:08:37 +00:00
Paul B Mahol
f7e26cca89 exr: rle decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-12 17:36:55 +00:00
Paul B Mahol
a568a84edf exr: cache some values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-12 01:07:22 +00:00
Paul B Mahol
74f3c53b57 exr: zip decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-11 20:46:56 +00:00
Paul B Mahol
5ee41d00f6 exr: remove dead assigment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-11 20:43:37 +00:00
Paul B Mahol
b4d0c3d9d2 exr: return proper error code instead of -1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-10 01:30:40 +00:00
Paul B Mahol
dc0d551b52 exr: use buf_size instead of recalculating same value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-10 01:28:38 +00:00
Paul B Mahol
07df939aa3 exr: support for reading pixelAspectRatio 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-09 02:51:06 +00:00
Paul B Mahol
5d23043c12 exr: add CODEC_CAP_DR1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:40:55 +00:00
Paul B Mahol
f5af8d5e76 exr: make message about missing feature more useful 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 12:07:41 +00:00
Paul B Mahol
d66b0cd5c5 exr: alpha support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 07:06:12 +00:00
Jean First
f7985f348f exr: fix header parsing 
the header in the sample provided for ticket #1306 is not parsed correctly and thus
ffmpeg tries to decode the sample instead of abording the decoding.

I tested it with two other exr samples I have - one float, one half float - and
they still decode correctly.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:39:08 +02:00
Clément Bœsch
3c1d52d30b Fix a few @file doxy inconsistencies. 2012-05-04 18:50:59 +02:00
Michael Niedermayer
3532a87a25 exr: optimize exr_halflt2uint() 
30% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-09 20:55:09 +02:00
Michael Niedermayer
bd128e9bff exr: fix mixed declaration and statements. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-06 21:07:53 +02:00
Michael Niedermayer
f148537c41 exr: various cleanup and security related fixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-06 08:32:09 +02:00
Michael Niedermayer
634c01bc18 exr: fix av_logs() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-06 08:32:09 +02:00
Jimmy Christensen
b7ce3242f8 lavc: add a OpenEXR decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-06 08:32:09 +02:00