]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 9 Feb 2014 21:03:59 +0000 (22:03 +0100)]
Merge commit '
6a8475dc4f10d65edb7faa8df6e035af0ddcce19 '
* commit '
6a8475dc4f10d65edb7faa8df6e035af0ddcce19 ':
asvenc: free avctx->coded_frame on codec close
Not merged as we do not allocate coded_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 19:57:32 +0000 (20:57 +0100)]
Merge commit '
d6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e '
* commit '
d6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e ':
arm: Remove a stray .fpu directive
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 19:15:07 +0000 (20:15 +0100)]
Merge commit '
28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8 '
* commit '
28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8 ':
dnxhddec: return proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 19:10:02 +0000 (20:10 +0100)]
fate: fix lavf-ogg test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 19:03:56 +0000 (20:03 +0100)]
Merge commit '
b0c2c097e422b9e10a7d856582f8321d28af821e '
* commit '
b0c2c097e422b9e10a7d856582f8321d28af821e ':
lavf: default .ogg audio to libvorbis if we can
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 19:01:32 +0000 (20:01 +0100)]
Merge commit '
bc3f03567a04a9f7e412bcf2ca09c163f3f13941 '
* commit '
bc3f03567a04a9f7e412bcf2ca09c163f3f13941 ':
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Conflicts:
libavcodec/g2meet.c
See:
cb2162adba4041951c987f9f365957e067b28a97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 18:39:11 +0000 (19:39 +0100)]
Merge commit '
722554788b77c13748e83458f626a9ac38b70072 '
* commit '
722554788b77c13748e83458f626a9ac38b70072 ':
Add raw HEVC muxer
Conflicts:
libavformat/version.h
See:
ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sat, 8 Feb 2014 11:26:13 +0000 (12:26 +0100)]
asvenc: free avctx->coded_frame on codec close
Clément Bœsch [Sun, 9 Feb 2014 17:44:07 +0000 (18:44 +0100)]
vp9: fix compilation with !HAVE_FAST_64BIT.
Spotted-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Martin Storsjö [Sat, 8 Feb 2014 23:34:44 +0000 (23:34 +0000)]
arm: Remove a stray .fpu directive
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Alexandra Khirnova [Sat, 8 Feb 2014 20:25:35 +0000 (20:25 +0000)]
dnxhddec: return proper error code
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Andrew Kelley [Sat, 8 Feb 2014 16:18:57 +0000 (16:18 +0000)]
lavf: default .ogg audio to libvorbis if we can
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.
Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Ronald S. Bultje [Sun, 9 Feb 2014 00:32:18 +0000 (19:32 -0500)]
vp9: invert order in l[] intra prediction array.
The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.
Ronald S. Bultje [Sat, 8 Feb 2014 22:03:21 +0000 (17:03 -0500)]
vp9: remove memset in loopfilter level setting loop.
Use same function for segmentation map writing also.
Ronald S. Bultje [Sat, 25 Jan 2014 17:55:55 +0000 (12:55 -0500)]
vp9: coef decoding context-splat speedup.
Ronald S. Bultje [Sat, 25 Jan 2014 02:53:22 +0000 (21:53 -0500)]
vp9: decode_mode context optimizations.
Ronald S. Bultje [Thu, 23 Jan 2014 01:51:54 +0000 (20:51 -0500)]
vp9: more aligned zeroes.
Ronald S. Bultje [Sat, 25 Jan 2014 02:54:15 +0000 (21:54 -0500)]
vp9: faster skip-block coefficient blanking.
Ronald S. Bultje [Wed, 22 Jan 2014 01:08:18 +0000 (20:08 -0500)]
vp9: coef context reading optimization.
Ronald S. Bultje [Sun, 9 Feb 2014 01:47:44 +0000 (20:47 -0500)]
vp9: just disallow temporal or no-update segmentation on size-change.
The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.
Ramiro Polla [Sat, 8 Feb 2014 20:01:26 +0000 (18:01 -0200)]
lavd: add decklink output device
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mrlika [Mon, 3 Feb 2014 12:11:05 +0000 (14:11 +0200)]
avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 9 Feb 2014 01:36:46 +0000 (02:36 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlp_parser: fix request_channel_layout behavior.
Conflicts:
libavcodec/mlp_parser.c
See:
bd35d58463f01f7781df052864ae16f5e228c1bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Feb 2014 00:29:53 +0000 (01:29 +0100)]
Merge commit '
f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f '
* commit '
f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f ':
mlpdec: fix request_channel_layout behavior.
See:
1a8050ad616c9682f44671c6febb6030a8e3b71e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Sat, 8 Feb 2014 22:17:08 +0000 (23:17 +0100)]
g2meet: Validate bpp and bitmasks in the display info
That prevents processing of media files with
incompatible or unsupported settings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Sat, 8 Feb 2014 21:27:51 +0000 (22:27 +0100)]
g2meet: factor out chunk seeking
This version requires fewer code and is safer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 8 Feb 2014 20:48:19 +0000 (15:48 -0500)]
vp9: don't allow retaining old segmentation maps after a size change.
Fixes valgrind warnings on fuzzed10.ivf.
Tim Walker [Sat, 8 Feb 2014 17:21:14 +0000 (17:21 +0000)]
mlp_parser: fix request_channel_layout behavior.
When request_channel_layout is 0,
all substreams should be decoded.
Thanks to Michael Niedermayer for spotting.
Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.
Michael Niedermayer [Sat, 8 Feb 2014 17:21:13 +0000 (17:21 +0000)]
mlpdec: fix request_channel_layout behavior.
When request_channel_layout is 0,
all substreams should be decoded.
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Michael Niedermayer [Sat, 8 Feb 2014 18:02:46 +0000 (19:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 17:20:16 +0000 (18:20 +0100)]
Merge commit '
76a75c523cd3c63560185394a0a5cd7249db962a '
* commit '
76a75c523cd3c63560185394a0a5cd7249db962a ':
lavr: mix front center channel as indicated in the ATSC A/52 specification.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 25 Jan 2014 02:54:13 +0000 (21:54 -0500)]
vp9: some variable re-arrangements for alignment.
Ronald S. Bultje [Sat, 8 Feb 2014 13:24:13 +0000 (08:24 -0500)]
vp9: re-allocate block buffers on uses_2pass change w/o size change.
Fixes valgrind errors and crashes in fuzzed9.ivf.
Michael Niedermayer [Sat, 8 Feb 2014 17:13:34 +0000 (18:13 +0100)]
avcodec/mlp_parser: fix multichannel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 17:08:01 +0000 (18:08 +0100)]
avcodec/mlpdec: fix mulichannel output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 16:31:01 +0000 (17:31 +0100)]
Merge commit '
c0c45188e56cfa3050bb39f8299025345b8a204c '
* commit '
c0c45188e56cfa3050bb39f8299025345b8a204c ':
mlp: improve request_channel_layout behavior.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 16:25:26 +0000 (17:25 +0100)]
Merge commit '
5c1c6e82261b856214499b9fef3a08bf3ff6e0ae '
* commit '
5c1c6e82261b856214499b9fef3a08bf3ff6e0ae ':
dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 16:14:52 +0000 (17:14 +0100)]
Merge commit '
6398d8fd813490fc3900baf8c788f803d8e17b73 '
* commit '
6398d8fd813490fc3900baf8c788f803d8e17b73 ':
configure: clang: add -Qunused-arguments to as|ld_flags as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 16:08:12 +0000 (17:08 +0100)]
Merge commit '
b141c7b37eb52aca41ac83738f159b63b9c09d5c '
* commit '
b141c7b37eb52aca41ac83738f159b63b9c09d5c ':
h264: give numbers to nalus
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 15:59:31 +0000 (16:59 +0100)]
Merge commit '
0cffd6fff59f192120dc93aa6c3cb8180f5506e3 '
* commit '
0cffd6fff59f192120dc93aa6c3cb8180f5506e3 ':
x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Fri, 7 Feb 2014 08:35:07 +0000 (09:35 +0100)]
Mirillis FIC video decoder
Does not contain cursor rendering yet.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Tim Walker [Wed, 15 Jan 2014 00:18:19 +0000 (00:18 +0000)]
lavr: mix front center channel as indicated in the ATSC A/52 specification.
When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.
Tim Walker [Thu, 6 Feb 2014 21:50:38 +0000 (21:50 +0000)]
mlp: improve request_channel_layout behavior.
Don't decode further substreams if request_channel_layout
is a subset of the current substream's channel_layout.
Before, we would only discard further substreams if
request_channel_layout matched the substream's
channel_layout extactly, thus decoding additional
channels which the caller would probably end up downmixing.
Janne Grunau [Sat, 8 Feb 2014 12:29:51 +0000 (13:29 +0100)]
dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders
Janne Grunau [Fri, 7 Feb 2014 18:23:28 +0000 (19:23 +0100)]
configure: clang: add -Qunused-arguments to as|ld_flags as well
Vittorio Giovara [Thu, 6 Feb 2014 22:28:32 +0000 (22:28 +0000)]
h264: give numbers to nalus
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Sat, 8 Feb 2014 11:50:43 +0000 (06:50 -0500)]
vp9/parser: change size type to unsigned.
Fixes valgrind errors in fuzzed8.ivf because size >= 0x80000000.
Michael Niedermayer [Sat, 8 Feb 2014 11:14:43 +0000 (12:14 +0100)]
avcodec/hevc: remove FFUMOD() in slice qp_y init
This has become redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 11:06:35 +0000 (12:06 +0100)]
avcodec/hevc: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Thu, 6 Feb 2014 23:30:27 +0000 (00:30 +0100)]
lavd/sdl: reset context variables after destroy
SDL device reports double free or hangs when quiting.
Reseting variables solves the issue.
The issue is caused by double call of write_trailer callback.
It is called for the first time in write_packet when quit flag is set.
Second call comes from ffmpeg.c or may come from other client application.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Thu, 6 Feb 2014 23:31:29 +0000 (00:31 +0100)]
lavd/sdl: make waiting spurious wakeup aware
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sat, 8 Feb 2014 10:48:19 +0000 (11:48 +0100)]
x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale
Fixes compilation with MSVC. Also does not rely on on earlier config.h
include but include it directly.
Carl Eugen Hoyos [Sat, 8 Feb 2014 11:06:49 +0000 (12:06 +0100)]
Fix compilation with --disable-everything --enable-encoder=flac.
Ronald S. Bultje [Sat, 8 Feb 2014 01:14:38 +0000 (20:14 -0500)]
vp9: fix mix-up of last-frame/cur-frame in frame size checks.
Fixes invalid reads in fuzzed7.ivf.
Clément Bœsch [Sat, 8 Feb 2014 10:09:30 +0000 (11:09 +0100)]
x86/vp9lpf: simplify 2nd transpose in 44/48/88/84.
For non-avx optims, this saves 8 movs.
before:
1785 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524129 runs, 159 skips
3327 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262116 runs, 28 skips
2712 decicycles in ff_vp9_loop_filter_h_88_16_ssse3,
4193729 runs, 575 skips
3237 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524061 runs, 227 skips
after:
1768 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524062 runs, 226 skips
3310 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262107 runs, 37 skips
2719 decicycles in ff_vp9_loop_filter_h_88_16_ssse3,
4193954 runs, 350 skips
3184 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524236 runs, 52 skips
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 03:19:39 +0000 (00:19 -0300)]
ffserver: drop unneeded delay1 var
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:02:26 +0000 (22:02 -0300)]
ffserver: move misplaced comment
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:00:07 +0000 (22:00 -0300)]
ffserver: drop obvious comment
Following code line is self explanatory
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Fri, 7 Feb 2014 22:54:56 +0000 (19:54 -0300)]
ffserver: cosmetics and grammar
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Lukasz Marek [Fri, 7 Feb 2014 15:43:10 +0000 (16:43 +0100)]
lavc/mpegvideo: add missing const
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Fri, 7 Feb 2014 15:25:33 +0000 (16:25 +0100)]
lavc/jpeg2000dec: silent warning discards qualifiers
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 01:16:47 +0000 (02:16 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadsp: split lfe_dir cases
Conflicts:
libavcodec/arm/dcadsp_init_arm.c
See:
45854df9a5220bdde400a447f63f61618b89dde2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 6 Feb 2014 00:41:54 +0000 (00:41 +0000)]
dcadsp: split lfe_dir cases
The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Feb 2014 00:11:50 +0000 (01:11 +0100)]
Merge commit '
5b59a9fc6152169599561f04b4f66370edda5c9c '
* commit '
5b59a9fc6152169599561f04b4f66370edda5c9c ':
x86: dcadsp: implement int8x8_fmul_int32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 23:55:37 +0000 (00:55 +0100)]
Merge commit '
2bd44cb705340c4f7bd7e459a1efed5074bf45fc '
* commit '
2bd44cb705340c4f7bd7e459a1efed5074bf45fc ':
dcadsp: add int8x8_fmul_int32 to dsp context
See:
481a46a462ca762600ee4ad4c3b1e93d21b1fa35
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to DSP context
It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.
Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.
On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 23:49:11 +0000 (00:49 +0100)]
Merge commit '
e3fec3f095ab5ea08ee662942d98526aaf5e3635 '
* commit '
e3fec3f095ab5ea08ee662942d98526aaf5e3635 ':
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 23:29:45 +0000 (00:29 +0100)]
Merge commit '
5bcbb516f2ff45290ef7995b081762e668693672 '
* commit '
5bcbb516f2ff45290ef7995b081762e668693672 ':
arm: Add X() around all references to extern symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 22:28:22 +0000 (23:28 +0100)]
avcodec/hevc: Simplify get_qPy_pred()
Fixes use of uninitialized memory
Fixes: 93728afd9aa074ba14a09bfd93a632fd-asan_static-oob_124a17d_1445_cov_1021181966_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 15:31:11 +0000 (16:31 +0100)]
avcodec/hevc: make check for previous slice segment tighter
This ensures the previous one is matching the curent and not just any
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 5 Feb 2014 23:40:52 +0000 (23:40 +0000)]
dcadsp: split lfe_dir cases
The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.
Arm asm changes by Janne Grunau.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Christophe Gisquet [Fri, 11 May 2012 09:25:30 +0000 (11:25 +0200)]
x86: dcadsp: implement int8x8_fmul_int32
For the callable function (as opposed to the inline one):
C SSE SSE2 SSE4
Win32: 47 42 29 26
Win64: 30 33 25 23
The SSE version is neither compiled nor set for ARCH_X86_64, as the
inlinable function takes over.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to dsp context
It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.
Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.
On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Lukasz Marek [Fri, 7 Feb 2014 15:42:17 +0000 (16:42 +0100)]
lavc/adpcm_data: fix const misplacement
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Fri, 7 Feb 2014 15:38:59 +0000 (16:38 +0100)]
lavc/evrcdec: fix const misplacement
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
avcodec/wmalosslessdec: fix mclms_coeffs* array size
Fixes corruption of context
Fixes: 8835659dde6a4f7dcdf341de6a45c6c8-signal_sigsegv_1dce67b_4564_cov_2504444599_classical_22_16_1_14000_v3c_0_extend_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 14:04:26 +0000 (15:04 +0100)]
avcodec/wmalosslessdec: use sizeof() instead of literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 4 Feb 2014 14:28:24 +0000 (16:28 +0200)]
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
This makes the generated assembly more internally consistent,
avoiding declaring two labels for the same function (for cases
where EXTERN_ASM is empty) and not declaring a separate unprefixed
label in other cases.
This also makes sure the .func and .type delcarations have the same
prefix. They have previously not been used on the platforms
that have prefixed symbols on arm (iOS), but gas-preprocessor
has recently started using the .func declarations for adding
.thumb_func declarations for such functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 7 Feb 2014 10:00:31 +0000 (12:00 +0200)]
arm: Add X() around all references to extern symbols
Don't rely on the fact that an unprefixed label currently exists.
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Fri, 7 Feb 2014 08:33:56 +0000 (09:33 +0100)]
Fix a few heigth/height typo.
Michael Niedermayer [Fri, 7 Feb 2014 03:32:28 +0000 (04:32 +0100)]
avcodec/hevc: hls_decode_entry: check that the previous slice segment is available before decoding the next
Fixes use of uninitialized memory
Fixes out of array read
Fixes assertion failure
Fixes part of
cb307d24befbd109c6f054008d6777b5 /asan_static-oob_124a175_1445_cov_2355279992_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 03:30:31 +0000 (04:30 +0100)]
avcodec/hevc: clear tab_slice_address of ctb on error.
This allows us to detect which areas have failed to decode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 01:37:18 +0000 (02:37 +0100)]
avcodec/hevc: clear tab_slice_address in hevc_frame_start()
Fixes inconsistencies
Fixes use of uninitilaized memory
Fixes part of
cb307d24befbd109c6f054008d6777b5 /asan_static-oob_124a175_1445_cov_2355279992_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 00:55:17 +0000 (01:55 +0100)]
avcodec/hevc_filter: assert validity of qp predictor input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Feb 2014 23:57:27 +0000 (00:57 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp8: fix bilinear C code to work if src_stride != dst_stride.
See:
34b429d5ba7b823748e897f0295aa78aaa2ebb9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 6 Feb 2014 04:34:01 +0000 (01:34 -0300)]
x86/cpu: add missing avx2 AVOption in av_parse_cpu_flags()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Wed, 5 Feb 2014 07:59:45 +0000 (07:59 +0000)]
vp8: fix bilinear C code to work if src_stride != dst_stride.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Peter Krefting [Thu, 6 Feb 2014 11:51:39 +0000 (12:51 +0100)]
configure: Remove dcbzl check for e500v1 and e500v2 architectures
The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we need to
remove the test for it explicitly for these architectures.
References: PowerPC™ e500 Core Family Reference Manual (Freescale)
Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 26 Jan 2014 17:43:20 +0000 (09:43 -0800)]
doc/texi2pod: make references bold
Inspired by GCC r86635.
This is more consistent with other man pages. For example in `man git`,
all the "git-help(1)" kind of cross refs are bold.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Feb 2014 14:33:54 +0000 (15:33 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter
Conflicts:
libavcodec/arm/vp8dsp_neon.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 5 Feb 2014 12:47:32 +0000 (14:47 +0200)]
vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter
Based on a patch by Ronald S. Bultje.
Signed-off-by: Martin Storsjö <martin@martin.st>
Loren Merritt [Mon, 3 Feb 2014 23:17:04 +0000 (23:17 +0000)]
flac/x86: add ff_flac_lpc_32_sse4()
benchmarked on sandybridge x86_64:
1358232 decicycles in flac_lpc_32_c
1244575 decicycles in flac_lpc_32_sse4, James Almer's patch
650045 decicycles in flac_lpc_32_sse4, this patch
I haven't tested the edgecases such as odd block lengths
odd block length tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Thu, 6 Feb 2014 00:08:00 +0000 (16:08 -0800)]
libfdk-aacenc: disable hard version requirements
Enable compilation on machines with an old libfdk-aac.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Feb 2014 23:26:18 +0000 (00:26 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: force the simple idct for xvid custom matrix test
Conflicts:
tests/fate/xvid.mak
tests/ref/fate/xvid-custom-matrix
See:
ef034cbf185e1938000a117bd16aa6b33046f479
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Feb 2014 22:48:15 +0000 (23:48 +0100)]
Merge commit '
a1e1f35203bbcbea0efb51d93e96769c826b8c64 '
* commit '
a1e1f35203bbcbea0efb51d93e96769c826b8c64 ':
lavu: add missing log.h include in timer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Boeckel [Wed, 5 Feb 2014 17:10:56 +0000 (12:10 -0500)]
vorbis: extract metadata from the middle of a stream
If a special comment packet shows up in the middle of the stream, we
should extract it out into the vorbis stream metadata dictionary.
Also, if there is metadata in the packet on the way in, it might linger
since we only add data to the dictionary causing stale metadata to be
inserted into the stream. Instead, clear it to remove any doubt about
what is new and old.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>