[MPlayer-cvslog] r37545 - in trunk: configure cpudetect.c libmpcodecs/pullup.c libmpcodecs/vf_ass.c libmpcodecs/vf_decimate.c libmpcodecs/vf_divtc.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_fspp.c libmpcodecs/vf_gr...
rtogni
subversion at mplayerhq.hu
Sat Oct 17 21:44:31 CEST 2015
Author: rtogni
Date: Sat Oct 17 21:44:31 2015
New Revision: 37545
Log:
Add an internal copy of libavutil/x86/asm.h as mpx86asm.h
This permits compiling with system-wide FFmpeg libraries without having to
manually copy the file.
Added:
trunk/mpx86asm.h
Modified:
trunk/configure
trunk/cpudetect.c
trunk/libmpcodecs/pullup.c
trunk/libmpcodecs/vf_ass.c
trunk/libmpcodecs/vf_decimate.c
trunk/libmpcodecs/vf_divtc.c
trunk/libmpcodecs/vf_filmdint.c
trunk/libmpcodecs/vf_fspp.c
trunk/libmpcodecs/vf_gradfun.c
trunk/libmpcodecs/vf_ilpack.c
trunk/libmpcodecs/vf_ivtc.c
trunk/libmpcodecs/vf_noise.c
trunk/libmpcodecs/vf_tfields.c
trunk/libmpcodecs/vf_yadif.c
trunk/libvo/aclib_template.c
Modified: trunk/configure
==============================================================================
--- trunk/configure Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/configure Sat Oct 17 21:44:31 2015 (r37545)
@@ -7128,7 +7128,6 @@ fi
if test "$ffmpeg" = yes; then
test -e config.h || touch config.h
- header_check libavutil/x86/asm.h || die "libavutil/x86/asm.h header is required for shared FFmpeg"
def_ffmpeg='#define CONFIG_FFMPEG 1'
if test "$ffmpeg_a" = yes ; then
codecmodules="ffmpeg(internal) $codecmodules"
@@ -9359,6 +9358,9 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH"
############################################################################
+# Create FFmpeg config files only for internal ffmpeg
+if test "$ffmpeg_a" = yes; then
+
# Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF
/* Generated by mpconfigure */
@@ -9403,6 +9405,8 @@ cat > ffmpeg/config.h << EOF
EOF
touch ffmpeg/.config
+fi
+
#############################################################################
cat << EOF
Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/cpudetect.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "config.h"
#include "cpudetect.h"
#include "mp_msg.h"
Modified: trunk/libmpcodecs/pullup.c
==============================================================================
--- trunk/libmpcodecs/pullup.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/pullup.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "config.h"
#include "pullup.h"
Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_ass.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -46,7 +46,7 @@
#include "sub/eosd.h"
#include "cpudetect.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#define _r(c) ((c)>>24)
#define _g(c) (((c)>>16)&0xFF)
Modified: trunk/libmpcodecs/vf_decimate.c
==============================================================================
--- trunk/libmpcodecs/vf_decimate.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_decimate.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
Modified: trunk/libmpcodecs/vf_divtc.c
==============================================================================
--- trunk/libmpcodecs/vf_divtc.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_divtc.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -26,7 +26,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
#include "libavutil/common.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "mpbswap.h"
#include "img_format.h"
Modified: trunk/libmpcodecs/vf_filmdint.c
==============================================================================
--- trunk/libmpcodecs/vf_filmdint.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_filmdint.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -30,7 +30,7 @@
#include "vd.h"
#include "vf.h"
#include "cmmx.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
#define NUM_STORED 4
Modified: trunk/libmpcodecs/vf_fspp.c
==============================================================================
--- trunk/libmpcodecs/vf_fspp.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_fspp.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -51,7 +51,7 @@
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libavcodec/avcodec.h"
#undef free
Modified: trunk/libmpcodecs/vf_gradfun.c
==============================================================================
--- trunk/libmpcodecs/vf_gradfun.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_gradfun.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -41,7 +41,7 @@
#include "libavutil/avutil.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
struct vf_priv_s {
int thresh;
Modified: trunk/libmpcodecs/vf_ilpack.c
==============================================================================
--- trunk/libmpcodecs/vf_ilpack.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_ilpack.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -29,7 +29,7 @@
#include "mp_image.h"
#include "vf.h"
#include "libavutil/attributes.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
unsigned char *u, unsigned char *v, int w, int us, int vs);
Modified: trunk/libmpcodecs/vf_ivtc.c
==============================================================================
--- trunk/libmpcodecs/vf_ivtc.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_ivtc.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
Modified: trunk/libmpcodecs/vf_noise.c
==============================================================================
--- trunk/libmpcodecs/vf_noise.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_noise.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -37,7 +37,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#define MAX_NOISE 4096
#define MAX_SHIFT 1024
Modified: trunk/libmpcodecs/vf_tfields.c
==============================================================================
--- trunk/libmpcodecs/vf_tfields.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_tfields.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libmpdemux/demuxer.h"
#include "libvo/fastmemcpy.h"
Modified: trunk/libmpcodecs/vf_yadif.c
==============================================================================
--- trunk/libmpcodecs/vf_yadif.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libmpcodecs/vf_yadif.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -34,7 +34,7 @@
#include "libmpdemux/demuxer.h"
#include "libvo/fastmemcpy.h"
#include "libavutil/common.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
//===========================================================================//
Modified: trunk/libvo/aclib_template.c
==============================================================================
--- trunk/libvo/aclib_template.c Sun Oct 11 22:33:24 2015 (r37544)
+++ trunk/libvo/aclib_template.c Sat Oct 17 21:44:31 2015 (r37545)
@@ -80,7 +80,7 @@ If you have questions please contact wit
// 3dnow memcpy support from kernel 2.4.2
// by Pontscho/fresh!mindworkz
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#undef HAVE_ONLY_MMX1
#if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE
Added: trunk/mpx86asm.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mpx86asm.h Sat Oct 17 21:44:31 2015 (r37545)
@@ -0,0 +1,162 @@
+/*
+ * This file is copied from FFmpeg.
+ * Source is libavutil/x86/asm.h from 21/08/2015
+ *
+ * MPlayer changes:
+ * - Prefix multiple inclusion protection with MP_
+ */
+
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef MP_AVUTIL_X86_ASM_H
+#define MP_AVUTIL_X86_ASM_H
+
+#include <stdint.h>
+#include "config.h"
+
+typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
+typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg;
+
+#if ARCH_X86_64
+# define OPSIZE "q"
+# define REG_a "rax"
+# define REG_b "rbx"
+# define REG_c "rcx"
+# define REG_d "rdx"
+# define REG_D "rdi"
+# define REG_S "rsi"
+# define PTR_SIZE "8"
+typedef int64_t x86_reg;
+
+/* REG_SP is defined in Solaris sys headers, so use REG_sp */
+# define REG_sp "rsp"
+# define REG_BP "rbp"
+# define REGBP rbp
+# define REGa rax
+# define REGb rbx
+# define REGc rcx
+# define REGd rdx
+# define REGSP rsp
+
+#elif ARCH_X86_32
+
+# define OPSIZE "l"
+# define REG_a "eax"
+# define REG_b "ebx"
+# define REG_c "ecx"
+# define REG_d "edx"
+# define REG_D "edi"
+# define REG_S "esi"
+# define PTR_SIZE "4"
+typedef int32_t x86_reg;
+
+# define REG_sp "esp"
+# define REG_BP "ebp"
+# define REGBP ebp
+# define REGa eax
+# define REGb ebx
+# define REGc ecx
+# define REGd edx
+# define REGSP esp
+#else
+typedef int x86_reg;
+#endif
+
+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
+#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+
+#if ARCH_X86_64 && defined(PIC)
+# define BROKEN_RELOCATIONS 1
+#endif
+
+/*
+ * If gcc is not set to support sse (-msse) it will not accept xmm registers
+ * in the clobber list for inline asm. XMM_CLOBBERS takes a list of xmm
+ * registers to be marked as clobbered and evaluates to nothing if they are
+ * not supported, or to the list itself if they are supported. Since a clobber
+ * list may not be empty, XMM_CLOBBERS_ONLY should be used if the xmm
+ * registers are the only in the clobber list.
+ * For example a list with "eax" and "xmm0" as clobbers should become:
+ * : XMM_CLOBBERS("xmm0",) "eax"
+ * and a list with only "xmm0" should become:
+ * XMM_CLOBBERS_ONLY("xmm0")
+ */
+#if HAVE_XMM_CLOBBERS
+# define XMM_CLOBBERS(...) __VA_ARGS__
+# define XMM_CLOBBERS_ONLY(...) : __VA_ARGS__
+#else
+# define XMM_CLOBBERS(...)
+# define XMM_CLOBBERS_ONLY(...)
+#endif
+
+/* Use to export labels from asm. */
+#define LABEL_MANGLE(a) EXTERN_PREFIX #a
+
+// Use rip-relative addressing if compiling PIC code on x86-64.
+#if ARCH_X86_64 && defined(PIC)
+# define LOCAL_MANGLE(a) #a "(%%rip)"
+#else
+# define LOCAL_MANGLE(a) #a
+#endif
+
+#if HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS
+# define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a)
+# define NAMED_CONSTRAINTS_ADD(...)
+# define NAMED_CONSTRAINTS(...)
+# define NAMED_CONSTRAINTS_ARRAY_ADD(...)
+# define NAMED_CONSTRAINTS_ARRAY(...)
+#else
+ /* When direct symbol references are used in code passed to a compiler that does not support them
+ * then these references need to be converted to named asm constraints instead.
+ * Instead of returning a direct symbol MANGLE now returns a named constraint for that specific symbol.
+ * In order for this to work there must also be a corresponding entry in the asm-interface. To add this
+ * entry use the macro NAMED_CONSTRAINTS() and pass in a list of each symbol reference used in the
+ * corresponding block of code. (e.g. NAMED_CONSTRAINTS(var1,var2,var3) where var1 is the first symbol etc. ).
+ * If there are already existing constraints then use NAMED_CONSTRAINTS_ADD to add to the existing constraint list.
+ */
+# define MANGLE(a) "%["#a"]"
+ // Intel/MSVC does not correctly expand va-args so we need a rather ugly hack in order to get it to work
+# define FE_0(P,X) P(X)
+# define FE_1(P,X,X1) P(X), FE_0(P,X1)
+# define FE_2(P,X,X1,X2) P(X), FE_1(P,X1,X2)
+# define FE_3(P,X,X1,X2,X3) P(X), FE_2(P,X1,X2,X3)
+# define FE_4(P,X,X1,X2,X3,X4) P(X), FE_3(P,X1,X2,X3,X4)
+# define FE_5(P,X,X1,X2,X3,X4,X5) P(X), FE_4(P,X1,X2,X3,X4,X5)
+# define FE_6(P,X,X1,X2,X3,X4,X5,X6) P(X), FE_5(P,X1,X2,X3,X4,X5,X6)
+# define FE_7(P,X,X1,X2,X3,X4,X5,X6,X7) P(X), FE_6(P,X1,X2,X3,X4,X5,X6,X7)
+# define FE_8(P,X,X1,X2,X3,X4,X5,X6,X7,X8) P(X), FE_7(P,X1,X2,X3,X4,X5,X6,X7,X8)
+# define FE_9(P,X,X1,X2,X3,X4,X5,X6,X7,X8,X9) P(X), FE_8(P,X1,X2,X3,X4,X5,X6,X7,X8,X9)
+# define GET_FE_IMPL(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,NAME,...) NAME
+# define GET_FE(A) GET_FE_IMPL A
+# define GET_FE_GLUE(x, y) x y
+# define FOR_EACH_VA(P,...) GET_FE_GLUE(GET_FE((__VA_ARGS__,FE_9,FE_8,FE_7,FE_6,FE_5,FE_4,FE_3,FE_2,FE_1,FE_0)), (P,__VA_ARGS__))
+# define NAME_CONSTRAINT(x) [x] "m"(x)
+ // Parameters are a list of each symbol reference required
+# define NAMED_CONSTRAINTS_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__)
+ // Same but without comma for when there are no previously defined constraints
+# define NAMED_CONSTRAINTS(...) FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__)
+ // Same as above NAMED_CONSTRAINTS except used for passing arrays/pointers instead of normal variables
+# define NAME_CONSTRAINT_ARRAY(x) [x] "m"(*x)
+# define NAMED_CONSTRAINTS_ARRAY_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__)
+# define NAMED_CONSTRAINTS_ARRAY(...) FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__)
+#endif
+
+#endif /* AVUTIL_X86_ASM_H */
More information about the MPlayer-cvslog
mailing list