summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/post/deinterlace/deinterlace.h6
-rw-r--r--src/post/deinterlace/plugins/double.c6
-rw-r--r--src/post/deinterlace/plugins/greedy.c6
-rw-r--r--src/post/deinterlace/plugins/greedy2frame.c6
-rw-r--r--src/post/deinterlace/plugins/linear.c6
-rw-r--r--src/post/deinterlace/plugins/linearblend.c6
-rw-r--r--src/post/deinterlace/plugins/vfir.c49
-rw-r--r--src/post/deinterlace/plugins/weave.c6
-rw-r--r--src/post/deinterlace/pulldown.h6
-rw-r--r--src/post/deinterlace/speedy.c8
-rw-r--r--src/post/deinterlace/speedy.h6
-rw-r--r--src/post/deinterlace/tvtime.c6
-rw-r--r--src/xine-utils/xineutils.h6
13 files changed, 85 insertions, 38 deletions
diff --git a/src/post/deinterlace/deinterlace.h b/src/post/deinterlace/deinterlace.h
index 141500c21..08f07cce8 100644
--- a/src/post/deinterlace/deinterlace.h
+++ b/src/post/deinterlace/deinterlace.h
@@ -19,7 +19,11 @@
#ifndef DEINTERLACE_H_INCLUDED
#define DEINTERLACE_H_INCLUDED
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/src/post/deinterlace/plugins/double.c b/src/post/deinterlace/plugins/double.c
index f39e1ddfc..44ab0d492 100644
--- a/src/post/deinterlace/plugins/double.c
+++ b/src/post/deinterlace/plugins/double.c
@@ -19,7 +19,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#include "speedy.h"
#include "deinterlace.h"
diff --git a/src/post/deinterlace/plugins/greedy.c b/src/post/deinterlace/plugins/greedy.c
index fb7eb454c..1384bd0cd 100644
--- a/src/post/deinterlace/plugins/greedy.c
+++ b/src/post/deinterlace/plugins/greedy.c
@@ -20,7 +20,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c
index 00c9b34cb..75e8198f3 100644
--- a/src/post/deinterlace/plugins/greedy2frame.c
+++ b/src/post/deinterlace/plugins/greedy2frame.c
@@ -20,7 +20,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/src/post/deinterlace/plugins/linear.c b/src/post/deinterlace/plugins/linear.c
index 1e84fb722..97f286f86 100644
--- a/src/post/deinterlace/plugins/linear.c
+++ b/src/post/deinterlace/plugins/linear.c
@@ -17,7 +17,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#include "speedy.h"
#include "deinterlace.h"
diff --git a/src/post/deinterlace/plugins/linearblend.c b/src/post/deinterlace/plugins/linearblend.c
index 1da84c24b..fa32d1408 100644
--- a/src/post/deinterlace/plugins/linearblend.c
+++ b/src/post/deinterlace/plugins/linearblend.c
@@ -22,7 +22,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/src/post/deinterlace/plugins/vfir.c b/src/post/deinterlace/plugins/vfir.c
index f60bbecd8..c57960f05 100644
--- a/src/post/deinterlace/plugins/vfir.c
+++ b/src/post/deinterlace/plugins/vfir.c
@@ -22,7 +22,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -44,26 +48,7 @@ static void deinterlace_line( uint8_t *dst, uint8_t *lum_m4,
uint8_t *lum_m3, uint8_t *lum_m2,
uint8_t *lum_m1, uint8_t *lum, int size )
{
- /**
- * C implementation.
- int sum;
-
- for(;size > 0;size--) {
- sum = -lum_m4[0];
- sum += lum_m3[0] << 2;
- sum += lum_m2[0] << 1;
- sum += lum_m1[0] << 2;
- sum += -lum[0];
- dst[0] = (sum + 4) >> 3; // This needs to be clipped at 0 and 255: cm[(sum + 4) >> 3];
- lum_m4++;
- lum_m3++;
- lum_m2++;
- lum_m1++;
- lum++;
- dst++;
- }
- */
-
+#ifdef ARCH_X86
mmx_t rounder;
rounder.uw[0]=4;
@@ -102,6 +87,24 @@ static void deinterlace_line( uint8_t *dst, uint8_t *lum_m4,
dst+=4;
}
emms();
+#else
+ int sum;
+
+ for(;size > 0;size--) {
+ sum = -lum_m4[0];
+ sum += lum_m3[0] << 2;
+ sum += lum_m2[0] << 1;
+ sum += lum_m1[0] << 2;
+ sum += -lum[0];
+ dst[0] = (sum + 4) >> 3; // This needs to be clipped at 0 and 255: cm[(sum + 4) >> 3];
+ lum_m4++;
+ lum_m3++;
+ lum_m2++;
+ lum_m1++;
+ lum++;
+ dst++;
+ }
+#endif
}
@@ -140,7 +143,11 @@ static deinterlace_method_t vfirmethod =
"ffmpeg: Vertical Blend",
"Vertical",
1,
+#ifdef ARCH_X86
MM_ACCEL_X86_MMXEXT,
+#else
+ 0,
+#endif
0,
0,
0,
diff --git a/src/post/deinterlace/plugins/weave.c b/src/post/deinterlace/plugins/weave.c
index 3a9546aa8..287357526 100644
--- a/src/post/deinterlace/plugins/weave.c
+++ b/src/post/deinterlace/plugins/weave.c
@@ -19,7 +19,11 @@
*/
#include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#include "speedy.h"
#include "deinterlace.h"
diff --git a/src/post/deinterlace/pulldown.h b/src/post/deinterlace/pulldown.h
index 197ec84be..bcf17ced9 100644
--- a/src/post/deinterlace/pulldown.h
+++ b/src/post/deinterlace/pulldown.h
@@ -19,7 +19,11 @@
#ifndef PULLDOWN_H_INCLUDED
#define PULLDOWN_H_INCLUDED
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#include "speedy.h"
#ifdef __cplusplus
diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c
index b06e4bc88..2a1e7f673 100644
--- a/src/post/deinterlace/speedy.c
+++ b/src/post/deinterlace/speedy.c
@@ -32,9 +32,13 @@
#include <stdio.h>
#include <string.h>
#include <sys/time.h>
-#include <stdint.h>
-#include <unistd.h>
#include <ctype.h>
+#include <unistd.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/src/post/deinterlace/speedy.h b/src/post/deinterlace/speedy.h
index 6c40abc8c..341f85494 100644
--- a/src/post/deinterlace/speedy.h
+++ b/src/post/deinterlace/speedy.h
@@ -19,7 +19,11 @@
#ifndef SPEEDY_H_INCLUDED
#define SPEEDY_H_INCLUDED
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/src/post/deinterlace/tvtime.c b/src/post/deinterlace/tvtime.c
index 2fe23e559..fd749e24d 100644
--- a/src/post/deinterlace/tvtime.c
+++ b/src/post/deinterlace/tvtime.c
@@ -21,8 +21,12 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
-#include <stdint.h>
#include <math.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
#include "speedy.h"
#include "deinterlace.h"
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 5ef3c3e08..337c12a8e 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xineutils.h,v 1.52 2003/06/03 03:33:16 miguelfreitas Exp $
+ * $Id: xineutils.h,v 1.53 2003/06/13 23:05:35 komadori Exp $
*
*/
#ifndef XINEUTILS_H
@@ -55,10 +55,6 @@ extern "C" {
#include <stdio.h>
#include <string.h>
-#if defined(__SUNPRO_C) || !defined(XINE_COMPILE)
-#define inline
-#endif
-
/*
* debugable mutexes
*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 10:08:05 +0000