Michael Niedermayer
75cc29a8a8
Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
...
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
hpeldsp_template: Merge some declarations and initializations
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:08:30 +01:00
Michael Niedermayer
76d7676fcc
Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'
...
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
hpeldsp_template: K&R formatting cosmetics
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:52:19 +01:00
Michael Niedermayer
8b66b43128
Merge commit '2972087e398454122a82a970ed07924185175c6d'
...
* commit '2972087e398454122a82a970ed07924185175c6d':
hpel_template: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:50:04 +01:00
Michael Niedermayer
da760a64d1
Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'
...
* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
hpel_template: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:32:27 +01:00
Michael Niedermayer
d3ed8a4d2b
ffmpeg: try to avoid calling av_log() from sigterm_handler()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 16:24:17 +01:00
Michael Niedermayer
9d60527a13
configure: fix direct symbol ref support detection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 13:14:33 +01:00
Diego Biurrun
cce791b17b
hpeldsp_template: Merge some declarations and initializations
2014-03-20 05:03:22 -07:00
Diego Biurrun
2539cf1c81
hpeldsp_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
2972087e39
hpel_template: Drop some unnecessary parentheses
2014-03-20 05:03:22 -07:00
Diego Biurrun
e8eace3276
hpel_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Michael Niedermayer
3d04b1aab1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
float-dsp-test: do not use C99's predefined __func__
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 12:53:41 +01:00
Janne Grunau
6a74ebc34d
float-dsp-test: do not use C99's predefined __func__
...
It is not supported by all compilers on FATE. Fixes "some test were
skipped" errors.
2014-03-20 11:16:06 +01:00
James Almer
32291ba6ea
swresample: add swri_resample_float_sse
...
At least two times faster than the C version.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 06:01:06 +01:00
Ben Avison
e555e1bc39
truehd: tune VLC decoding for ARM.
...
Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant)
6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5%
8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5%
8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6%
6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6%
6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1%
8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4%
8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 22:24:32 +01:00
Michael Niedermayer
f502234f93
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 21:20:14 +01:00
Michael Niedermayer
9da88d5e56
Merge commit '606cc8afa1cb782311f68560c8f9bad978cdcc32'
...
* commit '606cc8afa1cb782311f68560c8f9bad978cdcc32':
configure: ppc: Disable ldbrx instruction by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 21:14:32 +01:00
Michael Niedermayer
2ef6c0fdf5
Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'
...
* commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004':
mxf: Lowercase UL strings
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 21:09:16 +01:00
Michael Niedermayer
3e59db606e
Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'
...
* commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5':
mxf: Verbose debug logging
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 20:54:35 +01:00
Michael Niedermayer
8263c14691
Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'
...
* commit '842ea36c747eb6537c4236114346cb7a3e9a8df1':
mxf: Override faulty PreviousPartition entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 20:46:52 +01:00
Michael Niedermayer
bd9e0127c9
Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'
...
* commit '92ebb332157195b7c1212e734c5668afbf19cf2b':
mxf: Add additional H264 PictureEssenceCoding
Conflicts:
libavformat/mxf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 20:39:05 +01:00
Martin Storsjö
ae23809184
float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions
...
This fixes fate-float_dsp-test on RVCT 4.0.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-19 20:02:34 +02:00
Michael Niedermayer
dde16f5aae
avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1
...
Fixes Ticket3229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
493296800c
avcodec/mjpegdec: parse avid data from extradata
...
Makes no difference for any file tested but is needed
for following bug-fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
046a75eea0
avcodec/mjpeg: print info from parse_avid() if requested
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
98f9aa389b
avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID
...
0 should have been the default, this change should make no difference
but this is needed for the following bugfix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
1083c479eb
avcodec/mjpegdec: factorize parse_avid out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Diego Biurrun
606cc8afa1
configure: ppc: Disable ldbrx instruction by default
...
Only enable it for CPUs that support it.
This restores the behavior prior to 7a650caf
.
2014-03-19 17:14:11 +01:00
Luca Barbato
af9481d701
mxf: Lowercase UL strings
...
The specification uses lower case most of the time.
2014-03-19 12:04:15 +01:00
Luca Barbato
6920fb2b33
mxf: Verbose debug logging
...
Print the UL in code format and in the short format used by the
specification.
2014-03-19 12:04:06 +01:00
Luca Barbato
842ea36c74
mxf: Override faulty PreviousPartition entries
...
Some files set the PreviousPartition field to point to its own offset.
If we are parsing forward the Previous partition is immediately known
and its value could be used, otherwise we can safely point to the
header.
Reported-By: Jean Baptiste Kempf <jb@videolan.org>
2014-03-19 11:56:33 +01:00
Luca Barbato
92ebb33215
mxf: Add additional H264 PictureEssenceCoding
...
Unbreak some MXF Proxy files.
2014-03-19 11:51:08 +01:00
Carl Eugen Hoyos
074db4b764
Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.
2014-03-19 09:11:22 +01:00
Carl Eugen Hoyos
5e3689caed
Add the H.264 decoder as a dependency for the fate-mkv test.
2014-03-19 03:00:19 +01:00
Carl Eugen Hoyos
57fdc74c34
Add one forgotten named inline asm operand in libavcodec/x86/motion_est.c.
2014-03-19 03:00:19 +01:00
Michael Niedermayer
ce9d3daa8a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aarch64: float_dsp NEON assembler
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 02:52:08 +01:00
Michael Niedermayer
a2339ef7b9
Merge commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c'
...
* commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c':
libopenjpeg: Support rgba64 decoding
See: b7a928b2d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 02:43:04 +01:00
Michael Niedermayer
1d8e97c79c
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
...
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See: 36397ea1c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 01:32:05 +01:00
Michael Niedermayer
543a46e0d1
Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'
...
* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
libopenjpeg: K&R formatting cosmetics
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 01:06:29 +01:00
Matt Oliver
8236747511
Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.
...
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 23:39:30 +01:00
Matt Oliver
b2d3a45598
avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported
...
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 23:37:50 +01:00
Janne Grunau
dbd12523a4
aarch64: float_dsp NEON assembler
...
Ported from arm NEON and added vector_dmul_scalar.
Functions between 1.5 and 5 times faster than the C implementations
using Apple's clang-503.0.19 on A7.
2014-03-18 22:56:07 +01:00
Carl Eugen Hoyos
37c07d4529
swscale/utils: Fix color range of gray16
...
Improves rgb -> gray16 conversion
Fixes Ticket3422
The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 22:15:15 +01:00
Vittorio Giovara
1b51b7ba00
libopenjpeg: Support rgba64 decoding
2014-03-18 21:54:31 +01:00
Carl Eugen Hoyos
8f45bd1433
libopenjpeg: Support rgba64 encoding
2014-03-18 21:54:31 +01:00
Vittorio Giovara
1ea9fa15c3
libopenjpeg: K&R formatting cosmetics
2014-03-18 21:54:25 +01:00
Michael Niedermayer
05d7059ac6
avcodec/h264pred_template: fix declarations after statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 20:53:37 +01:00
Yogender Kumar Gupta
6f7ca1f55b
avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction
...
This is limited to the case where x264_build = -1, to not break x264 decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 20:37:26 +01:00
Michael Niedermayer
7ab315ec69
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
float_dsp: add test program and use it as fate test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 20:04:28 +01:00
Michael Niedermayer
61ad2b42a1
Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'
...
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 19:59:00 +01:00
Michael Niedermayer
ae9b468b08
Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'
...
* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
lavc: er: remove unused variable size
No change as the variable is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 19:52:44 +01:00