[FFmpeg-cvslog] Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'
James Almer
git at videolan.org
Tue Jan 31 19:58:31 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jan 31 14:56:11 2017 -0300| [f6005907fdeb9e4de37568ed5c1a8e7b869126f6] | committer: James Almer
Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'
* commit '95c1df929b92d81454656c222a35ec5f7db576b4':
x86: hpeldsp: Drop unused function parameters
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6005907fdeb9e4de37568ed5c1a8e7b869126f6
---
libavcodec/x86/hpeldsp_init.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index a192924..58e27e3 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -184,7 +184,7 @@ HPELDSP_AVG_PIXELS16(_mmxext)
} while (0)
#endif
-static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags)
+static void hpeldsp_init_mmx(HpelDSPContext *c, int flags)
{
SET_HPEL_FUNCS(put, [0], 16, mmx);
SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx);
@@ -202,7 +202,7 @@ static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags)
#endif
}
-static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags)
+static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags)
{
#if HAVE_MMXEXT_EXTERNAL
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext;
@@ -233,7 +233,7 @@ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_MMXEXT_EXTERNAL */
}
-static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int cpu_flags)
+static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags)
{
#if HAVE_AMD3DNOW_EXTERNAL
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow;
@@ -264,7 +264,7 @@ static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_AMD3DNOW_EXTERNAL */
}
-static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags, int cpu_flags)
+static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags)
{
#if HAVE_SSE2_EXTERNAL
c->put_pixels_tab[0][0] = ff_put_pixels16_sse2;
@@ -279,7 +279,7 @@ static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_SSE2_EXTERNAL */
}
-static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags, int cpu_flags)
+static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags)
{
#if HAVE_SSSE3_EXTERNAL
c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_ssse3;
@@ -294,19 +294,19 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
int cpu_flags = av_get_cpu_flags();
if (INLINE_MMX(cpu_flags))
- hpeldsp_init_mmx(c, flags, cpu_flags);
+ hpeldsp_init_mmx(c, flags);
if (EXTERNAL_AMD3DNOW(cpu_flags))
- hpeldsp_init_3dnow(c, flags, cpu_flags);
+ hpeldsp_init_3dnow(c, flags);
if (EXTERNAL_MMXEXT(cpu_flags))
- hpeldsp_init_mmxext(c, flags, cpu_flags);
+ hpeldsp_init_mmxext(c, flags);
if (EXTERNAL_SSE2_FAST(cpu_flags))
- hpeldsp_init_sse2_fast(c, flags, cpu_flags);
+ hpeldsp_init_sse2_fast(c, flags);
if (EXTERNAL_SSSE3(cpu_flags))
- hpeldsp_init_ssse3(c, flags, cpu_flags);
+ hpeldsp_init_ssse3(c, flags);
if (CONFIG_VP3_DECODER)
ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);
======================================================================
diff --cc libavcodec/x86/hpeldsp_init.c
index a192924,cd3999e..58e27e3
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@@ -177,32 -157,21 +177,32 @@@ HPELDSP_AVG_PIXELS16(_mmxext
c->PFX ## _pixels_tab IDX [2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \
c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
} while (0)
+#else
+#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \
+ do { \
+ SET_HPEL_FUNCS_EXT(PFX, IDX, SIZE, CPU) \
+ } while (0)
+#endif
- static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags)
+ static void hpeldsp_init_mmx(HpelDSPContext *c, int flags)
{
-#if HAVE_MMX_INLINE
SET_HPEL_FUNCS(put, [0], 16, mmx);
SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx);
SET_HPEL_FUNCS(avg, [0], 16, mmx);
SET_HPEL_FUNCS(avg_no_rnd, , 16, mmx);
SET_HPEL_FUNCS(put, [1], 8, mmx);
SET_HPEL_FUNCS(put_no_rnd, [1], 8, mmx);
- SET_HPEL_FUNCS(avg, [1], 8, mmx);
-#endif /* HAVE_MMX_INLINE */
+ if (HAVE_MMX_EXTERNAL) {
+ c->avg_pixels_tab[1][0] = ff_avg_pixels8_mmx;
+ c->avg_pixels_tab[1][1] = ff_avg_pixels8_x2_mmx;
+ }
+#if HAVE_MMX_INLINE
+ c->avg_pixels_tab[1][2] = avg_pixels8_y2_mmx;
+ c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_mmx;
+#endif
}
- static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags)
+ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags)
{
#if HAVE_MMXEXT_EXTERNAL
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext;
@@@ -279,35 -238,22 +279,35 @@@ static void hpeldsp_init_sse2_fast(Hpel
#endif /* HAVE_SSE2_EXTERNAL */
}
- static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags, int cpu_flags)
++static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags)
+{
+#if HAVE_SSSE3_EXTERNAL
+ c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_ssse3;
+ c->avg_pixels_tab[0][3] = ff_avg_pixels16_xy2_ssse3;
+ c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_ssse3;
+ c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_ssse3;
+#endif
+}
+
av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
{
int cpu_flags = av_get_cpu_flags();
if (INLINE_MMX(cpu_flags))
- hpeldsp_init_mmx(c, flags, cpu_flags);
+ hpeldsp_init_mmx(c, flags);
if (EXTERNAL_AMD3DNOW(cpu_flags))
- hpeldsp_init_3dnow(c, flags, cpu_flags);
+ hpeldsp_init_3dnow(c, flags);
if (EXTERNAL_MMXEXT(cpu_flags))
- hpeldsp_init_mmxext(c, flags, cpu_flags);
+ hpeldsp_init_mmxext(c, flags);
if (EXTERNAL_SSE2_FAST(cpu_flags))
- hpeldsp_init_sse2_fast(c, flags, cpu_flags);
+ hpeldsp_init_sse2_fast(c, flags);
+ if (EXTERNAL_SSSE3(cpu_flags))
- hpeldsp_init_ssse3(c, flags, cpu_flags);
++ hpeldsp_init_ssse3(c, flags);
+
if (CONFIG_VP3_DECODER)
ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);
}
More information about the ffmpeg-cvslog
mailing list