diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-06-29 10:56:47 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-06-29 10:56:47 +0000 |
commit | 67088dcea6eda4eeef243940cda2e76acbc2a398 (patch) | |
tree | 5503d9ab1c8567f4f938f8ce37cd036a6cea1d49 /gst/deinterlace2/tvtime/greedyh.c | |
parent | a1b7dde06923100706cbf47480d6d5e59dfb62fe (diff) | |
download | gst-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/greedyh.c')
-rw-r--r-- | gst/deinterlace2/tvtime/greedyh.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gst/deinterlace2/tvtime/greedyh.c b/gst/deinterlace2/tvtime/greedyh.c index 5cda7d53..58ef4f5d 100644 --- a/gst/deinterlace2/tvtime/greedyh.c +++ b/gst/deinterlace2/tvtime/greedyh.c @@ -32,14 +32,12 @@ #include "greedyhmacros.h" #include <stdlib.h> -#include <stdio.h> -#include <stdint.h> +#include <_stdint.h> #include <string.h> #include "gst/gst.h" #include "plugins.h" #include "gstdeinterlace2.h" -#include "speedy.h" static const unsigned int GreedyMaxComb = 5; static const unsigned int GreedyMotionThreshold = 25; @@ -249,7 +247,7 @@ deinterlace_frame_di_greedyh (GstDeinterlace2 * object) GST_BUFFER_DATA (object->field_history[object->history_count - 3].buf); // copy first even line - object->pMemcpy (Dest, L1, object->line_length); + memcpy (Dest, L1, object->line_length); Dest += object->output_stride; } else { InfoIsOdd = 0; @@ -262,18 +260,18 @@ deinterlace_frame_di_greedyh (GstDeinterlace2 * object) Pitch; // copy first even line - object->pMemcpy (Dest, GST_BUFFER_DATA (object->field_history[0].buf), + memcpy (Dest, GST_BUFFER_DATA (object->field_history[0].buf), object->line_length); Dest += object->output_stride; // then first odd line - object->pMemcpy (Dest, L1, object->line_length); + memcpy (Dest, L1, object->line_length); Dest += object->output_stride; } for (Line = 0; Line < (object->field_height - 1); ++Line) { func (L1, L2, L3, L2P, Dest, object->line_length); Dest += object->output_stride; - object->pMemcpy (Dest, L3, object->line_length); + memcpy (Dest, L3, object->line_length); Dest += object->output_stride; L1 += Pitch; @@ -283,7 +281,7 @@ deinterlace_frame_di_greedyh (GstDeinterlace2 * object) } if (InfoIsOdd) { - object->pMemcpy (Dest, L2, object->line_length); + memcpy (Dest, L2, object->line_length); } } @@ -297,8 +295,6 @@ static deinterlace_method_t greedyh_method = { 0, 0, 0, - 0, - 0, deinterlace_frame_di_greedyh, {"Uses heuristics to detect motion in the input", "frames and reconstruct image detail where", |