generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,046 Commits 24 Branches 241 Tags
Commit Graph

10 Commits

Author SHA1 Message Date
Michael Niedermayer
c1db1a5ff4 avcodec/jpeg2000dwt: Check ndeclevels before calling dwt_encode*() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit feb3f39614b88c113211a98dda1bc2fe5c3c6957)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-12-14 16:51:00 +01:00
Michael Niedermayer
8ef86669ca avcodec/jpeg2000dwt: Check ndeclevels before calling dwt_decode*() 
Fixes out of array access
Fixes: 01859c9a9ac6cd60a008274123275574/asan_heap-oob_1dff571_8250_50d3d1611e294c3519fd1fa82198b69b.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 75422280fbcdfbe9dc56bde5525b4d8b280f1bc5)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-12-14 16:51:00 +01:00
Michael Niedermayer
1aa388d439 avcodec/jpeg2000dwt: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:52:45 +02:00
Michael Niedermayer
8a266aaaac avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT 
Tha fate tests change because the edge mirroring was wrong before this commit

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 13:24:20 +02:00
Michael Niedermayer
96b71a6ec5 avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 float IDWT 
10% faster

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 13:18:40 +02:00
Michael Niedermayer
197e219c92 jpeg2000dwt: add float based 9/7 dwt 
Untested as theres no code yet using it in the encoder.
Code based on mixed float/int dwt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:42:19 +02:00
Michael Niedermayer
cf05fe8a7e jpeg2000dwt: remove floats from mixed float/int 9/7 dwt 
This should fix some fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:35:49 +02:00
Michael Niedermayer
d4a4661342 j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 21:54:07 +02:00
Michael Niedermayer
e2e9bee2da Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 20:00:54 +02:00
Nicolas Bertrand
c81a706381 JPEG 2000 decoder for DCinema 
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-22 15:38:29 +02:00