16756 Commits

Author SHA1 Message Date
Michael Niedermayer
f69045793d mpeg4videodec: Fix division by zero in mpeg4_decode_sprite_trajectory()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc5c49ab3247533e0a5cb203cf7122143389eb5c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:31:24 +01:00
Michael Niedermayer
3073564a97 j2kdec: Fix crash in get_qcx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 282bb02839b1ce73963c8e3ee46804f1ade8b12a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:31:06 +01:00
Michael Niedermayer
5e3389b742 j2kdec: Check curtileno for validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3eedf9f716733b3b4c5205726d2c1ca52b3d3d78)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:30:59 +01:00
Michael Niedermayer
f41e935225 j2kdec: Check for interger overflow in tile array allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3132999fdb57d8d3ba5e08a4dc1b3661e885c04d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:30:47 +01:00
Michael Niedermayer
897088d604 j2kdec: fix division by zero, check tile dimensions for validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 628c9dcca3fb3f46f960f0df8236591653c6e512)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:30:32 +01:00
Jean First
f21771260b libopenjpeg: support decoding with bits per pixel greater than 8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: Alex Zhukov
(cherry picked from commit 0d4a77472ad8a4d194e93379a992f66c33fbf144)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:30:08 +01:00
Carl Eugen Hoyos
340fee05f0 Release buffers after encoding svq1.
Fixes ticket #820.
(cherry picked from commit 8e88145d0b43a4572c1c13431c4f7ba644547c80)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:27:59 +01:00
Carl Eugen Hoyos
a5546736bd Fix a possible endless loop when decoding aac.
Fixes ticket #789.
(cherry picked from commit e5de9289232c5b14572fa13e2435f9adb0b0f1ec)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:27:49 +01:00
Alexander Strange
3aa89662ce h264: Fix a possible overread in decode_nal_units()
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit bc6a3bd4a544608211f006e2d2868cbed4e1fde6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:27:36 +01:00
Michael Niedermayer
ed0dc01a47 h264: Decode short VUI without error
Fixes 47j9R7PXBep.mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ae7a6441df26b5dd921af95677ec5e6dd35dc970)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:27:02 +01:00
Sergey Radionov
4a4e4b8139 w32thread: call ResetEvent() in pthread_cond_broadcast().
Also add "volatile" to broadcast flag (since it is used from
multiple threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 01eb9805f37835e20501134ae26e379140fe3239)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:26:47 +01:00
Gaurav Narula
a644934b80 kvmc: fix invalid reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit ad3161ec1d70291efcf40121d703ef73c0b08e5b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:25:47 +01:00
Paul B Mahol
89cf156ace adpcm: fix IMA SMJPEG decoding
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 01a01bf8bdafab1c81c3039850aba042b247626f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:25:03 +01:00
Janne Grunau
4f94de84e8 pthreads: reset active_thread_type when slice thread_init returrns early
(cherry picked from commit f77f640b3035d357a6c6ffcea243c7ea0d8ebc67)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 22:24:57 +01:00
Justin Ruggles
9665ccda10 ra144enc: zero the reflection coeffs if the filter is unstable
fixes use of uninitialized values if the filter is still unstable after using
the previous frame lpc coefficients.
(cherry picked from commit 9a3f10695a011861dcf5a649e3e72580b1a4eed4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:53 +01:00
Michael Niedermayer
1c930fe915 proresdec: Check yuv slice data sizes.
Fixes overread
Fixes Ticket812
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2b73cddd40bdfd7e3c21b2fe8cbfca0277d1f786)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:53 +01:00
Justin Ruggles
a25c7081ab truespeech: fix invalid reads in truespeech_apply_twopoint_filter()
fixes Bug 171
(cherry picked from commit f264d336fe61c12ce9607c3060aa5d3dca947c61)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:53 +01:00
Martin Storsjö
dfdb3ca341 libavcodec: Define a side data type for parameter changes
Also define a codec capability for codecs that can handle
parameters changed externally between decoded packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit fe75dc8583b65612f3a94144ee090e741dc926d5)

Conflicts:

	libavcodec/avcodec.h
	libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:53 +01:00
Martin Storsjö
c21440637e libavcodec: Define a side data type for new extradata
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 195c123cc87bb46efbadb48b2f756ae49bdb6774)

Conflicts:

	libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
f45a5c60b9 mpeg12dec: reset first_field with picture_structure changes.
Fixes Ticket809
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a40f6a5c698e314ab8c2770c1230ae0d0bd23a33)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
22721b2829 mpegaudiodec: disable unneeded and not working checked reader.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
9bd47bbcc6 mpeg12: disable checked reader.
overreads in mpeg12 are not possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 549749c68e7216b7a5714b9019ad20652e970d33)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
42b69286de mpeg4: disable checked bitstream reader, overreads are not possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06192e42fd925a2b1c1850a112038180479ddac4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
e8928f7e97 h263: disable slow checked reader, overreads are not possible in
ffmpegs h263 decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8e7776036b11bf54bc8668eda3db1852f92a37fa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:52 +01:00
Michael Niedermayer
b1933a1e12 h264: disable checking reader, overreads are not possible
in ffmpegs h264 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 38331d2036c3bd1b8f070b1fe351bb4fbfac0c34)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:51:44 +01:00
Michael Niedermayer
36e30d7ab9 proresdec2: fix for removed a32 reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 21:01:08 +01:00
Ronald S. Bultje
ea199c707c get_bits: introduce safe bitreading to prevent overreads.
When turned on, H264/CAVLC gets ~15% (CVPCMNL1_SVA_C.264) slower for
ultra-high-bitrate files, or ~2.5% (CVFI1_SVA_C.264) for lower-bitrate
files. Other codecs are affected to a lesser extent because they are
less optimized; e.g., VC-1 slows down by less than 1% (all on x86).
The patch generated 3 extra instructions (cmp, cmovae and mov) per
call to get_bits().

The performance penalty on ARM is within the error margin for most
files, up to 4% in extreme cases such as CVPCMNL1_SVA_C.264.

Based on work (for GCI) by Aneesh Dogra <lionaneesh@gmail.com>, and
inspired by patch in Chromium by Chris Evans <cevans@chromium.org>.
(cherry picked from commit 8cfbbd928cc94b4de6ad0a937cb818e999c7d75d)

Conflicts:

	configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:59:17 +01:00
Mans Rullgard
09ce851c7e get_bits: remove A32 variant
The A32 bitstream reader variant is only used on ARMv5 and for
Prores due to the larger bit cache this decoder requires.

In benchmarks on ARMv5 (Marvell Sheeva) with gcc 4.6, the only
statistically significant difference between ALT and A32 is
a 4% advantage for ALT in FLAC decoding.  There is thus no (longer)
any reason to keep the A32 reader from this point of view.

This patch adds an option to the ALT reader increasing the bit
cache to 32 bits as required by the Prores decoder.  Benchmarking
shows no significant change in speed on Intel i7.  Again, the
A32 reader fails to justify its existence.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1e98f198e9db4e5ddfc2f777014179d3d7bc4d2)

Conflicts:

	libavcodec/get_bits.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:58:22 +01:00
Sergey Radionov
0f38b11939 w32threads: wait for the waked thread in pthread_cond_signal.
This fixes a deadlock VLC triggered with multithreaded decoding. The
wait forces one of the current waiters to wake and not the thread
which calls pthread_cond_signal() itself.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2003a29284660255016b1ec4bd5dfb8d53e6a852)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:49:52 +01:00
Michael Niedermayer
d20e948f07 indeo3: Fix null ptr dereference
Fixes Ticket804
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 134aaa79f7f1ce1df64afc7d10d2b3de77df7b08)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:01:50 +01:00
Michael Niedermayer
acbdee0a2b golomb: fix end of bitstream check
Fixes Ticket806
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc739b79ad7d0c360782a3193f4e6f9c30147707)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:01:45 +01:00
Rafaël Carré
fa86884dbc lavc: always align height by 32 pixel
Interlaced content for most codec requires it.
This patch is a stop-gap pending a serious rework to support
codecs with non 16 pixel macroblocks.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 37c0dc626d2f8254ef623d987eb5077f9120755f)

Conflicts:

	libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:01:13 +01:00
Luca Barbato
3d207417fb raw: add 10bit YUV definitions
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 91b1e6f0c678e5d096185c2011f4ca56a3290a20)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 20:00:13 +01:00
Michael Niedermayer
41ff9350e9 indeo5: Fix null pointer dereference
Fixes Ticket803
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f27930cd9a2d4970b182024a42a9f5103c942f21)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:59:33 +01:00
Aneesh Dogra
ae26aab2c3 bytestream: add a new set of bytestream functions with overread checking
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
(cherry picked from commit fd22616c593156a35b4fe6acbd3668b0802f5f84)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:58:41 +01:00
Michael Niedermayer
d8d25f143f alac: Check for bitstream overread
Fixes Ticket801
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a8469223f6bb756a44f6579439fcae24ccc739b1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:56:06 +01:00
Michael Niedermayer
c550d56414 tm2: Check remaining size before init_get_bits()
Fixes a null pointer dereference.
Fixes 2nd half of Ticket800
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 65f0f9183b99881af58e90e3ae2ad8b0181d52f1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:56:01 +01:00
Aneesh Dogra
2cdd89a561 xl: Fix overreads
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 00aad121d8a6f365641345a8321bdaac1ff80649)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
125894f15f eamad: pass & check errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d0ae92a259b924952856de1a5ca0dc6fd5031e5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
54cfb532a0 eamad: fix excessive memory allocation.
Fixes Ticket792
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03a9c9932dbceff4d42d82b9c4fccf860093f0e9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
9c338b7c4c tqi: Fix passing errors from the MB decode. This silences some valgrind warnings.
Fixes second half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f85334f58e1286287d0547a49fa9c93b40cbf48f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
25cadd366b adpcm: Fix crash
Fixes half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 608708009f69ba4cecebf05120c696167494c897)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
f57c629b18 proresdec: add UPDATE_CACHE, should fix decoding with -Os
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 29179239f5cf11c189a0ef20605ef5f5963fdb18)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Paul B. Mahol
d1e1674f66 cljr: fix buf_size sanity check
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 2e7905eee8d0f8813e703cacdd7b3ffdc4960656)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
d0269db8e3 adx_parser: rewrite.
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7859740c6a2f9bc3dd247dc63b8e7cbd6181a5dd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
cb42ed171d adxdec: Fix division by zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b6b84ae1625ce1e38ff5f1b4c0bf03450066e66)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
2bbda9872f adxdec: Do not require extradata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bdd62a615a74ba7d29b528263462937da132c62c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
9dd420ede1 adx_parser: Fix infinite loop.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3bf1d787b58cf268f3c055d6f2509fd75258450b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Carl Eugen Hoyos
bf58e5422d Fix possible endless loop when decoding amr.
Fixes bug 151.

Reviewed-by: Vitor Sessak
(cherry picked from commit 290e7eb77bee5a54182fb3d5fb122c1e117190da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:10:33 +01:00
Michael Niedermayer
88eaab2827 motion_est: avoid generating motion vectors that point between widthxheight and mb_widthxmb_height.
No difference in PSNR or bitrate in the printed precission with the matrix lobby scene at 322x242

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 56bf2c2a192523e1d0f2328bd755e63b4a0a79f8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:09:45 +01:00