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/vfir.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/vfir.c')
-rw-r--r-- | gst/deinterlace2/tvtime/vfir.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gst/deinterlace2/tvtime/vfir.c b/gst/deinterlace2/tvtime/vfir.c index 53d233e1..3a56f850 100644 --- a/gst/deinterlace2/tvtime/vfir.c +++ b/gst/deinterlace2/tvtime/vfir.c @@ -28,19 +28,13 @@ * See: http://bugzilla.gnome.org/show_bug.cgi?id=163578 */ -#include <stdio.h> -#if defined (__SVR4) && defined (__sun) -# include <sys/int_types.h> -#else -# include <stdint.h> -#endif - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "speedy.h" +#include "_stdint.h" #include "gstdeinterlace2.h" +#include <string.h> /* * The MPEG2 spec uses a slightly harsher filter, they specify @@ -156,11 +150,11 @@ deinterlace_frame_vfir (GstDeinterlace2 * object) if (object->field_history[object->history_count - 2].flags == PICTURE_INTERLACED_BOTTOM) { - blit_packed422_scanline (out_data, cur_field, object->frame_width); + memcpy (out_data, cur_field, object->line_length); out_data += object->output_stride; } - blit_packed422_scanline (out_data, cur_field, object->frame_width); + memcpy (out_data, cur_field, object->line_length); out_data += object->output_stride; line++; @@ -184,14 +178,14 @@ deinterlace_frame_vfir (GstDeinterlace2 * object) cur_field += object->field_stride; last_field += object->field_stride; - blit_packed422_scanline (out_data, cur_field, object->frame_width); + memcpy (out_data, cur_field, object->line_length); out_data += object->output_stride; } if (object->field_history[object->history_count - 2].flags == PICTURE_INTERLACED_TOP) { /* double the last scanline of the top field */ - blit_packed422_scanline (out_data, cur_field, object->frame_width); + memcpy (out_data, cur_field, object->line_length); } } @@ -205,8 +199,6 @@ static deinterlace_method_t vfirmethod = { 0, 0, 1, - 0, - 0, deinterlace_frame_vfir, {"Avoids flicker by blurring consecutive frames", "of input. Use this if you want to run your", |