78 lines
3.5 KiB
Diff
78 lines
3.5 KiB
Diff
|
fix compilation failure with MMX
|
||
|
|
|
||
|
|
Fixes
|
||
|
|
libmpcodecs/vf_fspp.c: In function 'column_fidct_c':
|
||
|
|
libmpcodecs/vf_fspp.c:750:5: error: unknown type name 'int_simd16_t'
|
||
|
|
libmpcodecs/vf_fspp.c:751:5: error: unknown type name 'int_simd16_t'
|
||
|
|
libmpcodecs/vf_fspp.c:752:5: error: unknown type name 'int_simd16_t'
|
||
|
|
libmpcodecs/vf_fspp.c:753:5: error: unknown type name 'int_simd16_t'
|
||
|
|
libmpcodecs/vf_fspp.c:789:18: error: 'FIX_0_707106781' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:789:18: note: each undeclared identifier is reported only once for each function it appears in
|
||
|
|
libmpcodecs/vf_fspp.c:804:21: error: 'FIX_1_414213562_A' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:817:18: error: 'FIX_0_382683433' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:818:18: error: 'FIX_0_541196100' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:819:18: error: 'FIX_1_306562965' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:844:21: error: 'FIX_1_414213562' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:845:21: error: 'FIX_1_847759065' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:846:21: error: 'FIX_1_082392200' undeclared (first use in this function)
|
||
|
|
libmpcodecs/vf_fspp.c:847:21: error: 'FIX_2_613125930' undeclared (first use in this function)
|
||
|
|
|
||
|
|
found using this defconfig after fixing the original bug:
|
||
|
|
http://autobuild.buildroot.net/results/642/6422adeef19ec547c7bc3f8ad3b0d51702015240/
|
||
|
|
|
||
|
|
Downloaded from upstream mailinglist:
|
||
|
|
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073488.html
|
||
|
|
|
||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
|
|
|
||
|
|
diff -uNr MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c MPlayer-1.3.0/libmpcodecs/vf_fspp.c
|
||
|
|
--- MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c 2015-10-17 21:44:31.000000000 +0200
|
||
|
|
+++ MPlayer-1.3.0/libmpcodecs/vf_fspp.c 2017-04-10 21:26:57.771819064 +0200
|
||
|
|
@@ -173,7 +173,6 @@
|
||
|
|
#define store_slice_s store_slice_c
|
||
|
|
#define store_slice2_s store_slice2_c
|
||
|
|
#define mul_thrmat_s mul_thrmat_c
|
||
|
|
-#define column_fidct_s column_fidct_c
|
||
|
|
#define row_idct_s row_idct_c
|
||
|
|
#define row_fdct_s row_fdct_c
|
||
|
|
|
||
|
|
@@ -393,7 +392,6 @@
|
||
|
|
);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt);
|
||
|
|
static void row_idct_mmx(int16_t* workspace,
|
||
|
|
int16_t* output_adr, int output_stride, int cnt);
|
||
|
|
static void row_fdct_mmx(int16_t *data, const uint8_t *pixels, int line_size, int cnt);
|
||
|
|
@@ -401,11 +399,18 @@
|
||
|
|
#define store_slice_s store_slice_mmx
|
||
|
|
#define store_slice2_s store_slice2_mmx
|
||
|
|
#define mul_thrmat_s mul_thrmat_mmx
|
||
|
|
-#define column_fidct_s column_fidct_mmx
|
||
|
|
#define row_idct_s row_idct_mmx
|
||
|
|
#define row_fdct_s row_fdct_mmx
|
||
|
|
#endif // HAVE_MMX_INLINE
|
||
|
|
|
||
|
|
+#if !HAVE_MMXEXT_INLINE
|
||
|
|
+static void column_fidct_c(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt);
|
||
|
|
+#define column_fidct_s column_fidct_c
|
||
|
|
+#else
|
||
|
|
+static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt);
|
||
|
|
+#define column_fidct_s column_fidct_mmx
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src,
|
||
|
|
int dst_stride, int src_stride,
|
||
|
|
int width, int height,
|
||
|
|
@@ -728,7 +733,9 @@
|
||
|
|
DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4);
|
||
|
|
DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2);
|
||
|
|
|
||
|
|
-#else /* !HAVE_MMXEXT_INLINE */
|
||
|
|
+#endif /* !HAVE_MMX_INLINE */
|
||
|
|
+
|
||
|
|
+#if !HAVE_MMX_INLINE || !HAVE_MMXEXT_INLINE
|
||
|
|
|
||
|
|
typedef int32_t int_simd16_t;
|
||
|
|
static const int16_t FIX_0_382683433=FIX(0.382683433, 14);
|