summaryrefslogtreecommitdiffstats
path: root/gst/deinterlace2/tvtime/tomsmocomp.c
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-06-29 10:56:47 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-06-29 10:56:47 +0000
commit67088dcea6eda4eeef243940cda2e76acbc2a398 (patch)
tree5503d9ab1c8567f4f938f8ce37cd036a6cea1d49 /gst/deinterlace2/tvtime/tomsmocomp.c
parenta1b7dde06923100706cbf47480d6d5e59dfb62fe (diff)
downloadgst-plugins-bad-67088dcea6eda4eeef243940cda2e76acbc2a398.tar.gz
gst-plugins-bad-67088dcea6eda4eeef243940cda2e76acbc2a398.tar.bz2
gst-plugins-bad-67088dcea6eda4eeef243940cda2e76acbc2a398.zip
gst/deinterlace2/: Get rid of speedy.[ch] as we don't use most of it's code anyway and it doesn't seem to be relicens...
Original commit message from CVS: * gst/deinterlace2/Makefile.am: * gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_init): * gst/deinterlace2/tvtime/greedy.c: (deinterlace_frame_di_greedy): * gst/deinterlace2/tvtime/greedyh.c: (deinterlace_frame_di_greedyh): * gst/deinterlace2/tvtime/speedtools.h: * gst/deinterlace2/tvtime/speedy.c: * gst/deinterlace2/tvtime/speedy.h: * gst/deinterlace2/tvtime/tomsmocomp.c: (Fieldcopy): * gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc: * gst/deinterlace2/tvtime/vfir.c: (deinterlace_frame_vfir): Get rid of speedy.[ch] as we don't use most of it's code anyway and it doesn't seem to be relicensed to LGPL. Use memcpy() instead of the speedy memcpy everywhere instead. * gst/deinterlace2/gstdeinterlace2.h: Remove many unused declarations.
Diffstat (limited to 'gst/deinterlace2/tvtime/tomsmocomp.c')
-rw-r--r--gst/deinterlace2/tvtime/tomsmocomp.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/gst/deinterlace2/tvtime/tomsmocomp.c b/gst/deinterlace2/tvtime/tomsmocomp.c
index f0b73677..dfadf457 100644
--- a/gst/deinterlace2/tvtime/tomsmocomp.c
+++ b/gst/deinterlace2/tvtime/tomsmocomp.c
@@ -28,7 +28,6 @@
#include "gst/gst.h"
#include "gstdeinterlace2.h"
#include "plugins.h"
-#include "speedy.h"
#include "tomsmocomp.h"
#include "tomsmocomp/tomsmocompmacros.h"
@@ -39,33 +38,18 @@
#define UseStrangeBobDefault 0
long SearchEffort;
-
int UseStrangeBob;
-
-MEMCPY_FUNC *pMyMemcpy;
-
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;
int
@@ -73,13 +57,12 @@ Fieldcopy (void *dest, const void *src, size_t count,
int rows, int dst_pitch, int src_pitch)
{
unsigned char *pDest = (unsigned char *) dest;
-
unsigned char *pSrc = (unsigned char *) src;
int i;
for (i = 0; i < rows; i++) {
- pMyMemcpy (pDest, pSrc, count);
+ memcpy (pDest, pSrc, count);
pSrc += src_pitch;
pDest += dst_pitch;
}
@@ -111,8 +94,6 @@ Fieldcopy (void *dest, const void *src, size_t count,
#undef SSE_TYPE
#undef FUNCT_NAME
-
-
void
deinterlace_frame_di_tomsmocomp (GstDeinterlace2 * object)
{
@@ -135,8 +116,6 @@ static deinterlace_method_t tomsmocompmethod = {
0,
0,
0,
- 0,
- 0,
deinterlace_frame_di_tomsmocomp,
{"Uses heuristics to detect motion in the input",
"frames and reconstruct image detail where",
@@ -150,8 +129,6 @@ static deinterlace_method_t tomsmocompmethod = {
""}
};
-
-
deinterlace_method_t *
dscaler_tomsmocomp_get_method (void)
{
@@ -159,8 +136,6 @@ dscaler_tomsmocomp_get_method (void)
return &tomsmocompmethod;
}
-
-
void
tomsmocomp_init (void)
{