virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
60,763 Commits 37 Branches 400 Tags 460 MiB
3edc3b1595
Commit Graph

40 Commits

Author SHA1 Message Date
Michael Niedermayer
e54f4510aa avcodec/jpeg2000: zero i/f_data 
Fixes uninitialized use of variables

Fixes part of Ticket2921

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-13 21:48:28 +02:00
Michael Niedermayer
9e477a3770 jpeg2000: fix null pointer dereference in case of malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer
09927f3eaa jpeg2000: zero reslevel array on allocation 
prevent use of uninitialized values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer
912ce9dd20 jpeg2000: fix dereferencing invalid pointers 
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 17:36:53 +02:00
Michael Niedermayer
f57119b8e5 jpeg2000: fix overflow in dequantization 
Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-13 12:44:37 +02:00
Michael Niedermayer
1abb875c98 Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788' 
* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
	libavcodec/jpeg2000.c

See: 9d56ccf5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 16:11:01 +02:00
Michael Niedermayer
2328e7e865 Merge commit '5bf208f659703895df7926238dcfa8a8175de36b' 
* commit '5bf208f659703895df7926238dcfa8a8175de36b':
  jpeg2000: Use separate fields for int and float codepaths
  jpeg2000: Split int/float codepaths depending on the DWT

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 15:30:05 +02:00
Michael Niedermayer
11cf4b7247 Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea' 
* commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
  jpeg2000: Improve reduced resolution decoding
  jpeg2000: Compute quantization for 'scalar derived' in the correct case.
  jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 15:20:37 +02:00
Michael Niedermayer
ac3ca3d311 Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f' 
* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
  jpeg2000: Propagate error code from get_cox()
  jpeg2000: Check that nreslevels2decode has been initialized before use

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 14:50:51 +02:00
Luca Barbato
daeb4e3042 jpeg2000: Proper cleanup on failure in decode_frame() 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:47 +02:00
Michael Niedermayer
5bf208f659 jpeg2000: Use separate fields for int and float codepaths 
Split stepsize and data into int and float variants.
Eliminates a number of casts and simplifies spotting errors.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:46 +02:00
Michael Niedermayer
db13e02c6f jpeg2000: Compute corrections of sub-band coordinates 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:46 +02:00
Michael Niedermayer
690c8af97b jpeg2000: Remove unneeded variable initialization 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:46 +02:00
Michael Niedermayer
952f7ed3c0 jpeg2000: Compute quantization for 'scalar derived' in the correct case. 
Scalar derived case is represented by the JPEG2K_QSTY_SI define.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
78962d3df4 jpeg2000: Check that nreslevels2decode has been initialized before use 
Avoid buffer overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
4e11b15534 jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component() 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
4cbd5ed11b jpeg2000: Fix compute precedence error in lut_gain index 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
b44925ae6b jpeg2000: Initialize code blocks structures in precincts to 0 
Prevent use of uninitialized memory / valgrind failure.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
2c3901b2c3 jpeg2000: Remove unneeded returns 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-02 20:05:45 +02:00
Michael Niedermayer
ffb1051b9b jpeg2000: Zero prec->cblk 
Prevent use of uninitialized memory / valgrind failure

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 22:02:54 +02:00
Michael Niedermayer
6e9bfc19bd jpeg2000: check that nreslevels2decode has been initialized before use 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
234f76ae7d jpeg2000: Fix unintended sign extension in malloc arguments of prec 
Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:40 +02:00
Michael Niedermayer
d8c10324ed jpeg2000: Fix Unintended sign extension in malloc arguments of cblk. 
Fixes CID1026770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:16:19 +02:00
Michael Niedermayer
9d56ccf5af j2k/jpeg2000dec: merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:08 +02:00
Michael Niedermayer
62d00aa22f jpeg2000/j2k: merge j2k/jpeg2000.c/h 
Now only j2kdec / jpeg2000dec.c remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:57:58 +02:00
Michael Niedermayer
c2ac389bba jpeg2000: remove unneeded casts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
09e03a8467 jpeg2000: merges quantization fixes from j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
efc2df2e27 jpeg2000: remove unneeded variable initialization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
84a6bc2357 jpeg2000: tag_tree_size: replace check by assert 
This function is never called with values large enough for the
error condition to occur

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
8bedbb82ce j2k/jpeg2000: split data pointer in int & float. 
This fixes a TODO item and unifies both decoders structures
It also fixes undefined behavior due to aliasing violations

I choose 2 fields instead of a union because mistakely using the
wrong type with a union will lead to hard to debug "wrong output"
while with 2 fields mistakely using the wrong type will crash
with a null pointer derefernce which is much easier to debug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:18:53 +02:00
Michael Niedermayer
fe7136ef82 j2k/jpeg2000: split stepsize in float & int variables 
This is more clear and less prone to mistakes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 22:16:14 +02:00
Michael Niedermayer
f7129ab928 j2k/jpeg2000: fix typo in lut_gain index 
no testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 22:16:14 +02:00
Michael Niedermayer
32475f56f3 j2kdec/jpeg2000dec: partially merge quantization code 
The quantization code needs more work, not so much work
merging but more work investigating what is correct.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 19:02:00 +02:00
Michael Niedermayer
1b5cb6c00a j2k/jpeg2000: Partially merge quantization code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 17:50:54 +02:00
Michael Niedermayer
9a18395b92 j2k/jpeg2000: merge a few whitespaces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 16:10:36 +02:00
Michael Niedermayer
14652c080d j2k/jpeg2000: restructure cblk coord 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
874a06bd1f j2k: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
b67fe48f34 jpeg2000/j2k: merge getsigctxno() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +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