Changeset b1e5f35c24a1c9e85d21c4412d27274bd557a346

Timestamp:

03/21/08 17:13:43 (6 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1206116023 +0100

git-parent:

[38f79bff37d907dd2765f8e94f2162bcea2cf7e7]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1206115784 +0100

Message:

synced patch with current FFmpeg svn

Files:

• extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch (modified) (14 diffs)

extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch

@@ -41 +41 @@
-Index: libavcodec/i386/dsputil_mmx.c
-===================================================================
-1879
+2547
-+++ libavcodec/i386/dsputil_mmx.c   (working copy)
-1927,7 +1927
+860,7 +860
- 
- #define QPEL_V_LOW(m3,m4,m5,m6, pw_20, pw_3, rnd, in0, in1, in2, in7, out, OP)\
@@ -52 +52 @@
-         "movq "#in7", " #m3 "             \n\t" /* d */\
-         "movq "#in0", %%mm5               \n\t" /* D */\
-1939,7 +1939
+872,7 +872
-         "paddw " #m5 ", %%mm6             \n\t" /* x2 */\
-         "paddw %%mm6, %%mm6               \n\t" /* 2x2 */\
@@ -61 +61 @@
-         "paddw %%mm4, %%mm5               \n\t" /* 20x1 - 6x2 + 3x3 - x4 */\
-         "psraw $5, %%mm5                  \n\t"\
-1973,10 +1973
+906,10 +906
-         "paddw %%mm5, %%mm5               \n\t" /* 2b */\
-         "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
@@ -74 +74 @@
-         "paddw %6, %%mm6                  \n\t"\
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-1999,10 +1999
+932,10 +932
-         "psrlq $24, %%mm6                 \n\t" /* IJKLM000 */\
-         "punpcklbw %%mm7, %%mm2           \n\t" /* 0F0G0H0I */\
@@ -87 +87 @@
-         "paddw %6, %%mm1                  \n\t"\
-         "paddw %%mm1, %%mm3               \n\t" /* 20a - 6b +3c - d */\
-2025,7 +2025
+958,7 +958
-         "psubw %%mm5, %%mm0               \n\t" /* c - 2b */\
-         "movq %%mm3, %%mm5                \n\t" /* JKLMNOPQ */\
@@ -96 +96 @@
-         "paddw %%mm3, %%mm2               \n\t" /* d */\
-         "psubw %%mm2, %%mm0               \n\t" /* -6b + 3c - d */\
-2033,7 +2033
+966,7 +966
-         "punpcklbw %%mm7, %%mm2           \n\t" /* 0J0K0L0M */\
-         "punpckhbw %%mm7, %%mm5           \n\t" /* 0N0O0P0Q */\
@@ -105 +105 @@
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-         "psraw $5, %%mm0                  \n\t"\
-2048,8 +2048
+981,8 +981
-         "paddw %%mm2, %%mm5               \n\t" /* d */\
-         "paddw %%mm6, %%mm6               \n\t" /* 2b */\
@@ -116 +116 @@
-         "paddw %6, %%mm4                  \n\t"\
-         "paddw %%mm3, %%mm4               \n\t" /* 20a - 6b + 3c - d */\
-2062,7 +2062
+995,7 +995
-         "decl %2                          \n\t"\
-         " jnz 1b                          \n\t"\
-g
+D
--        : "d"((long)srcStride), "S"((long)dstStride), /*"m"(ff_pw_20), "m"(ff_pw_3),*/ "m"(temp), "m"(ROUNDER)\
-
-
-
+ 
+ 
+ 
-         : "memory"\
-     );\
- }\
-2140,10 +2142
+1071,10 +1073
-         "paddw %%mm5, %%mm5               \n\t" /* 2b */\
-         "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
@@ -138 +138 @@
-+        "pmullw %7, %%mm0 \n\t" /* 20a */\
-         "psubw %%mm5, %%mm0               \n\t" /* 20a - d */\
-6
+5
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-2161,8 +2163
+1092,8 +1094
-         "paddw %%mm5, %%mm4               \n\t" /* d */\
-         "paddw %%mm2, %%mm2               \n\t" /* 2b */\
@@ -149 +149 @@
-+        "pmullw %8, %%mm3  \n\t" /* 3c - 6b */\
-         "psubw %%mm4, %%mm3               \n\t" /* -6b + 3c - d */\
-6
+5
-         "paddw %%mm1, %%mm3               \n\t" /* 20a - 6b + 3c - d */\
-2175,7 +2177
+1106,7 +1108
-         "decl %2                          \n\t"\
-         " jnz 1b                          \n\t"\
-g
-temp), "m"(
+d
+
-+        : "S"((long)srcStride), "D"((long)dstStride),\
-+          "m"(temp), "m"(ROUNDER),\
@@ -162 +162 @@
-     );\
- }\
-2254,31 +2258
+1185,31 +1189
-         "movq 8(%0), %%mm1              \n\t"\
-         "movq 16(%0), %%mm2             \n\t"\
@@ -210 +210 @@
-         "add $136, %0                   \n\t"\
-         "add %6, %1                     \n\t"\
-2286,7 +2290
+1217,7 +1221
-         " jnz 1b                        \n\t"\
-         \
@@ -221 +221 @@
-     );\
- }\
-2326,19 +2332
+1257,19 +1263
-         "movq 8(%0), %%mm1              \n\t"\
-         "movq 16(%0), %%mm2             \n\t"\
@@ -249 +249 @@
-         "add $72, %0                    \n\t"\
-         "add %6, %1                     \n\t"\
-2346,7 +2352
+1277,7 +1283
-         " jnz 1b                        \n\t"\
-          \