]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 16 Jan 2013 11:38:41 +0000 (12:38 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 16 Jan 2013 11:00:06 +0000 (12:00 +0100)]
lavd/v4l2: init return value.
Fix a warning and random failures.
Michael Niedermayer [Wed, 16 Jan 2013 11:13:10 +0000 (12:13 +0100)]
Merge commit '
977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa '
* commit '
977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa ':
rtpdec_mpeg4: Check the return value from malloc
srtp: Mark a few variables as uninitialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 11:07:04 +0000 (12:07 +0100)]
Merge commit '
0eecafc948b74c247ebbc59f18f508db5d590d0b '
* commit '
0eecafc948b74c247ebbc59f18f508db5d590d0b ':
configure: Make the new srtp protocol depend on the rtp protocol
lavf: Add a fate test for the SRTP functions
lavu: Add a fate test for the HMAC API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 11:01:21 +0000 (12:01 +0100)]
Merge commit '
fb845ffdd335a1efd6dfd43e8adeb530397b348e '
* commit '
fb845ffdd335a1efd6dfd43e8adeb530397b348e ':
h264: add 3 pixels below for subpixel filter wait position
dvdsubdec: Support palette in mkv
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 10:44:23 +0000 (11:44 +0100)]
Merge commit '
dae1d507af94261bafd3b11549884e5d1eca590e '
* commit '
dae1d507af94261bafd3b11549884e5d1eca590e ':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Hilb [Wed, 16 Jan 2013 10:27:20 +0000 (11:27 +0100)]
lavd/v4l2: update broken link to v4l2 video capture example
Reviewed-by: Stefano Sabatini
Stephan Hilb [Wed, 16 Jan 2013 10:26:38 +0000 (11:26 +0100)]
lavd/v4l2: improve debug message
Reviewed-by: Stefano Sabatini
Justin Ruggles [Mon, 7 Jan 2013 04:47:30 +0000 (23:47 -0500)]
lavc: Move vector_fmul_window to AVFloatDSPContext
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Tue, 15 Jan 2013 13:35:18 +0000 (15:35 +0200)]
rtpdec_mpeg4: Check the remaining amount of data before reading
This fixes possible buffer overreads.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 16 Jan 2013 04:54:19 +0000 (05:54 +0100)]
motion_est: Limit motion vector search range to MAX_MV
Fixes out of array reads with videos exceeding MAX_MV
Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 04:51:04 +0000 (05:51 +0100)]
mpegvideo: Increase MAX_MV for HD video
Fixes out of array reads
Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 04:22:30 +0000 (05:22 +0100)]
h264: document h264_set_parameter_from_sps() re-calling behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 03:46:20 +0000 (04:46 +0100)]
h264: do not mess up cur_chroma_format_idc during thread update
Fixes out of array reads
Regression probably since allowing pixel format changes or a related commit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 15 Jan 2013 16:38:54 +0000 (08:38 -0800)]
h264: add 3 pixels below for subpixel filter wait position.
If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.
This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Angelo Haller [Tue, 15 Jan 2013 22:37:08 +0000 (23:37 +0100)]
examples/demuxing: free AVPacket after usage
Fix leak.
Stefano Sabatini [Tue, 8 Jan 2013 22:27:37 +0000 (23:27 +0100)]
tools: add plotframes script
The script is ported from ffprobe/SourceForge and updated to the current
ffprobe version.
Micah Galizia [Mon, 14 Jan 2013 02:33:20 +0000 (21:33 -0500)]
doc/protocols: document HTTP protocol cookie support
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Micah Galizia [Mon, 14 Jan 2013 02:32:57 +0000 (21:32 -0500)]
lavf/http: add HTTP protocol cookie support
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Martin Storsjö [Tue, 15 Jan 2013 13:27:30 +0000 (15:27 +0200)]
rtpdec_mpeg4: Check the return value from malloc
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 15 Jan 2013 12:21:48 +0000 (14:21 +0200)]
configure: Make the new srtp protocol depend on the rtp protocol
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 15 Jan 2013 13:19:55 +0000 (15:19 +0200)]
srtp: Mark a few variables as uninitialized
This squelches false positive warnings (with gcc) about them being
used uninitalized.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 15 Jan 2013 13:07:44 +0000 (15:07 +0200)]
lavf: Add a fate test for the SRTP functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 15 Jan 2013 11:05:12 +0000 (13:05 +0200)]
lavu: Add a fate test for the HMAC API
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Tue, 15 Jan 2013 16:38:54 +0000 (08:38 -0800)]
h264: add 3 pixels below for subpixel filter wait position
If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.
This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Tue, 15 Jan 2013 12:39:34 +0000 (13:39 +0100)]
lavd/v4l2: apply grammar/consistency fixes to options help fields
Stefano Sabatini [Tue, 15 Jan 2013 11:01:06 +0000 (12:01 +0100)]
lavd/v4l2: return meaningful error code from device_init()
In particular, propagate errno value in case of device init failure.
Stefano Sabatini [Tue, 15 Jan 2013 09:17:08 +0000 (10:17 +0100)]
lavd/v4l2: fix misc messages
Stefano Sabatini [Tue, 15 Jan 2013 08:57:50 +0000 (09:57 +0100)]
lavd/v4l2: extend error/debug feedback in case of invalid codec/pix_fmt
Joakim Plate [Tue, 15 Jan 2013 14:53:15 +0000 (15:53 +0100)]
dvdsubdec: Support palette in mkv
Matroska stores palette information as plain text in extradata.
Signed-off-by: Alexandra Khirnova <alexandra.khirnova@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sun, 13 Jan 2013 20:32:34 +0000 (21:32 +0100)]
oggdec: Leave treatment of serial changes to the decoder.
Attempting to re-parse the headers at demuxer level is a
pandora box the way its done currently.
This allows full reconfiguration of vorbis streams
Fixes Ticket2117
Fixes Ticket2121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jan 2013 20:31:17 +0000 (21:31 +0100)]
vorbisdec: handle midstream parameter changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jan 2013 20:23:11 +0000 (21:23 +0100)]
oggdec: resync from the last page.
Previously we re synced from where we where which cam lead
to loosing pages.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jan 2013 19:44:39 +0000 (20:44 +0100)]
vorbisdec: support freeing partially allocated contexts.
Fixes null pointer derefernces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 27 Jul 2012 12:26:09 +0000 (14:26 +0200)]
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
Justin Ruggles [Mon, 14 Jan 2013 18:43:15 +0000 (13:43 -0500)]
vf_fps: add final flushed frames to the dropped frame count
Michael Niedermayer [Thu, 27 Dec 2012 02:21:43 +0000 (03:21 +0100)]
rtpdec: support CSRC
Untested, due to lack of rtp stream with CSRCs, but the code as
is does not work with multiple CSRCs
Reviewed-by: Luca Abeni <lucabe72@email.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 15 Jan 2013 15:06:00 +0000 (16:06 +0100)]
rv34_parser: Adjust #if for disabling individual parsers
As CONFIG_ values are always defined, they have to be checked via #if.
Michael Niedermayer [Tue, 15 Jan 2013 15:16:13 +0000 (16:16 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: ABSB2: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 15:12:18 +0000 (16:12 +0100)]
Merge commit '
094a7405e5d8463d7d167d893e04934ec1a84ecd '
* commit '
094a7405e5d8463d7d167d893e04934ec1a84ecd ':
x86: ABSB: port to cpuflags
sdp: Include SRTP crypto params if using the srtp protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 15:05:00 +0000 (16:05 +0100)]
Merge commit '
2f3bada63e57345329c4f9b48e9b81b5cfc03d05 '
* commit '
2f3bada63e57345329c4f9b48e9b81b5cfc03d05 ':
lavf: Add a protocol for SRTP encryption/decryption
rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 14:56:12 +0000 (15:56 +0100)]
Merge commit '
ab2ad8bd56882c0ea160b154e8b836eb71abc49d '
* commit '
ab2ad8bd56882c0ea160b154e8b836eb71abc49d ':
lavf: Add functions for SRTP decryption/encryption
lavu: Add an API for calculating HMAC (RFC 2104)
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 14:51:04 +0000 (15:51 +0100)]
Merge commit '
47812070a267cbdf74164e154d03d99bf8ced100 '
* commit '
47812070a267cbdf74164e154d03d99bf8ced100 ':
libx264: use the library specific default rc_initial_buffer_occupancy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 14:32:48 +0000 (15:32 +0100)]
Merge commit '
bff3607547fdbb6e32b3830a351e6a33280c1e0d '
* commit '
bff3607547fdbb6e32b3830a351e6a33280c1e0d ':
lavc: set the default rc_initial_buffer_occupancy
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 14:23:20 +0000 (15:23 +0100)]
Merge commit '
d8c772de53d29afb1bada88afa859fce8489c668 '
* commit '
d8c772de53d29afb1bada88afa859fce8489c668 ':
nutdec: Always return a value from nut_read_timestamp()
configure: Make warnings from -Wreturn-type fatal errors
x86: ABS2: port to cpuflags
vdpau: Remove av_unused attribute from function declaration
h264: fix ff_generate_sliding_window_mmcos() prototype.
Conflicts:
configure
libavformat/nutdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 14:16:45 +0000 (15:16 +0100)]
Merge commit '
5e753ed502d3597077d8675ca1438e1bcade1459 '
* commit '
5e753ed502d3597077d8675ca1438e1bcade1459 ':
suncc: Replace more GCC flags by their equivalents in suncc_flags()
libtheoraenc: fix granularity of video quality
oggparsetheora: fix comment header parsing
h264: don't clobber mmco opcode tables for non-first slice headers.
Conflicts:
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 13:57:57 +0000 (14:57 +0100)]
Merge commit '
3f111804eb5c603a344706b84b7164cbf7b4e0df '
* commit '
3f111804eb5c603a344706b84b7164cbf7b4e0df ':
libvpx: make vp8 and vp9 selectable
libvpx: support vp9
nut: support vp9 tag
mkv: support vp9 tag
rtpdec: Make variables that should wrap unsigned
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 13:42:20 +0000 (14:42 +0100)]
Merge commit '
ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e '
* commit '
ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e ':
build: Remove stray Makefile entry for non-existent VCR1 encoder
rtpdec: Handle more received packets than expected when sending RR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 13:34:23 +0000 (14:34 +0100)]
Merge commit '
d0fe217e3990b003b3b3f2c2daaadfb2af590def '
* commit '
d0fe217e3990b003b3b3f2c2daaadfb2af590def ':
rtpdec: Simplify insertion into the linked list queue
rtpdec: Remove a woefully misplaced comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 14 Jan 2013 05:46:44 +0000 (21:46 -0800)]
h264: don't clobber mmco opcode tables for non-first slice headers.
Clobbering these tables will temporarily clobber the template used
as a basis for other threads to start decoding from. If the other
decoding thread updates from the template right at that moment,
subsequent threads will get invalid (or, usually, none at all) mmco
tables. This leads to invalid reference lists and subsequent decode
failures.
Therefore, instead, decode the mmco tables only for the first slice in
a field or frame. For other slices, decode the bits and ensure they
are identical to the mmco tables in the first slice, but don't ever
clobber the context state. This prevents other threads from using a
clobbered/invalid template as starting point for decoding, and thus
fixes decoding in these cases.
This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with
frame-multithreading enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 15 Jul 2012 16:30:34 +0000 (18:30 +0200)]
x86: ABSB2: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 16:29:10 +0000 (18:29 +0200)]
x86: ABSB: port to cpuflags
Martin Storsjö [Wed, 12 Dec 2012 10:59:41 +0000 (12:59 +0200)]
sdp: Include SRTP crypto params if using the srtp protocol
Also print port numbers for this protocol.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Dec 2012 22:22:48 +0000 (00:22 +0200)]
lavf: Add a protocol for SRTP encryption/decryption
This is mostly useful for encryption together with the RTP muxer,
but could also be set up as IO towards the peer with the SDP
demuxer with custom IO.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 20 Oct 2012 20:18:01 +0000 (23:18 +0300)]
rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
This only takes care of decrypting incoming packets; the outgoing
RTCP packets are not encrypted. This is enough for some use cases,
and signalling crypto keys for use with outgoing RTCP packets
doesn't fit as simply into the API. If the SDP demuxer is hooked
up with custom IO, the return packets can be encrypted e.g. via the
SRTP protocol.
If the SRTP keys aren't available within the SDP, the decryption
can be handled externally as well (when using custom IO).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 20 Oct 2012 22:20:35 +0000 (01:20 +0300)]
lavf: Add functions for SRTP decryption/encryption
This supports the AES_CM_128_HMAC_SHA1_80 and
AES_CM_128_HMAC_SHA1_32 cipher suites (from RFC 4568) at the
moment. The main missing features are replay protection (which can be
added later without changing the internal API), and the F8 and null
ciphers.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 12 Oct 2012 12:01:06 +0000 (15:01 +0300)]
lavu: Add an API for calculating HMAC (RFC 2104)
This supports HMAC-MD5 and HMAC-SHA1 for now, other hashes are
simple to add.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 14 Jan 2013 04:32:39 +0000 (05:32 +0100)]
libx264: use the library specific default rc_initial_buffer_occupancy
By default libav sets it to 3/4 while x264 sets it to 9/10.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 14 Jan 2013 04:32:38 +0000 (05:32 +0100)]
lavc: set the default rc_initial_buffer_occupancy
rc_buffer_size is not set before.
Solve the initial the rate control underflow issue reported in
bug 222.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Tue, 15 Jan 2013 03:58:22 +0000 (04:58 +0100)]
mpegvideo: Fix long standing race condition with frame threads
Since resolution change support this also was exploitable, which is
how it was found.
Fixes read after free and out of array reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 14 Jan 2013 23:39:23 +0000 (00:39 +0100)]
nutdec: Always return a value from nut_read_timestamp()
The function is a callback that is called by ff_gen_search with
a constant stream index.
Avoid a false positive on older gcc version.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stephen Hutchinson [Tue, 15 Jan 2013 00:15:10 +0000 (01:15 +0100)]
Fix compilation with libutvideo version 12.0.0
Reviewed-by: Derek Buitenhuis
Carl Eugen Hoyos [Mon, 14 Jan 2013 23:14:35 +0000 (00:14 +0100)]
Fix color filter example.
Found-by: johnd and Paul B Mahol
Michael Niedermayer [Mon, 14 Jan 2013 22:40:26 +0000 (23:40 +0100)]
x86/Makefile: move dirac_dwt to right type
Fix build failure without yasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 22:26:33 +0000 (23:26 +0100)]
x86/dirac: fix asm on win64
This could also be fixed by changing the argument type if
someone prefers that and wants to change it ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 21:30:30 +0000 (22:30 +0100)]
lavc: split snow and dirac DWTs
There is only about 4 lines of common code, so it alot cleaner
when seperated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 14 Jan 2013 19:38:33 +0000 (20:38 +0100)]
configure: Make warnings from -Wreturn-type fatal errors
These warnings have no false positives and point to serious bugs.
Diego Biurrun [Sun, 15 Jul 2012 16:23:40 +0000 (18:23 +0200)]
x86: ABS2: port to cpuflags
Rémi Denis-Courmont [Mon, 14 Jan 2013 20:00:05 +0000 (22:00 +0200)]
vdpau: Remove av_unused attribute from function declaration
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Anton Khirnov [Mon, 14 Jan 2013 19:07:53 +0000 (20:07 +0100)]
h264: fix ff_generate_sliding_window_mmcos() prototype.
It's been returning an error value since
bad446e251405dc250c3cbee199072e083a1e4b9
Also check for the errors it returns.
Sean McGovern [Mon, 14 Jan 2013 17:51:59 +0000 (12:51 -0500)]
suncc: Replace more GCC flags by their equivalents in suncc_flags()
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Maximilian Seesslen [Fri, 4 Jan 2013 15:56:00 +0000 (16:56 +0100)]
libtheoraenc: fix granularity of video quality
The floating point version of av_clip has to be used when
converting the quality level.
Signed-off-by: Maximilian Seesslen <mes@seesslen.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
Giorgio Vazzana [Fri, 5 Oct 2012 11:37:20 +0000 (13:37 +0200)]
oggparsetheora: fix comment header parsing
Pass the correct header size to ff_vorbis_comment()
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Sun, 30 Dec 2012 18:40:20 +0000 (19:40 +0100)]
libvpx: make vp8 and vp9 selectable
Support older libvpx versions.
Ronald S. Bultje [Mon, 14 Jan 2013 05:46:44 +0000 (21:46 -0800)]
h264: don't clobber mmco opcode tables for non-first slice headers.
Clobbering these tables will temporarily clobber the template used
as a basis for other threads to start decoding from. If the other
decoding thread updates from the template right at that moment,
subsequent threads will get invalid (or, usually, none at all) mmco
tables. This leads to invalid reference lists and subsequent decode
failures.
Therefore, instead, decode the mmco tables only for the first slice in
a field or frame. For other slices, decode the bits and ensure they
are identical to the mmco tables in the first slice, but don't ever
clobber the context state. This prevents other threads from using a
clobbered/invalid template as starting point for decoding, and thus
fixes decoding in these cases.
This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with
frame-multithreading enabled.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Thu, 20 Dec 2012 16:22:06 +0000 (17:22 +0100)]
libvpx: support vp9
This feature is experimental use at your risk
Luca Barbato [Sat, 15 Dec 2012 22:26:07 +0000 (23:26 +0100)]
nut: support vp9 tag
Tom Finegan [Sat, 15 Dec 2012 22:18:41 +0000 (23:18 +0100)]
mkv: support vp9 tag
Martin Storsjö [Mon, 14 Jan 2013 15:55:43 +0000 (17:55 +0200)]
rtpdec: Make variables that should wrap unsigned
This makes the behaviour defined when they wrap around. The value
assigned to expected_prior was a uint32_t already.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Mon, 14 Jan 2013 15:43:41 +0000 (16:43 +0100)]
build: Remove stray Makefile entry for non-existent VCR1 encoder
Martin Storsjö [Mon, 14 Jan 2013 09:34:19 +0000 (11:34 +0200)]
rtpdec: Handle more received packets than expected when sending RR
Without this, we'd signal a huge loss rate (due to unsigned
wraparound) if we had received one packet more than expected (that
is, one seq number sent twice). The code has a check for lost_interval
<= 0, but that doesn't do what was intended as long as the variable is
unsigned.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 7 Dec 2012 14:19:42 +0000 (16:19 +0200)]
rtpdec: Simplify insertion into the linked list queue
By using a pointer-to-pointer, we avoid having to keep track
of the previous packet separately.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 13 Jan 2013 16:40:13 +0000 (18:40 +0200)]
rtpdec: Remove a woefully misplaced comment
The code below the comment does not at all relate to statistics,
and even if moved to the right place, the comment adds little
value.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Jan 2013 15:37:12 +0000 (16:37 +0100)]
nuv: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 15:29:27 +0000 (16:29 +0100)]
init_get_bits: fix off by 1 error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 15:23:39 +0000 (16:23 +0100)]
init_get_bits8: zero pointers & struct on error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 15:22:41 +0000 (16:22 +0100)]
init_get_bits8: check byte_size against being positive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 14 Jan 2013 15:28:44 +0000 (16:28 +0100)]
The c99-to-c89 binaries are now hosted on videolan.org.
Michael Niedermayer [Mon, 14 Jan 2013 14:53:25 +0000 (15:53 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmpproto: Fix assignments in if()
lavf: Fix assignments in if()
svq1enc: Fix assignments in if()
lavc: Fix assignments in if() when calling ff_af_queue_add
h264: Fix assignments in if()
truemotion2: cosmetics, reformat
Conflicts:
libavcodec/svq1enc.c
libavcodec/truemotion2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 14:45:05 +0000 (15:45 +0100)]
Merge commit '
df9036830b15997a3e9c3f2c632ed98d64f9deef '
* commit '
df9036830b15997a3e9c3f2c632ed98d64f9deef ':
truemotion2: return meaningful error codes.
tscc: remove some pointless comments and empty lines.
tscc: return meaningful error codes.
loco: cosmetics, reformat
Conflicts:
libavcodec/truemotion2.c
libavcodec/tscc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 14:36:35 +0000 (15:36 +0100)]
Merge commit '
1a31dff9370b4732c91df5cb1ca4b39f2cb3050e '
* commit '
1a31dff9370b4732c91df5cb1ca4b39f2cb3050e ':
loco: return meaningful error codes.
flicvideo: return meaningful error codes.
vcr1: remove disabled encoder stub
Conflicts:
libavcodec/flicvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 14:17:16 +0000 (15:17 +0100)]
Merge commit '
74a9a624c5c4d50760d8d57458eba57366f6cb26 '
* commit '
74a9a624c5c4d50760d8d57458eba57366f6cb26 ':
vcr1: return a meaningful error code.
rpza: return a meaningful error code.
qdrw: cosmetics, reformat
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 14:04:58 +0000 (15:04 +0100)]
Merge commit '
688b132b881d423877e38dc82f17e23a604be676 '
* commit '
688b132b881d423877e38dc82f17e23a604be676 ':
qdrw: return meaningful error codes.
qtrle: return a meaningful error code.
gifdec: return meaningful error codes.
interplayvideo: remove a static variable.
interplayvideo: return meaningful error codes.
lcldec: return meaningful error codes.
targa: return meaningful error codes.
qpeg: return a meaningful error code.
nuv: return meaningful error codes.
Conflicts:
libavcodec/gifdec.c
libavcodec/interplayvideo.c
libavcodec/nuv.c
libavcodec/qpeg.c
libavcodec/targa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 13:36:17 +0000 (14:36 +0100)]
Merge commit '
a1c525f7eb0783d31ba7a653865b6cbd3dc880de '
* commit '
a1c525f7eb0783d31ba7a653865b6cbd3dc880de ':
pcx: return meaningful error codes.
tmv: return meaningful error codes.
msrle: return meaningful error codes.
cscd: return meaningful error codes.
yadif: x86: fix build for compilers without aligned stack
lavc: introduce the convenience function init_get_bits8
lavc: check for overflow in init_get_bits
Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 13:16:21 +0000 (14:16 +0100)]
Merge commit '
90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1 '
* commit '
90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1 ':
avpacket: free side data in av_free_packet().
v4l2: do not assert on a value received from outside of Libav
v4l2: set the average framerate instead of codec timebase.
Conflicts:
libavcodec/avpacket.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 12:59:09 +0000 (13:59 +0100)]
Merge commit '
246da0b13551b1f80f067e4f258e5bd691f5ab33 '
* commit '
246da0b13551b1f80f067e4f258e5bd691f5ab33 ':
v4l2: avoid pointless indirection.
vdpau: Add VC-1 decoding via hwaccel infrastructure
vdpau: Add H.264 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 12:38:04 +0000 (13:38 +0100)]
Merge commit '
200e8ac92007bc2fe30da05d3bd00ab620842a6b '
* commit '
200e8ac92007bc2fe30da05d3bd00ab620842a6b ':
vdpau: Add MPEG-4 decoding via hwaccel infrastructure
vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Jan 2013 12:29:00 +0000 (13:29 +0100)]
Merge commit '
44e065d56c87d6a9d0effccec5f31517f72924ec '
* commit '
44e065d56c87d6a9d0effccec5f31517f72924ec ':
vdpau: Add context and common helpers for hwaccel support
Conflicts:
Changelog
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Jan 2013 23:07:51 +0000 (00:07 +0100)]
rtmpproto: Fix assignments in if()
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 13 Jan 2013 23:07:26 +0000 (00:07 +0100)]
lavf: Fix assignments in if()
Signed-off-by: Martin Storsjö <martin@martin.st>