[Kwintv] kdeextragear-3/kdetv/plugins

[Dirk Ziegelmeier]

CVS commit by dziegel: 

Full x86-64 support (including all deinterlacers and filters)
CCMAIL: kwintv at kde.org


  M +2 -2      configure.in.in   1.8
  M +3 -3      filter/Makefile.am   1.21
  M +23 -23    filter/greedy/greedy_inc.cpp   1.7


--- kdeextragear-3/kdetv/plugins/configure.in.in  #1.7:1.8
@@ -15,5 +15,5 @@
     [  --with-zvbi-dir=DIR     where the root of libzvbi is installed],
     [  ac_zvbi_includes="$withval"/include
-       ac_zvbi_libraries="$withval"/lib
+       ac_zvbi_libraries="$withval"/lib${kdelibsuff}
     ])
 
@@ -33,5 +33,5 @@
   ac_zvbi_includes="$zvbi_incdir"
 
-  zvbi_libdirs="/usr/lib /usr/local/lib /usr/local/zvbi/lib $prefix/lib $exec_prefix/lib $kde_extra_libs"
+  zvbi_libdirs="/usr/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /usr/local/zvbi/lib${kdelibsuff} $prefix/lib${kdelibsuff} $exec_prefix/lib${kdelibsuff} $kde_extra_libs"
   if test ! "$ac_zvbi_libraries" = "NO"; then
     zvbi_libdirs="$ac_zvbi_libraries $zvbi_libdirs"

--- kdeextragear-3/kdetv/plugins/filter/Makefile.am  #1.20:1.21
@@ -1,6 +1,6 @@
+if ARCH_X86
+FILTER_ARCHSPECIFIC_PLUGINS = greedy greedyh greedy2frame tomsmocomp chromakill mirror sharpness
+else
 FILTER_ARCHSPECIFIC_PLUGINS =
-
-if ARCH_386
-FILTER_ARCHSPECIFIC_PLUGINS += greedy greedyh greedy2frame tomsmocomp chromakill mirror sharpness
 endif
 

--- kdeextragear-3/kdetv/plugins/filter/greedy/greedy_inc.cpp  #1.6:1.7
@@ -36,5 +36,5 @@ void DScalerFilterGreedy::filterDScaler_
 {
     int Line;
-    int LoopCtr;
+    long LoopCtr;
     unsigned char* L1;                  // ptr to Line1, of 3
     unsigned char* L2;                  // ptr to Line2, the weave line
@@ -87,9 +87,9 @@ void DScalerFilterGreedy::filterDScaler_
         __asm__ __volatile__
             (
-             MOVX"    %0,      %%"XAX"\n\t"
-             MOVX"    %1,      %%"XCX"\n\t"
-             MOVX"    %2,      %%"XDX"\n\t"
-             MOVX"    %3,      %%"XSI"\n\t"
-             MOVX"    %4,      %%"XDI"\n\t"  // DL1 if Odd or DL2 if Even
+             MOVX"    %[L1],    %%"XAX"\n\t"
+             MOVX"    %[L2],    %%"XCX"\n\t"
+             MOVX"    %[L3],    %%"XDX"\n\t"
+             MOVX"    %[LP2],   %%"XSI"\n\t"
+             MOVX"    %[Dest],  %%"XDI"\n\t"  // DL1 if Odd or DL2 if Even
 
              ".align 8\n\t"
@@ -108,8 +108,8 @@ void DScalerFilterGreedy::filterDScaler_
              "pavgusb %%mm3,   %%mm4\n\t"
 #else
-             "pand    %7,      %%mm4\n\t"    // "
+             "pand    %[ShiftMask], %%mm4\n\t"    // "
              "psrlw   $1,      %%mm4\n\t"
              "movq    %%mm3,   %%mm5\n\t"    // L3
-             "pand    %7,      %%mm5\n\t"    // "
+             "pand    %[ShiftMask], %%mm5\n\t"    // "
              "psrlw   $1,      %%mm5\n\t"
              "paddb   %%mm5,   %%mm4\n\t"    // the average, for computing comb
@@ -156,6 +156,6 @@ void DScalerFilterGreedy::filterDScaler_
 
              // allow the value to be above the high or below the low by amt of MaxComb
-             "paddusb %5,      %%mm2\n\t"    // increase max by diff
-             "psubusb %5,      %%mm3\n\t"    // lower min by diff
+             "paddusb %[MaxComb], %%mm2\n\t" // increase max by diff
+             "psubusb %[MaxComb], %%mm3\n\t" // lower min by diff
 
              "psubusb %%mm3,   %%mm4\n\t"    // best - Min
@@ -180,18 +180,18 @@ void DScalerFilterGreedy::filterDScaler_
              LEAX"    8(%%"XSI"), %%"XSI"\n\t"
 
-             DECX"    %6\n\t"
+             DECX"    %[LoopCtr]\n\t"
              "jnz     1b\n\t"
 
              : /* no outputs */
 
-             : "m"(L1), // 0
-               "m"(L2), // 1
-               "m"(L3), // 2
-               "m"(LP2), // 3
-               "m"(Dest), // 4
-               "m"(MaxComb), // 5
-               "m"(LoopCtr) // 6
+             : [L1]      "m"(L1),
+               [L2]      "m"(L2),
+               [L3]      "m"(L3),
+               [LP2]     "m"(LP2),
+               [Dest]    "m"(Dest),
+               [MaxComb] "m"(MaxComb),
+               [LoopCtr] "m"(LoopCtr)
 #if defined(IS_MMX)
-               , "m"(ShiftMask) // 7
+               ,[ShiftMask] "m"(ShiftMask)
 #endif