Michael Niedermayer
865c94bb57
Merge commit ' b718b24bbe'
...
* commit 'b718b24bbe ':
ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 19:10:00 +02:00
Diego Biurrun
b718b24bbe
ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes
2014-04-04 19:08:05 +02:00
Michael Niedermayer
fb61ed1e9f
Merge commit ' ac4b32df71'
...
* commit 'ac4b32df71 ':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 14:46:10 +02:00
Peter Ross
ac4b32df71
On2 VP7 decoder
...
Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-04 04:00:11 +02:00
Michael Niedermayer
816d7936a7
Merge commit ' ae116cd3ed'
...
* commit 'ae116cd3ed ':
ppc: dsputil: Move hpeldsp-related declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 23:17:03 +01:00
Diego Biurrun
ae116cd3ed
ppc: dsputil: Move hpeldsp-related declarations to a separate header
2014-03-22 06:17:29 -07:00
Michael Niedermayer
e98bac82e5
Merge commit ' 82bb304801'
...
* commit '82bb304801 ':
dsputil: Use correct type in me_cmp_func function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:36:40 +01:00
Michael Niedermayer
011d83de48
Merge commit ' 0e083d7e43'
...
* commit '0e083d7e43 ':
build: Group general components separate from de/encoders in arch Makefiles
Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:26:31 +01:00
Michael Niedermayer
3775224b2f
Merge commit ' 54a6e08a65'
...
* commit '54a6e08a65 ':
dsputil: Conditionally compile dsputil code on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:12:11 +01:00
Michael Niedermayer
ba85bfabf3
Merge commit ' 5169e68895'
...
* commit '5169e68895 ':
dsputil: Propagate bit depth information to all (sub)init functions
Conflicts:
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:06:01 +01:00
Michael Niedermayer
b20b772474
Merge commit ' 1675975216'
...
* commit '1675975216 ':
ppc: dsputil: Drop trailing semicolon from macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:51:17 +01:00
Michael Niedermayer
ba91ac5c0e
Merge commit ' b7d24fd4b2'
...
* commit 'b7d24fd4b2 ':
ppc: dsputil: Merge some declarations and initializations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:50:35 +01:00
Michael Niedermayer
eb680f2ab0
Merge commit ' b045283f21'
...
* commit 'b045283f21 ':
ppc: dsputil: Simplify some ifdeffed function definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:44:59 +01:00
Michael Niedermayer
d648ffe446
Merge commit ' 8bd6f88266'
...
* commit '8bd6f88266 ':
ppc: dsputil: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:44:39 +01:00
Michael Niedermayer
adf82fe4f7
Merge commit ' 022184a646'
...
* commit '022184a646 ':
ppc: dsputil: more K&R formatting cosmetics
Conflicts:
libavcodec/ppc/gmc_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:30:21 +01:00
Michael Niedermayer
13405ecdfe
Merge commit ' 30f3f95987'
...
* commit '30f3f95987 ':
ppc: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:29:37 +01:00
Michael Niedermayer
047cf46e97
Merge commit ' 82ee14d2ce'
...
* commit '82ee14d2ce ':
ppc: dsputil: comment formatting and wording/grammar improvements
Conflicts:
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/idct_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 21:09:57 +01:00
Diego Biurrun
82bb304801
dsputil: Use correct type in me_cmp_func function pointer
2014-03-20 05:03:23 -07:00
Diego Biurrun
0e083d7e43
build: Group general components separate from de/encoders in arch Makefiles
...
This is in line with how the top-level libavcodec Makefile is structured.
2014-03-20 05:03:23 -07:00
Diego Biurrun
54a6e08a65
dsputil: Conditionally compile dsputil code on all architectures
2014-03-20 05:03:23 -07:00
Diego Biurrun
5169e68895
dsputil: Propagate bit depth information to all (sub)init functions
...
This avoids recalculating the value over and over again.
2014-03-20 05:03:23 -07:00
Diego Biurrun
1675975216
ppc: dsputil: Drop trailing semicolon from macros
...
This allows for a more natural macro usage.
2014-03-20 05:03:22 -07:00
Diego Biurrun
b7d24fd4b2
ppc: dsputil: Merge some declarations and initializations
2014-03-20 05:03:22 -07:00
Diego Biurrun
b045283f21
ppc: dsputil: Simplify some ifdeffed function definitions
2014-03-20 05:03:22 -07:00
Diego Biurrun
8bd6f88266
ppc: dsputil: Drop some unnecessary parentheses
2014-03-20 05:03:22 -07:00
Diego Biurrun
022184a646
ppc: dsputil: more K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
30f3f95987
ppc: dsputil: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
82ee14d2ce
ppc: dsputil: comment formatting and wording/grammar improvements
2014-03-20 05:03:22 -07:00
Michael Niedermayer
e52d97a7ac
Merge commit ' fd9e2221bd'
...
* commit 'fd9e2221bd ':
ppc: Add some missing headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 23:40:55 +01:00
Michael Niedermayer
1306359ea9
Merge commit ' 49676eb730'
...
* commit '49676eb730 ':
dsputil: Remove prototypes for nonexisting optimization functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 22:56:08 +01:00
Diego Biurrun
fd9e2221bd
ppc: Add some missing headers
2014-03-13 05:50:28 -07:00
Diego Biurrun
49676eb730
dsputil: Remove prototypes for nonexisting optimization functions
2014-03-13 05:50:28 -07:00
Michael Niedermayer
f11905763c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ppc: reduce overreads when loading 8 pixels in altivec dsp functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14 22:00:12 +01:00
Janne Grunau
98fdfa9970
ppc: reduce overreads when loading 8 pixels in altivec dsp functions
...
Altivec can only load naturally aligned vectors. To handle possibly
unaligned data a second vector is loaded from an offset of the original
location and the data is recovered through a vector permutation.
Overreads are minimal if the offset for second load points to the last
element of data. This is 7 for loading eight 8-bit pixels and overreads
are reduced from 16 bytes to 8 bytes if the pixels are 64-bit aligned.
For unaligned pixels the overread is reduced from 23 bytes to 15 bytes
in the worst case.
2014-02-14 18:34:04 +01:00
Ronald S. Bultje
2f6eec65ac
vp8: fix PPC assembly to work if src_stride != dst_stride
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-02-09 18:50:53 +01:00
Michael Niedermayer
30056fd0be
Merge commit ' a03a642d5c'
...
* commit 'a03a642d5c ':
h264: do not use 422 functions for monochrome
See: 07abf13da4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06 16:51:23 +01:00
Anton Khirnov
a03a642d5c
h264: do not use 422 functions for monochrome
...
Fixes invalid memory access.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-06 08:25:36 +01:00
Michael Niedermayer
867e7bb4f1
fix order of operations in comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 14:32:04 +02:00
Ronald S. Bultje
34b429d5ba
vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 15:23:53 +02:00
Michael Niedermayer
09c94b57ca
Merge commit ' a6b6501185'
...
* commit 'a6b6501185 ':
ppc: cosmetics: Consistently format CPU flag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30 11:48:54 +02:00
Michael Niedermayer
4399e72723
Merge commit ' 6af2c351b3'
...
* commit '6af2c351b3 ':
ppc: Add missing AltiVec cpuflag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:04:59 +02:00
Michael Niedermayer
3e75f98667
Merge commit ' de81b6ae4f'
...
* commit 'de81b6ae4f ':
ppc: fdct: Remove vim editor settings comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:00:02 +02:00
Michael Niedermayer
29daad5b98
Merge commit ' f61bece684'
...
* commit 'f61bece684 ':
ppc: Add and use convenience macro to check for AltiVec availability
Conflicts:
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:24:07 +02:00
Diego Biurrun
a6b6501185
ppc: cosmetics: Consistently format CPU flag detection invocations
2013-08-29 11:31:32 +02:00
Diego Biurrun
6af2c351b3
ppc: Add missing AltiVec cpuflag detection invocations
2013-08-29 00:24:46 +02:00
Diego Biurrun
de81b6ae4f
ppc: fdct: Remove vim editor settings comment
2013-08-28 23:59:24 +02:00
Diego Biurrun
f61bece684
ppc: Add and use convenience macro to check for AltiVec availability
2013-08-28 23:54:15 +02:00
Michael Niedermayer
d7ed473d5c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
altivec: perform an explicit unaligned load
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 14:21:40 +02:00
Kostya Shishkov
f399e406af
altivec: perform an explicit unaligned load
...
Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-16 10:08:47 +03:00
Michael Niedermayer
9d01bf7d66
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 09:53:47 +02:00