mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-14 19:13:30 +02:00
Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'
* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf': fft: Remove pointless #ifdefs around function declarations ppc: Move AltiVec utility headers out of AltiVec ifdefs Conflicts: libavcodec/fft.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ebd99ff112
@ -133,14 +133,12 @@ void ff_init_ff_cos_tabs(int index);
|
|||||||
*/
|
*/
|
||||||
int ff_fft_init(FFTContext *s, int nbits, int inverse);
|
int ff_fft_init(FFTContext *s, int nbits, int inverse);
|
||||||
|
|
||||||
#if CONFIG_FFT_FLOAT
|
|
||||||
void ff_fft_init_altivec(FFTContext *s);
|
void ff_fft_init_altivec(FFTContext *s);
|
||||||
void ff_fft_init_x86(FFTContext *s);
|
void ff_fft_init_x86(FFTContext *s);
|
||||||
void ff_fft_init_arm(FFTContext *s);
|
void ff_fft_init_arm(FFTContext *s);
|
||||||
void ff_fft_init_mips(FFTContext *s);
|
void ff_fft_init_mips(FFTContext *s);
|
||||||
#else
|
|
||||||
void ff_fft_fixed_init_arm(FFTContext *s);
|
void ff_fft_fixed_init_arm(FFTContext *s);
|
||||||
#endif
|
|
||||||
|
|
||||||
void ff_fft_end(FFTContext *s);
|
void ff_fft_end(FFTContext *s);
|
||||||
|
|
||||||
|
@ -20,15 +20,14 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
#include "libavcodec/h264chroma.h"
|
|
||||||
|
|
||||||
#if HAVE_ALTIVEC
|
|
||||||
#include "libavutil/cpu.h"
|
#include "libavutil/cpu.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavutil/ppc/types_altivec.h"
|
#include "libavutil/ppc/types_altivec.h"
|
||||||
#include "libavutil/ppc/util_altivec.h"
|
#include "libavutil/ppc/util_altivec.h"
|
||||||
|
#include "libavcodec/h264chroma.h"
|
||||||
#include "dsputil_altivec.h"
|
#include "dsputil_altivec.h"
|
||||||
|
|
||||||
|
#if HAVE_ALTIVEC
|
||||||
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
|
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
|
||||||
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
|
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
|
||||||
|
|
||||||
|
@ -20,15 +20,15 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
#include "libavcodec/h264qpel.h"
|
|
||||||
|
|
||||||
#if HAVE_ALTIVEC
|
|
||||||
#include "libavutil/cpu.h"
|
#include "libavutil/cpu.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavutil/ppc/types_altivec.h"
|
#include "libavutil/ppc/types_altivec.h"
|
||||||
#include "libavutil/ppc/util_altivec.h"
|
#include "libavutil/ppc/util_altivec.h"
|
||||||
|
#include "libavcodec/h264qpel.h"
|
||||||
#include "dsputil_altivec.h"
|
#include "dsputil_altivec.h"
|
||||||
|
|
||||||
|
#if HAVE_ALTIVEC
|
||||||
|
|
||||||
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
|
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
|
||||||
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
|
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
|
||||||
|
|
||||||
|
@ -21,18 +21,19 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "libavutil/attributes.h"
|
|
||||||
#include "libavutil/cpu.h"
|
|
||||||
#include "libavcodec/hpeldsp.h"
|
|
||||||
|
|
||||||
#if HAVE_ALTIVEC
|
|
||||||
#if HAVE_ALTIVEC_H
|
#if HAVE_ALTIVEC_H
|
||||||
#include <altivec.h>
|
#include <altivec.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "libavutil/attributes.h"
|
||||||
|
#include "libavutil/cpu.h"
|
||||||
#include "libavutil/ppc/types_altivec.h"
|
#include "libavutil/ppc/types_altivec.h"
|
||||||
#include "libavutil/ppc/util_altivec.h"
|
#include "libavutil/ppc/util_altivec.h"
|
||||||
|
#include "libavcodec/hpeldsp.h"
|
||||||
#include "dsputil_altivec.h"
|
#include "dsputil_altivec.h"
|
||||||
|
|
||||||
|
#if HAVE_ALTIVEC
|
||||||
/* next one assumes that ((line_size % 16) == 0) */
|
/* next one assumes that ((line_size % 16) == 0) */
|
||||||
void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
|
void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
|
||||||
{
|
{
|
||||||
|
@ -23,14 +23,13 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
#include "libavutil/cpu.h"
|
#include "libavutil/cpu.h"
|
||||||
#include "libavcodec/vp3dsp.h"
|
|
||||||
|
|
||||||
#if HAVE_ALTIVEC
|
|
||||||
|
|
||||||
#include "libavutil/ppc/types_altivec.h"
|
#include "libavutil/ppc/types_altivec.h"
|
||||||
#include "libavutil/ppc/util_altivec.h"
|
#include "libavutil/ppc/util_altivec.h"
|
||||||
|
#include "libavcodec/vp3dsp.h"
|
||||||
#include "dsputil_altivec.h"
|
#include "dsputil_altivec.h"
|
||||||
|
|
||||||
|
#if HAVE_ALTIVEC
|
||||||
|
|
||||||
static const vec_s16 constants =
|
static const vec_s16 constants =
|
||||||
{0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
|
{0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
|
||||||
static const vec_u8 interleave_high =
|
static const vec_u8 interleave_high =
|
||||||
|
Loading…
Reference in New Issue
Block a user