summaryrefslogtreecommitdiff
path: root/libavcodec/exr.c
Commit message (Collapse)AuthorAge
* lavc/exr: Move setting SAR down.Carl Eugen Hoyos2016-01-30
| | | | | Fixes a theoretical issue if the resolution attribute is written behind the aspect attribute.
* Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1'Hendrik Leppkes2016-01-02
|\ | | | | | | | | | | | | * commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1': Remove stray line breaks from avpriv_{report_missing_feature|request_samples} Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * Remove stray line breaks from avpriv_{report_missing_feature|request_samples}Diego Biurrun2015-12-26
| |
| * exr: fix out of bounds read in get_codeAndreas Cadhalpun2015-12-16
| | | | | | | | | | | | | | | | This macro unconditionally used out[-1], which causes an out of bounds read, if out is the very beginning of the buffer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | exr: fix out of bounds read in get_codeAndreas Cadhalpun2015-12-18
| | | | | | | | | | | | | | This macro unconditionally used out[-1], which causes an out of bounds read, if out is the very beginning of the buffer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec: use HAVE_THREADS header guards to silence -Wunused-functionGanesh Ajjanagadde2015-10-04
| | | | | | | | | | | | | | | | | | | | When compiled with --disable-pthreads, e.g http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7, a bunch of -Wunused-functions are reported due to missing header guards around threading related functions. This patch should silence such warnings. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/exr: Mark up the decoded buffer as the appropriate transfer ↵Kevin Wheatley2015-09-10
| | | | | | | | characteristic when applying one
* | avcodec/exr: Add support for applying a transfer characteristic curve to ↵Kevin Wheatley2015-09-10
| | | | | | | | | | | | OpenEXR inputs. Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-27
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/exr: fix crash caused by mergePaul B Mahol2015-06-06
| | | | | | | | | | | | | | | | Various header informations need to be reset when decoding next frame. Regression since: 95582b5c Fixes ticket #4597. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Revert "avcodec/exr: fix memset first arg in reverse_lut()"Michael Niedermayer2015-04-01
| | | | | | | | | | | | | | | | This reverts commit 586ba24ff29468d2a4ee843a9650feea5b2be6f6. Fixes Ticket 4386 Found-by: Martin Vignali <martin.vignali@gmail.com>
* | avcodec/exr: fix memset first arg in reverse_lut()Paul B Mahol2015-02-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'Michael Niedermayer2014-12-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d': exr: Add a gamma flag to exr loader to avoid banding Conflicts: libavcodec/exr.c See: cd3daad77ea420f3373d3c5feee46825d235cccc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * exr: Add a gamma flag to exr loader to avoid bandingGonzalo Garramuno2014-12-03
| | | | | | | | | | | | | | | | This is needed to avoid banding artifacts when gammaing the picture. Currently, if done with a video filter, the process is done on uints instead of full float. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'Michael Niedermayer2014-11-15
|\| | | | | | | | | | | | | * commit '3a6ddfb8745e4b306a5637927fb057f630345e2f': exr: check return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * exr: check return valueVittorio Giovara2014-11-14
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1198259
* | Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer2014-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_image_check_sar() and use it to validate SARJustin Ruggles2014-06-20
| |
* | avcodec/exr: mark gama option as experimental / unsupportedMichael Niedermayer2014-05-08
| | | | | | | | | | Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exr: Add a gamma flag to exr loader to avoid bandingGonzalo Garramuno2014-05-08
| | | | | | | | | | | | | | | | This is needed to avoid banding artifacts when gammaing the picture. Currently, if done with a video filter, the process is done on uints instead of full float. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exr: use av_freep() for safteyMichael Niedermayer2014-04-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38389058c3308758c6365abd0f6b45c5e62bb90b': OpenEXR decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/exr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * OpenEXR decoderJimmy Christensen2014-04-01
| | | | | | | Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* avcodec/exr: read layersGonzalo Garramuno2014-02-18
| | | | | | | | | | | | | | | | | EXR files have, like tiffs, multiple channels and layers. I have a patch for exr.c that allows you to select the layer you want to process thru a -layer flag. It is not bulletproof but works for all layers that have 3 channels in them (normals, motion vectors, etc). The calling convention for ffmpeg is: ffmpeg -layer Diffuse -i myexr.%d.exr test.mov Here's an exr image with multiple layers: http://www.datafilehost.com/d/e45d9a1c Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/exr: stop using deprecated avcodec_set_dimensions()Paul B Mahol2013-11-01
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/exr: fix null pointer dereferenceMichael Niedermayer2013-10-19
| | | | | | Fixes CID1108582 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/exr: favor av_freep() over av_free() for safteyMichael Niedermayer2013-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/exr: piz decompressionPaul B Mahol2013-10-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/exr: remove pointless initializationPaul B Mahol2013-10-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/exr: use avpriv_report_missing_feature()Paul B Mahol2013-10-09
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* cosmetics: group remaining .name and .long_name.Clément Bœsch2013-10-04
| | | | See b2bed9325.
* exr: set pict_typePaul B Mahol2013-07-27
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 15:37:24 +0000