summaryrefslogtreecommitdiff
path: root/libavcodec/exr.c
Commit message (Collapse)AuthorAge
* lavc & lavf: replace deprecated av_log* functionsPaul B Mahol2013-03-15
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc: factorize ff_{thread_,re,}get_buffer error messages.Clément Bœsch2013-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coccinelle profile used: @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_get_buffer(ctx, f, flags)) < 0) + return r; @@ expression r, ctx, f, loglevel, str; @@ -if ((r = ff_reget_buffer(ctx, f)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_reget_buffer(ctx, f)) < 0) + return r; @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) + return r; ...along with some manual patches for the remaining ones.
* exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but ↵Michael Niedermayer2013-03-13
| | | | | | not used" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* exr: use bytestream functions in pxr24_uncompress()Paul B Mahol2013-03-01
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: pxr24 decompressionPaul B Mahol2013-02-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: fix error message when pixel type is not setPaul B Mahol2013-02-28
| | | | | | This only happens with missing chlist attribute from header. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: s/bits_per_color_id/pixel_typePaul B Mahol2013-02-28
| | | | | | | | | Previous naming was misleading. Also fix wrong message about missing support for 32-bit unsigned int pixel type. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: track channels propertiesPaul B Mahol2013-02-28
| | | | | | | Needed for proper decoding of channels with subsampling and also for remaining compression methods. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc/exr: use size_t instead of int for sizes.Nicolas George2013-02-28
| | | | Fix a segfault on 64-bits archs.
* exr: simplify decompression pathPaul B Mahol2013-02-27
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: make sure that data_size is not bigger than expectedPaul B Mahol2013-02-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: simplify filling channel_buffer[]Paul B Mahol2013-02-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: check color channel subsampling tooPaul B Mahol2013-02-24
| | | | | | | If there is unsupported subsampling encountered abort early instead of failing decoding later. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: slice threadingPaul B Mahol2013-02-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: shorter channel buffer namesPaul B Mahol2013-02-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: remove superfluous checkPaul B Mahol2013-02-22
| | | | | | | 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>
* exr: cosmetics: reindentPaul B Mahol2013-02-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: check if line offset table is complete only once per framePaul B Mahol2013-02-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: support more line ordersPaul B Mahol2013-02-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: fix overflow check in lineoffset processingPaul B Mahol2013-02-22
| | | | | | | | | | | 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>
* exr: merge multiple if () blocksPaul B Mahol2013-02-22
| | | | | | Remove useless comments. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: check version tooPaul B Mahol2013-02-22
| | | | | | Separate version from flags. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: constify s in rle_uncompress()Paul B Mahol2013-02-21
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: reset compression in decode_frame()Paul B Mahol2013-02-21
| | | | | | | This fixes decoding of images if compression changes. Regression since b040ffc84c5e. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc: fix decode_frame() third parameter semantics for rest of video decodersPaul B Mahol2012-12-05
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: fix twin ;Michael Niedermayer2012-10-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* exr: fix decoding ZIP16 and height not multiple of 16Paul B Mahol2012-08-29
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* exr: display warning if multiple compression attributes are foundPaul B Mahol2012-07-20
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: merge common codePaul B Mahol2012-07-20
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: compression attribute is mandatoryPaul B Mahol2012-07-20
| | | | | | Do not continue decoding if one is missing. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: check size of uncompressed buffer returned by uncompress()Paul B Mahol2012-07-16
| | | | | | | 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>
* exr: make channel_offsets int instead of int8_tPaul B Mahol2012-07-15
| | | | | | | | 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>
* exr: fix scan_line_size calculationPaul B Mahol2012-07-13
| | | | | | | | | 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>
* exr: print channel names not yet supportedPaul B Mahol2012-07-13
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: remove double ;;Paul B Mahol2012-07-13
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: frame multithreading supportPaul B Mahol2012-07-13
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: rle decompressionPaul B Mahol2012-07-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: cache some valuesPaul B Mahol2012-07-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: zip decompressionPaul B Mahol2012-07-11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: remove dead assigmentPaul B Mahol2012-07-11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: return proper error code instead of -1Paul B Mahol2012-07-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: use buf_size instead of recalculating same valuePaul B Mahol2012-07-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: support for reading pixelAspectRatioPaul B Mahol2012-07-09
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: add CODEC_CAP_DR1Paul B Mahol2012-07-08
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: make message about missing feature more usefulPaul B Mahol2012-05-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* exr: alpha supportPaul B Mahol2012-05-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 14:05:09 +0000