gst/deinterlace2/: Remove useless file and mark everything possible as static.

Original commit message from CVS:
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/tvtime/tomsmocomp.c: (tomsmocomp_init),
(tomsmocomp_filter_mmx), (tomsmocomp_filter_3dnow),
(tomsmocomp_filter_sse), (deinterlace_frame_di_tomsmocomp):
* gst/deinterlace2/tvtime/tomsmocomp.h:
Remove useless file and mark everything possible as static.
* gst/deinterlace2/tvtime/greedy.c:
* gst/deinterlace2/tvtime/greedyh.c:
Use "_stdint.h" instead of <stdint.h>.
This commit is contained in:
Sebastian Dröge 2008-06-30 07:51:07 +00:00
parent 67088dcea6
commit 8a84f759b4
6 changed files with 59 additions and 54 deletions

View file

@ -1,3 +1,16 @@
2008-06-30 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/tvtime/tomsmocomp.c: (tomsmocomp_init),
(tomsmocomp_filter_mmx), (tomsmocomp_filter_3dnow),
(tomsmocomp_filter_sse), (deinterlace_frame_di_tomsmocomp):
* gst/deinterlace2/tvtime/tomsmocomp.h:
Remove useless file and mark everything possible as static.
* gst/deinterlace2/tvtime/greedy.c:
* gst/deinterlace2/tvtime/greedyh.c:
Use "_stdint.h" instead of <stdint.h>.
2008-06-29 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/deinterlace2/Makefile.am:

View file

@ -22,7 +22,6 @@ noinst_HEADERS = \
tvtime/greedyhmacros.h \
tvtime/plugins.h \
tvtime/x86-64_macros.inc \
tvtime/tomsmocomp.h \
tvtime/tomsmocomp/SearchLoop0A.inc \
tvtime/tomsmocomp/SearchLoopBottom.inc \
tvtime/tomsmocomp/SearchLoopEdgeA8.inc \

View file

@ -30,7 +30,7 @@
# include "config.h"
#endif
#include <_stdint.h>
#include "_stdint.h"
#include "gstdeinterlace2.h"
#include <string.h>

View file

@ -32,7 +32,7 @@
#include "greedyhmacros.h"
#include <stdlib.h>
#include <_stdint.h>
#include "_stdint.h"
#include <string.h>
#include "gst/gst.h"

View file

@ -21,38 +21,34 @@
#endif
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include "_stdint.h"
#include <string.h>
#include "gst/gst.h"
#include "gstdeinterlace2.h"
#include "plugins.h"
#include "tomsmocomp.h"
#include "tomsmocomp/tomsmocompmacros.h"
#include "x86-64_macros.inc"
#define SearchEffortDefault 5
#define UseStrangeBobDefault 0
long SearchEffort;
int UseStrangeBob;
int IsOdd;
const unsigned char *pWeaveSrc;
const unsigned char *pWeaveSrcP;
unsigned char *pWeaveDest;
const unsigned char *pCopySrc;
const unsigned char *pCopySrcP;
unsigned char *pCopyDest;
int src_pitch;
int dst_pitch;
int rowsize;
int height;
int FldHeight;
static long SearchEffort;
static int UseStrangeBob;
static int IsOdd;
static const unsigned char *pWeaveSrc;
static const unsigned char *pWeaveSrcP;
static unsigned char *pWeaveDest;
static const unsigned char *pCopySrc;
static const unsigned char *pCopySrcP;
static unsigned char *pCopyDest;
static int src_pitch;
static int dst_pitch;
static int rowsize;
static int FldHeight;
int
static int
Fieldcopy (void *dest, const void *src, size_t count,
int rows, int dst_pitch, int src_pitch)
{
@ -94,15 +90,42 @@ Fieldcopy (void *dest, const void *src, size_t count,
#undef SSE_TYPE
#undef FUNCT_NAME
void
static void
tomsmocomp_init (void)
{
SearchEffort = SearchEffortDefault;
UseStrangeBob = UseStrangeBobDefault;
}
static void
tomsmocomp_filter_mmx (GstDeinterlace2 * object)
{
tomsmocompDScaler_MMX (object);
}
static void
tomsmocomp_filter_3dnow (GstDeinterlace2 * object)
{
tomsmocompDScaler_3DNOW (object);
}
static void
tomsmocomp_filter_sse (GstDeinterlace2 * object)
{
tomsmocompDScaler_SSE (object);
}
static void
deinterlace_frame_di_tomsmocomp (GstDeinterlace2 * object)
{
if (object->cpu_feature_flags & OIL_IMPL_FLAG_SSE) {
tomsmocomp_filter_sse (object);
} else if (object->cpu_feature_flags & OIL_IMPL_FLAG_3DNOW) {
tomsmocomp_filter_3dnow (object);
} else {
} else if (object->cpu_feature_flags & OIL_IMPL_FLAG_MMX) {
tomsmocomp_filter_mmx (object);
} else {
g_assert_not_reached ();
}
}
@ -135,28 +158,3 @@ dscaler_tomsmocomp_get_method (void)
tomsmocomp_init ();
return &tomsmocompmethod;
}
void
tomsmocomp_init (void)
{
SearchEffort = SearchEffortDefault;
UseStrangeBob = UseStrangeBobDefault;
}
void
tomsmocomp_filter_mmx (GstDeinterlace2 * object)
{
tomsmocompDScaler_MMX (object);
}
void
tomsmocomp_filter_3dnow (GstDeinterlace2 * object)
{
tomsmocompDScaler_3DNOW (object);
}
void
tomsmocomp_filter_sse (GstDeinterlace2 * object)
{
tomsmocompDScaler_SSE (object);
}

View file

@ -49,11 +49,6 @@ int Search_Effort_19_SB();
int Search_Effort_21_SB();
int Search_Effort_Max_SB();
void tomsmocomp_init( void );
void tomsmocomp_filter_mmx( GstDeinterlace2 *object );
void tomsmocomp_filter_3dnow( GstDeinterlace2 *object );
void tomsmocomp_filter_sse( GstDeinterlace2 *object );
#ifdef __cplusplus
};
#endif