ffmpeg.git
9 years agodoc: avoid "@table has text but no @item" warning.
Clément Bœsch [Sun, 9 Oct 2011 08:23:58 +0000 (10:23 +0200)]
doc: avoid "@table has text but no @item" warning.

9 years agoAllow YUV444P and RGB/BGR encoding for libx264.
Themaister [Sat, 8 Oct 2011 10:16:43 +0000 (12:16 +0200)]
Allow YUV444P and RGB/BGR encoding for libx264.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: fix signed overflow in avformat_find_stream_info()
  vp8: fix signed overflows
  motion_est: fix some signed overflows
  dca: fix signed overflow in shift
  aacdec: fix undefined shifts
  bink: Check for various out of bound writes
  bink: Check for out of bound writes when building tree
  put_bits: fix invalid shift by 32 in flush_put_bits()

Conflicts:
libavcodec/bink.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoqtrle: check for out of bound writes.
Laurent Aimar [Sat, 8 Oct 2011 21:40:36 +0000 (23:40 +0200)]
qtrle: check for out of bound writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoxxan: check for out of bound accesses
Laurent Aimar [Sat, 8 Oct 2011 21:40:34 +0000 (23:40 +0200)]
xxan: check for out of bound accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotxd: check for out of bound reads.
Laurent Aimar [Sat, 8 Oct 2011 19:57:27 +0000 (21:57 +0200)]
txd: check for out of bound reads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoqtrle: check for invalid line offset
Laurent Aimar [Sat, 8 Oct 2011 21:01:33 +0000 (23:01 +0200)]
qtrle: check for invalid line offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovqavideo: check for out of bound reads.
Laurent Aimar [Sat, 8 Oct 2011 23:54:41 +0000 (01:54 +0200)]
vqavideo: check for out of bound reads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovqa: fix double free on corrupted streams
Laurent Aimar [Sat, 8 Oct 2011 21:40:37 +0000 (23:40 +0200)]
vqa: fix double free on corrupted streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovqavideo: check for invalid/unsupported version
Laurent Aimar [Sat, 8 Oct 2011 21:40:39 +0000 (23:40 +0200)]
vqavideo: check for invalid/unsupported version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeamad: release the reference frame on video size changes
Laurent Aimar [Sat, 8 Oct 2011 21:40:33 +0000 (23:40 +0200)]
eamad: release the reference frame on video size changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeamad: check for out of bound reads when doing MC
Laurent Aimar [Sat, 8 Oct 2011 21:40:31 +0000 (23:40 +0200)]
eamad: check for out of bound reads when doing MC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeamad: avoid NULL derefence when missing the reference frame.
Laurent Aimar [Sat, 8 Oct 2011 21:40:32 +0000 (23:40 +0200)]
eamad: avoid NULL derefence when missing the reference frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeatgv: fix pointer arithmetic overflows.
Laurent Aimar [Sat, 8 Oct 2011 21:40:28 +0000 (23:40 +0200)]
eatgv: fix pointer arithmetic overflows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeatgv: fix out of bound reads on corrupted motions vectors.
Laurent Aimar [Sat, 8 Oct 2011 21:40:27 +0000 (23:40 +0200)]
eatgv: fix out of bound reads on corrupted motions vectors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeamad: clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
Laurent Aimar [Sat, 8 Oct 2011 21:40:30 +0000 (23:40 +0200)]
eamad: clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoatrac1: give a valid context pointer to av_log().
Laurent Aimar [Sat, 8 Oct 2011 21:40:26 +0000 (23:40 +0200)]
atrac1: give a valid context pointer to av_log().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopixdesc: fix gbr24p
Michael Niedermayer [Sat, 8 Oct 2011 22:59:59 +0000 (00:59 +0200)]
pixdesc: fix gbr24p

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix y/N regression so that \n is always needed
Michael Niedermayer [Sat, 8 Oct 2011 22:59:15 +0000 (00:59 +0200)]
ffmpeg: fix y/N regression so that \n is always needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: gbr24p input support
Michael Niedermayer [Sat, 8 Oct 2011 21:07:05 +0000 (23:07 +0200)]
sws: gbr24p input support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeval: fix () bug in not.
Michael Niedermayer [Sat, 8 Oct 2011 21:16:53 +0000 (23:16 +0200)]
eval: fix () bug in not.

Found-by: Oded Shimon
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: Fix prototypes of *toyv12 so they can be used with planar rgb input.
Michael Niedermayer [Sat, 8 Oct 2011 21:06:05 +0000 (23:06 +0200)]
swscale: Fix prototypes of *toyv12 so they can be used with planar rgb input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoStart adding pixel definitions for planar rgb.
Themaister [Sat, 8 Oct 2011 19:54:20 +0000 (21:54 +0200)]
Start adding pixel definitions for planar rgb.

9 years agoffmpeg: put space back that was lost during someone reformating it.
Michael Niedermayer [Sat, 8 Oct 2011 19:39:36 +0000 (21:39 +0200)]
ffmpeg: put space back that was lost during someone reformating it.

Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: fix signed overflow in avformat_find_stream_info()
Mans Rullgard [Sat, 8 Oct 2011 01:06:26 +0000 (02:06 +0100)]
lavf: fix signed overflow in avformat_find_stream_info()

On the first iteration through this code, last_dts is always
INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in
an invalid manner.  Although the result is only used if the
input values are valid, performing the subtraction is still
not allowed in a strict environment.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agovp8: fix signed overflows
Mans Rullgard [Sat, 8 Oct 2011 14:03:51 +0000 (15:03 +0100)]
vp8: fix signed overflows

In addition to avoiding undefined behaviour, an unsigned type
makes more sense for packing multiple 8-bit values.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agomotion_est: fix some signed overflows
Mans Rullgard [Sat, 8 Oct 2011 12:52:44 +0000 (13:52 +0100)]
motion_est: fix some signed overflows

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agodca: fix signed overflow in shift
Mans Rullgard [Sat, 8 Oct 2011 12:49:42 +0000 (13:49 +0100)]
dca: fix signed overflow in shift

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoaacdec: fix undefined shifts
Mans Rullgard [Sat, 8 Oct 2011 12:41:23 +0000 (13:41 +0100)]
aacdec: fix undefined shifts

Since nnz can be zero, this is needed to avoid a shift by 32.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agodct-test: document the number of bits we use for testing.
Michael Niedermayer [Sat, 8 Oct 2011 17:58:27 +0000 (19:58 +0200)]
dct-test: document the number of bits we use for testing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodct-test: better term for meximum error.
Michael Niedermayer [Sat, 8 Oct 2011 17:57:30 +0000 (19:57 +0200)]
dct-test: better term for meximum error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix read_yn() if HAVE_TERMIOS_H || HAVE_KBHIT == 0
Michael Niedermayer [Sat, 8 Oct 2011 17:43:10 +0000 (19:43 +0200)]
ffmpeg: fix read_yn() if HAVE_TERMIOS_H || HAVE_KBHIT == 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix setting codecs for demuxers.
Michael Niedermayer [Sat, 8 Oct 2011 17:21:22 +0000 (19:21 +0200)]
ffmpeg: fix setting codecs for demuxers.

Bug introduced by:
commit e3bf4e292cf999c9b8442a4e23677cab0b4781a9
Author: Anton Khirnov <anton@khirnov.net>
Date:   Tue Aug 30 04:10:54 2011 +0200

    ffmpeg: replace -vcodec/-acodec/-scodec with a better system.

    The new option doesn't depend on its placement wrt -new* options (which
    don't exist anymore) and works in a similar way as per-stream AVOptions.

    -[vas]codec remain as aliases to -codec:[vas]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: limit read_key() calls to get a tiny speed boost.
Michael Niedermayer [Sat, 8 Oct 2011 16:36:15 +0000 (18:36 +0200)]
ffmpeg: limit read_key() calls to get a tiny speed boost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: avoid multiple redundant av_gettime() calls, rather reuse the value in a...
Michael Niedermayer [Sat, 8 Oct 2011 15:32:06 +0000 (17:32 +0200)]
ffmpeg: avoid multiple redundant av_gettime() calls, rather reuse the value in a iteration of the main loop.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix run_as_daemon when HAVE_TERMIOS_H is false
Michael Niedermayer [Sat, 8 Oct 2011 15:28:58 +0000 (17:28 +0200)]
ffmpeg: fix run_as_daemon when HAVE_TERMIOS_H is false

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: cosmetic renamings to reduce difference to qatar.
Michael Niedermayer [Sat, 8 Oct 2011 15:21:25 +0000 (17:21 +0200)]
ffmpeg: cosmetic renamings to reduce difference to qatar.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: call term_init() earlier
Michael Niedermayer [Sat, 8 Oct 2011 15:20:52 +0000 (17:20 +0200)]
ffmpeg: call term_init() earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: make q_pressed volatile, it can be changed from signal handlers.
Michael Niedermayer [Sat, 8 Oct 2011 15:20:17 +0000 (17:20 +0200)]
ffmpeg: make q_pressed volatile, it can be changed from signal handlers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: dont call read_key() in decode_interrupt_cb() this can cause keys to be lost
Michael Niedermayer [Sat, 8 Oct 2011 15:09:14 +0000 (17:09 +0200)]
ffmpeg: dont call read_key() in decode_interrupt_cb() this can cause keys to be lost
also its slow when read_key() is slow and there are a very large number of calls

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobink: Check for various out of bound writes
Laurent Aimar [Tue, 27 Sep 2011 12:16:41 +0000 (12:16 +0000)]
bink: Check for various out of bound writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agobink: Check for out of bound writes when building tree
Laurent Aimar [Tue, 27 Sep 2011 12:16:41 +0000 (12:16 +0000)]
bink: Check for out of bound writes when building tree

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoeval: add gcd()
Michael Niedermayer [Sat, 8 Oct 2011 02:38:17 +0000 (04:38 +0200)]
eval: add gcd()

example: -vf 'scale=256:256,mp=geq=gcd(X\,Y)-2:128:128'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeval:add hypot()
Michael Niedermayer [Sat, 8 Oct 2011 02:12:00 +0000 (04:12 +0200)]
eval:add hypot()

useage example: -vf 'scale=256:256,mp=geq=random(1)/hypot(X-cos(N*0.07)*W/2-W/2\,Y-sin(N*0.09)*H/2-H/2)^2*1000000*sin(N*0.02):128:128'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoput_bits: fix invalid shift by 32 in flush_put_bits()
Mans Rullgard [Sat, 8 Oct 2011 01:09:42 +0000 (02:09 +0100)]
put_bits: fix invalid shift by 32 in flush_put_bits()

If flush_put_bits() is called when the 32-bit buffer is empty,
e.g. after writing a multiple of 32 bits, and invalid shift by
32 is performed.  Since flush_put_bits() is called infrequently,
this additional check should have negligible performance impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Oct 2011 01:39:01 +0000 (03:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (24 commits)
  mpegps: Use av_get_packet() instead of poorly emulating it.
  motionpixels: decode only the 111 complete frames for fate
  mpc8: Check out of bound bands limit
  xan: Prevent NULL dereference with missing palette
  xan: Check for out of bound reads in xan_huffman_decode()
  xan: Fixed out of bound accesses in xan_unpack()
  motionpixels: Prevent calling init_vlc() with invalid parameters
  shorten: Fix out of bound writes in fix_bitshift()
  dsicinav: Check for out of bounds writes
  tiertexseqv: Check for out of bound reads
  quickdraw: Check for out of bound reads
  dsicinav: Check for out of bounds reads
  motionpixels: Fix the size of workspace buffers
  motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
  wmavoice: Check for corrupted extra data
  wmavoice: Check for out of bound writes
  xan: Prevent NULL dereferences with missing reference frame
  bink: Prevent NULL dereferences with missing reference frame
  wavpack: Reset internal state on corrupted blocks
  wmapro: Validate the number of audio channels before using it
  ...

Conflicts:
libavcodec/h264.c
libavcodec/xan.c
tests/ref/fate/motionpixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeval: add random()
Michael Niedermayer [Sat, 8 Oct 2011 01:09:16 +0000 (03:09 +0200)]
eval: add random()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoeval: make variables persistent so they can be used between evaluations.
Michael Niedermayer [Sat, 8 Oct 2011 01:08:18 +0000 (03:08 +0200)]
eval: make variables persistent so they can be used between evaluations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: set colorspace and full range to values indicating unspecified by default
Michael Niedermayer [Fri, 7 Oct 2011 23:12:46 +0000 (01:12 +0200)]
H264: set colorspace and full range to values indicating unspecified by default
Code based on ffdshow
Author unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegps: Use av_get_packet() instead of poorly emulating it.
Alex Converse [Sat, 8 Oct 2011 00:02:36 +0000 (17:02 -0700)]
mpegps: Use av_get_packet() instead of poorly emulating it.

9 years agobintext: reset x and y pos after each frame decode.
Clément Bœsch [Fri, 7 Oct 2011 20:06:59 +0000 (22:06 +0200)]
bintext: reset x and y pos after each frame decode.

This makes successive frames decode possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoreturn error code if error happens
Maksym Veremeyenko [Mon, 3 Oct 2011 04:47:39 +0000 (07:47 +0300)]
return error code if error happens

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomotionpixels: decode only the 111 complete frames for fate
Janne Grunau [Fri, 7 Oct 2011 16:08:55 +0000 (18:08 +0200)]
motionpixels: decode only the 111 complete frames for fate

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agompc8: Check out of bound bands limit
Laurent Aimar [Sun, 25 Sep 2011 20:06:20 +0000 (20:06 +0000)]
mpc8: Check out of bound bands limit

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoxan: Prevent NULL dereference with missing palette
Laurent Aimar [Thu, 29 Sep 2011 03:12:07 +0000 (03:12 +0000)]
xan: Prevent NULL dereference with missing palette

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoxan: Check for out of bound reads in xan_huffman_decode()
Laurent Aimar [Thu, 29 Sep 2011 20:38:01 +0000 (20:38 +0000)]
xan: Check for out of bound reads in xan_huffman_decode()

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoxan: Fixed out of bound accesses in xan_unpack()
Laurent Aimar [Thu, 29 Sep 2011 03:12:07 +0000 (03:12 +0000)]
xan: Fixed out of bound accesses in xan_unpack()

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agomotionpixels: Prevent calling init_vlc() with invalid parameters
Laurent Aimar [Thu, 29 Sep 2011 03:12:07 +0000 (03:12 +0000)]
motionpixels: Prevent calling init_vlc() with invalid parameters

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoshorten: Fix out of bound writes in fix_bitshift()
Laurent Aimar [Fri, 30 Sep 2011 01:26:22 +0000 (01:26 +0000)]
shorten: Fix out of bound writes in fix_bitshift()

The data pointers s->decoded[*] already take into account s->nwrap.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agodsicinav: Check for out of bounds writes
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
dsicinav: Check for out of bounds writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agotiertexseqv: Check for out of bound reads
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
tiertexseqv: Check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoquickdraw: Check for out of bound reads
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
quickdraw: Check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agodsicinav: Check for out of bounds reads
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
dsicinav: Check for out of bounds reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agomotionpixels: Fix the size of workspace buffers
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
motionpixels: Fix the size of workspace buffers

Some buffers must be mod 4 in width and/or height.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agomotionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary...
Laurent Aimar [Thu, 29 Sep 2011 23:13:35 +0000 (23:13 +0000)]
motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agowmavoice: Check for corrupted extra data
Laurent Aimar [Tue, 27 Sep 2011 22:15:31 +0000 (22:15 +0000)]
wmavoice: Check for corrupted extra data

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agowmavoice: Check for out of bound writes
Laurent Aimar [Tue, 27 Sep 2011 22:15:31 +0000 (22:15 +0000)]
wmavoice: Check for out of bound writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoxan: Prevent NULL dereferences with missing reference frame
Laurent Aimar [Tue, 27 Sep 2011 22:15:32 +0000 (22:15 +0000)]
xan: Prevent NULL dereferences with missing reference frame

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agobink: Prevent NULL dereferences with missing reference frame
Laurent Aimar [Tue, 27 Sep 2011 22:15:31 +0000 (22:15 +0000)]
bink: Prevent NULL dereferences with missing reference frame

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agowavpack: Reset internal state on corrupted blocks
Laurent Aimar [Mon, 26 Sep 2011 22:18:29 +0000 (22:18 +0000)]
wavpack: Reset internal state on corrupted blocks

wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agowmapro: Validate the number of audio channels before using it
Laurent Aimar [Mon, 26 Sep 2011 22:18:29 +0000 (22:18 +0000)]
wmapro: Validate the number of audio channels before using it

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agompc8: Fix return value on EOF
Laurent Aimar [Sun, 25 Sep 2011 20:06:19 +0000 (20:06 +0000)]
mpc8: Fix return value on EOF

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoshorten: Prevent block size from increasing
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
shorten: Prevent block size from increasing

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoxan: Prevent out of bound accesses
Laurent Aimar [Tue, 27 Sep 2011 22:15:33 +0000 (22:15 +0000)]
xan: Prevent out of bound accesses

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoMerge remote-tracking branch 'hexene/stagefright'
Michael Niedermayer [Fri, 7 Oct 2011 13:32:14 +0000 (15:32 +0200)]
Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  libstagefright: start decode_thread() only after decode_frame() is called at least once.
  libstagefright: mark the dummy frame as keyframe.
  libstagefright: limit the output queue size
  libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns
  libstagefright: set the correct frame size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibstagefright: start decode_thread() only after decode_frame() is called at least...
Mohamed Naufal [Fri, 7 Oct 2011 12:37:16 +0000 (18:07 +0530)]
libstagefright: start decode_thread() only after decode_frame() is called at least once.

This prevents the situation where EOS is passed as the first frame to the
h/w decoder and thus avoids a potential crash.

9 years agolibstagefright: mark the dummy frame as keyframe.
Mohamed Naufal [Fri, 7 Oct 2011 12:35:34 +0000 (18:05 +0530)]
libstagefright: mark the dummy frame as keyframe.

This makes sure decoder->read() returns if it is the first frame fed.

9 years agolibstagefright: limit the output queue size
Mohamed Naufal [Fri, 7 Oct 2011 11:51:09 +0000 (17:21 +0530)]
libstagefright: limit the output queue size

9 years agolibstagefright: return EOS if CustomSource::read() is called after decode_thread...
Mohamed Naufal [Fri, 7 Oct 2011 12:29:29 +0000 (17:59 +0530)]
libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns

9 years agolibstagefright: set the correct frame size
Mohamed Naufal [Fri, 7 Oct 2011 11:31:08 +0000 (17:01 +0530)]
libstagefright: set the correct frame size

9 years agoH264: Only wait before triggering ff_thread_setup_complete() until the next slice...
Michael Niedermayer [Mon, 3 Oct 2011 22:14:48 +0000 (00:14 +0200)]
H264: Only wait before triggering ff_thread_setup_complete() until the next slice that contains a start-of-field/frame macroblock

This allows concurrent decoding of the last field/frame, rather than
only the last slice, of data packets with multiple NAL units packed
together.

This will fix the slowdown reported in e.g. bug 52.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoswresample/rematrix: show matrix with debug log level
Michael Niedermayer [Fri, 7 Oct 2011 11:51:40 +0000 (13:51 +0200)]
swresample/rematrix: show matrix with debug log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Oct 2011 01:38:50 +0000 (03:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp6: Reset the internal state when aborting key frames header parsing
  vp56: Release old pictures after a resolution changes
  vp6: Check for huffman tree build errors
  vp56: Check for missing reference frame data
  cinepak: Fix invalid read access on extra data
  vmd: fix segfaults on corruped streams
  cook: Fix js_vlc_bits value validation for joint stereo
  segafilm: Check for memory allocation failures in segafilm demuxer.
  segafilm: Fix potential division by 0 on corrupted streams in the demuxer
  Fixed segfault on corrupted sega streams in the demuxer.
  Fixed deference of NULL pointer in motionpixels decoder.
  libx264: support 9- and 10-bit output.
  h264: correct implicit_weight for field-interlaced pictures.
  mpegvideo: set correct offset for edge emulation buffer.
  mpegvideo: fix position of bottom edge.

Conflicts:
libavcodec/motionpixels.c
libavcodec/mpegvideo.c
libavcodec/version.h
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample: use av_get_default_channel_layout instead of guess_layout
Marton Balint [Thu, 6 Oct 2011 21:19:23 +0000 (23:19 +0200)]
swresample: use av_get_default_channel_layout instead of guess_layout

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil: bump minor version because of av_get_default_channel_layout type fix
Marton Balint [Thu, 6 Oct 2011 22:30:40 +0000 (00:30 +0200)]
avutil: bump minor version because of av_get_default_channel_layout type fix

Well, probably an ABI breakage at least for 32bit, but hopefully it will go
unnoticed because the fix happened realtively soon.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaudioconvert: fix type of av_get_default_channel_layout
Marton Balint [Thu, 6 Oct 2011 21:44:48 +0000 (23:44 +0200)]
audioconvert: fix type of av_get_default_channel_layout

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: add ff_init_buffer_info()
Michael Niedermayer [Fri, 7 Oct 2011 00:11:06 +0000 (02:11 +0200)]
lavc: add ff_init_buffer_info()
Fixes seeking per fileposition in ffplay.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: reject unsupported 422 9 bit streams
Laurent Aimar [Thu, 6 Oct 2011 19:55:43 +0000 (21:55 +0200)]
h264: reject unsupported 422 9 bit streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaudioconvert: make 7POINT1 channel layout the default for 8 channels
Marton Balint [Thu, 6 Oct 2011 21:19:22 +0000 (23:19 +0200)]
audioconvert: make 7POINT1 channel layout the default for 8 channels

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: fix the size of PPS::chroma_qp_table
Laurent Aimar [Thu, 6 Oct 2011 19:55:44 +0000 (21:55 +0200)]
h264: fix the size of PPS::chroma_qp_table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovp6: Reset the internal state when aborting key frames header parsing
Laurent Aimar [Fri, 23 Sep 2011 20:36:11 +0000 (22:36 +0200)]
vp6: Reset the internal state when aborting key frames header parsing

It prevents leaving the state only half initialized.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp56: Release old pictures after a resolution changes
Laurent Aimar [Wed, 21 Sep 2011 18:46:33 +0000 (20:46 +0200)]
vp56: Release old pictures after a resolution changes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp6: Check for huffman tree build errors
Laurent Aimar [Wed, 21 Sep 2011 18:46:32 +0000 (20:46 +0200)]
vp6: Check for huffman tree build errors

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp56: Check for missing reference frame data
Laurent Aimar [Wed, 21 Sep 2011 18:46:30 +0000 (20:46 +0200)]
vp56: Check for missing reference frame data

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agocinepak: Fix invalid read access on extra data
Laurent Aimar [Sun, 11 Sep 2011 17:17:43 +0000 (19:17 +0200)]
cinepak: Fix invalid read access on extra data

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovmd: fix segfaults on corruped streams
Laurent Aimar [Sun, 11 Sep 2011 17:17:45 +0000 (19:17 +0200)]
vmd: fix segfaults on corruped streams

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agocook: Fix js_vlc_bits value validation for joint stereo
Laurent Aimar [Sat, 17 Sep 2011 14:56:35 +0000 (16:56 +0200)]
cook: Fix js_vlc_bits value validation for joint stereo

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agosegafilm: Check for memory allocation failures in segafilm demuxer.
Laurent Aimar [Thu, 6 Oct 2011 20:53:41 +0000 (22:53 +0200)]
segafilm: Check for memory allocation failures in segafilm demuxer.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agosegafilm: Fix potential division by 0 on corrupted streams in the demuxer
Laurent Aimar [Mon, 12 Sep 2011 19:09:57 +0000 (21:09 +0200)]
segafilm: Fix potential division by 0 on corrupted streams in the demuxer

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoh264: fix fill_colmap() to not store entries mbaff style when the reference is not...
Michael Niedermayer [Thu, 6 Oct 2011 20:54:00 +0000 (22:54 +0200)]
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>