---
libavcodec/x86/ac3dsp.asm | 4 ++--
libavcodec/x86/ac3dsp_init.c | 2 +-
libavcodec/x86/dsputil_mmx.c | 2 +-
libavcodec/x86/fft_init.c | 2 +-
libavcodec/x86/fmtconvert_init.c | 2 +-
libavcodec/x86/mpegvideoenc.c | 2 +-
libavfilter/x86/gradfun.c | 7 ++++---
libavfilter/x86/yadif.c | 8 ++++----
libavfilter/x86/yadif_template.c | 2 +-
libavresample/x86/audio_convert_init.c | 6 +++---
libavresample/x86/audio_mix_init.c | 8 ++++----
libswscale/x86/rgb2rgb.c | 2 +-
12 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm
index ef828bb..2bc5e8a 100644
--- a/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@ -73,7 +73,7 @@ AC3_EXPONENT_MIN mmx
%define LOOP_ALIGN ALIGN 16
AC3_EXPONENT_MIN mmxext
%endif
-%if HAVE_SSE
+%if HAVE_SSE2
INIT_XMM
AC3_EXPONENT_MIN sse2
%endif
@@ -453,7 +453,7 @@ cglobal ac3_extract_exponents_%1, 3,3,4, exp, coef, len
REP_RET
%endmacro
-%if HAVE_SSE
+%if HAVE_SSE2
INIT_XMM
%define PABSD PABSD_MMX
AC3_EXTRACT_EXPONENTS sse2
diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c
index f3db67a..a564c33 100644
--- a/libavcodec/x86/ac3dsp_init.c
+++ b/libavcodec/x86/ac3dsp_init.c
@@ -72,7 +72,7 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int
bit_exact)
if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) {
c->float_to_fixed24 = ff_float_to_fixed24_sse;
}
- if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE2) {
c->ac3_exponent_min = ff_ac3_exponent_min_sse2;
c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_sse2;
c->float_to_fixed24 = ff_float_to_fixed24_sse2;
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index c1f54ac..1c10e91 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -3062,7 +3062,7 @@ void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext
*avctx)
if (mm_flags & AV_CPU_FLAG_SSSE3)
dsputil_init_ssse3(c, avctx, mm_flags);
- if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE)
+ if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE4)
dsputil_init_sse4(c, avctx, mm_flags);
if (mm_flags & AV_CPU_FLAG_AVX)
diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c
index fcde3fa..1dae585 100644
--- a/libavcodec/x86/fft_init.c
+++ b/libavcodec/x86/fft_init.c
@@ -63,7 +63,7 @@ av_cold void ff_dct_init_mmx(DCTContext *s)
int has_vectors = av_get_cpu_flags();
if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE)
s->dct32 = ff_dct32_float_sse;
- if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE)
+ if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE2)
s->dct32 = ff_dct32_float_sse2;
if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX)
s->dct32 = ff_dct32_float_avx;
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c
index 6f3d14a..5229496 100644
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@ -137,7 +137,7 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c,
AVCodecContext *avctx)
c->float_to_int16_interleave = float_to_int16_interleave_sse;
c->float_interleave = float_interleave_sse;
}
- if (HAVE_SSE && mm_flags & AV_CPU_FLAG_SSE2) {
+ if (HAVE_SSE2 && mm_flags & AV_CPU_FLAG_SSE2) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;
c->float_to_int16 = ff_float_to_int16_sse2;
c->float_to_int16_interleave = float_to_int16_interleave_sse2;
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index 946240d..991784b 100644
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@ -89,7 +89,7 @@ void ff_MPV_encode_init_x86(MpegEncContext *s)
s->dct_quantize = dct_quantize_SSSE3;
} else
#endif
- if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE2) {
s->dct_quantize = dct_quantize_SSE2;
} else if (mm_flags & AV_CPU_FLAG_MMXEXT && HAVE_MMXEXT) {
s->dct_quantize = dct_quantize_MMX2;
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c
index 140f5e8..e7890fe 100644
--- a/libavfilter/x86/gradfun.c
+++ b/libavfilter/x86/gradfun.c
@@ -124,7 +124,7 @@ static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t
*src, uint16_t *dc,
}
#endif // HAVE_SSSE3
-#if HAVE_SSE
+#if HAVE_SSE2
static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t
*buf1, uint8_t *src, int src_linesize, int width)
{
#define BLURV(load)\
@@ -165,7 +165,7 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t
*buf, uint16_t *buf1,
BLURV("movdqa");
}
}
-#endif // HAVE_SSE
+#endif /* HAVE_SSE2 */
#endif /* HAVE_INLINE_ASM */
@@ -182,7 +182,8 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf)
if (cpu_flags & AV_CPU_FLAG_SSSE3)
gf->filter_line = gradfun_filter_line_ssse3;
#endif
-#if HAVE_SSE
+
+#if HAVE_SSE2
if (cpu_flags & AV_CPU_FLAG_SSE2)
gf->blur_line = gradfun_blur_line_sse2;
#endif
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c
index 750db42..dfe0bda 100644
--- a/libavfilter/x86/yadif.c
+++ b/libavfilter/x86/yadif.c
@@ -32,7 +32,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pb_1) =
{0x0101010101010101ULL, 0x010101010
DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL,
0x0001000100010001ULL};
#if HAVE_SSSE3
-#define COMPILE_TEMPLATE_SSE 1
+#define COMPILE_TEMPLATE_SSE2 1
#define COMPILE_TEMPLATE_SSSE3 1
#undef RENAME
#define RENAME(a) a ## _ssse3
@@ -40,11 +40,11 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) =
{0x0001000100010001ULL, 0x000100010
#undef COMPILE_TEMPLATE_SSSE3
#endif
-#if HAVE_SSE
+#if HAVE_SSE2
#undef RENAME
#define RENAME(a) a ## _sse2
#include "yadif_template.c"
-#undef COMPILE_TEMPLATE_SSE
+#undef COMPILE_TEMPLATE_SSE2
#endif
#if HAVE_MMXEXT
@@ -64,7 +64,7 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif)
if (cpu_flags & AV_CPU_FLAG_MMXEXT)
yadif->filter_line = yadif_filter_line_mmx2;
#endif
-#if HAVE_SSE
+#if HAVE_SSE2
if (cpu_flags & AV_CPU_FLAG_SSE2)
yadif->filter_line = yadif_filter_line_sse2;
#endif
diff --git a/libavfilter/x86/yadif_template.c b/libavfilter/x86/yadif_template.c
index 3e45f4f..02b0c9f 100644
--- a/libavfilter/x86/yadif_template.c
+++ b/libavfilter/x86/yadif_template.c
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef COMPILE_TEMPLATE_SSE
+#ifdef COMPILE_TEMPLATE_SSE2
#define MM "%%xmm"
#define MOV "movq"
#define MOVQ "movdqa"
diff --git a/libavresample/x86/audio_convert_init.c
b/libavresample/x86/audio_convert_init.c
index a3589c6..b8b9d7c 100644
--- a/libavresample/x86/audio_convert_init.c
+++ b/libavresample/x86/audio_convert_init.c
@@ -161,7 +161,7 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
2, 16, 4, "SSE",
ff_conv_flt_to_fltp_2ch_sse);
}
- if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE2) {
if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) {
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32,
0, 16, 16, "SSE2",
ff_conv_s32_to_s16_sse2);
@@ -206,7 +206,7 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
6, 16, 4, "SSE2",
ff_conv_flt_to_fltp_6ch_sse2);
}
- if (mm_flags & AV_CPU_FLAG_SSSE3 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSSE3 && HAVE_SSSE3) {
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16P,
6, 16, 4, "SSSE3",
ff_conv_s16p_to_flt_6ch_ssse3);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLTP,
@@ -220,7 +220,7 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLT,
6, 16, 4, "SSSE3",
ff_conv_flt_to_s16p_6ch_ssse3);
}
- if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE4) {
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16,
0, 16, 8, "SSE4", ff_conv_s16_to_flt_sse4);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
diff --git a/libavresample/x86/audio_mix_init.c
b/libavresample/x86/audio_mix_init.c
index de4c148..bc3f078 100644
--- a/libavresample/x86/audio_mix_init.c
+++ b/libavresample/x86/audio_mix_init.c
@@ -113,7 +113,7 @@ DEFINE_MIX_3_8_TO_1_2(8)
chan, 2, 16, 4, "SSE", \
ff_mix_## chan ##_to_2_fltp_flt_sse); \
} \
- if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) { \
+ if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE2) { \
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\
chan, 1, 16, 8, "SSE2", \
ff_mix_ ## chan ## _to_1_s16p_flt_sse2); \
@@ -121,7 +121,7 @@ DEFINE_MIX_3_8_TO_1_2(8)
chan, 2, 16, 8, "SSE2", \
ff_mix_ ## chan ## _to_2_s16p_flt_sse2); \
} \
- if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) { \
+ if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE4) { \
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\
chan, 1, 16, 8, "SSE4", \
ff_mix_ ## chan ## _to_1_s16p_flt_sse4); \
@@ -181,7 +181,7 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am)
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,
1, 2, 16, 4, "SSE", ff_mix_1_to_2_fltp_flt_sse);
}
- if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE2) {
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
2, 1, 16, 8, "SSE2",
ff_mix_2_to_1_s16p_flt_sse2);
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_Q8,
@@ -189,7 +189,7 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am)
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
1, 2, 16, 8, "SSE2",
ff_mix_1_to_2_s16p_flt_sse2);
}
- if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) {
+ if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE4) {
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
2, 1, 16, 8, "SSE4",
ff_mix_2_to_1_s16p_flt_sse4);
ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
index f201281..3116ed6 100644
--- a/libswscale/x86/rgb2rgb.c
+++ b/libswscale/x86/rgb2rgb.c
@@ -139,7 +139,7 @@ av_cold void rgb2rgb_init_x86(void)
rgb2rgb_init_3DNOW();
if (HAVE_MMXEXT && cpu_flags & AV_CPU_FLAG_MMXEXT)
rgb2rgb_init_MMX2();
- if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2)
+ if (HAVE_SSE2 && cpu_flags & AV_CPU_FLAG_SSE2)
rgb2rgb_init_SSE2();
#endif /* HAVE_INLINE_ASM */
}
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
