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

110 Commits

Author SHA1 Message Date
Martin Vignali
9511a0895d avcodec/exr: indent b44 uncompress function 2016-06-06 15:59:18 +02:00
Martin Vignali
bc1f3dfaa3 avcodec/exr: fix decoding of B44 exr when all channel doesnt have the same pixel type 2016-06-06 15:42:34 +02:00
Martin Vignali
df7cd4176a avcodec/exr: move channel_line_size to thread data 
In order to be used by b44 uncompress.
 2016-06-06 15:42:30 +02:00
Martin Vignali
03152e74df avcodec/exr: improve pxr24 uncompress 
Fix pxr24 uncompress when all channels doesnt have the same pixel type.
The expected length after zip decoding, is now calculated channel by channel.
 2016-06-06 15:39:46 +02:00
Martin Vignali
16107aeaf3 avcodec/exr: remove unneed scanline_size var 2016-06-06 15:39:39 +02:00
Martin Vignali
42297d8419 avcodec/exr: fix tile decoding when all channels doesnt have the same pixel type 
Also simplify the tile code, sharing more code with the scanline mode.
 2016-06-06 15:39:22 +02:00
Martin Vignali
d24eb9a3c6 avcodec/exr: indent the if (layer_match) part 2016-06-06 15:39:06 +02:00
Martin Vignali
753088a2a4 avcodec/exr: fix layer detection 
Only test a channel if the layer name match.
Avoid to try to mix channel between the main layer (rgba layer),
and the layer request by the user.
 2016-06-06 15:38:35 +02:00
Michael Niedermayer
df01a29c1b avcodec/exr: Fix potential integer overflow 
Fixes CID1361949

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-19 03:28:25 +02:00
Martin Vignali
3ce19882c5 libavcodec/exr: move xsize and ysize to thread data 
Fixes slice threading.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-25 14:19:05 -03:00
Michael Niedermayer
487c346d98 avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-17 01:52:26 +02:00
Martin Vignali
ac07e57c39 avcodec/exr: fix huf_decode 2016-04-12 22:54:56 +02:00
Paul B Mahol
392b0a25c2 avcodec/exr: fix clearing end of bitmap 
Inspired by patch from Martin Vignali.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-12 22:54:56 +02:00
Martin Vignali
2dd7b46132 avcodec/exr: fix channel detection 2016-04-10 19:24:15 +02:00
Martin Vignali
6d7f5667a0 avcodec/exr: enable mipmap, ripmap decoding 2016-04-06 13:12:22 +02:00
Martin Vignali
832861535a libavcodec/exr : add support for compression in tile 2016-04-04 22:30:50 +02:00
Martin Vignali
062ad63064 libavcodec/exr : cosmetic change 2016-04-04 22:30:33 +02:00
Martin Vignali
25a01c52b8 libavcodec/exr: add tile support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-03 17:09:34 +02:00
Martin Vignali
d2ed3391fb libavcodec/exr: fix PRX24 Float decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-03 17:09:29 +02:00
Martin Vignali
495f08edb4 avcodec/exr: add support for B44 and B44A compression 2016-03-26 09:27:26 +01:00
Carl Eugen Hoyos
31f5fa21b0 lavc/exr: Move setting SAR down. 
Fixes a theoretical issue if the resolution attribute is written
behind the aspect attribute.
 2016-01-30 13:38:16 +01:00
Hendrik Leppkes
95a2b883e3 Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1' 
* commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1':
  Remove stray line breaks from avpriv_{report_missing_feature|request_samples}

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-01-02 13:20:13 +01:00
Diego Biurrun
69a68593ce Remove stray line breaks from avpriv_{report_missing_feature|request_samples} 2015-12-26 10:28:03 +01:00
Andreas Cadhalpun
90b99a8107 exr: fix out of bounds read in get_code 
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>
 2015-12-18 15:30:04 +01:00
Andreas Cadhalpun
5ea59b1f42 exr: fix out of bounds read in get_code 
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>
 2015-12-16 22:22:06 +01:00
Ganesh Ajjanagadde
2cbaa078d1 avcodec: use HAVE_THREADS header guards to silence -Wunused-function 
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>
 2015-10-04 12:47:34 -04:00
Kevin Wheatley
a1fa5392e6 avcodec/exr: Mark up the decoded buffer as the appropriate transfer characteristic when applying one 2015-09-10 23:53:05 +02:00
Kevin Wheatley
7eb3233352 avcodec/exr: Add support for applying a transfer characteristic curve to OpenEXR inputs. 
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
 2015-09-10 23:53:05 +02:00
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* 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>
 2015-07-27 22:50:18 +02:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Paul B Mahol
a03b69478b avcodec/exr: fix crash caused by merge 
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>
 2015-06-06 16:02:19 +00:00
Michael Niedermayer
5dd5b7d531 Revert "avcodec/exr: fix memset first arg in reverse_lut()" 
This reverts commit 586ba24ff2.

Fixes Ticket 4386

Found-by: Martin Vignali <martin.vignali@gmail.com>
 2015-04-01 19:53:23 +02:00
Paul B Mahol
586ba24ff2 avcodec/exr: fix memset first arg in reverse_lut() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-22 17:30:50 +00:00
Michael Niedermayer
81f116d31c Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d' 
* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
  exr: Add a gamma flag to exr loader to avoid banding

Conflicts:
	libavcodec/exr.c

See: cd3daad77e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 21:58:33 +01:00
Gonzalo Garramuno
e0bb74a140 exr: Add a gamma flag to exr loader to avoid banding 
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>
 2014-12-03 02:55:40 +00:00
Michael Niedermayer
a5adeff457 Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f' 
* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f':
  exr: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 01:55:21 +01:00
Vittorio Giovara
3a6ddfb874 exr: check return value 
CC: libav-stable@libav.org
Bug-Id: CID 1198259
 2014-11-14 20:25:21 +01:00
Michael Niedermayer
0dceefc5fa Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2' 
* 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>
 2014-06-20 22:20:28 +02:00
Justin Ruggles
9e500efdbe Add av_image_check_sar() and use it to validate SAR 2014-06-20 10:39:33 -04:00
Michael Niedermayer
126927c58e avcodec/exr: mark gama option as experimental / unsupported 
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-08 21:10:53 +02:00
Gonzalo Garramuno
cd3daad77e avcodec/exr: Add a gamma flag to exr loader to avoid banding 
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>
 2014-05-08 21:00:56 +02:00
Michael Niedermayer
879072018f avcodec/exr: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 05:18:26 +02:00
Michael Niedermayer
95582b5ccc Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b' 
* 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>
 2014-04-01 03:16:56 +02:00
Jimmy Christensen
38389058c3 OpenEXR decoder 
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>
 2014-04-01 01:13:09 +02:00
Gonzalo Garramuno
3d20260157 avcodec/exr: read layers 
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>
 2014-02-18 18:11:23 +01:00
Paul B Mahol
256b986c04 avcodec/exr: stop using deprecated avcodec_set_dimensions() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-01 19:05:35 +00:00
Michael Niedermayer
80b1e1c03d avcodec/exr: fix null pointer dereference 
Fixes CID1108582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:28:08 +02:00
Michael Niedermayer
d0812f91c8 avcodec/exr: favor av_freep() over av_free() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:27:36 +02:00
Paul B Mahol
4413dcc035 avcodec/exr: piz decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-16 14:54:59 +00:00
Paul B Mahol
996c73490c avcodec/exr: remove pointless initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 18:24:49 +00:00