diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-02-23 01:51:37 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2008-02-23 01:51:37 +0000 |
| commit | a7bc7485b1a4d7e1b1a12ff593ca4ccb1d59e466 (patch) | |
| tree | ffba99ad38c7616d089c5e728c75a6bd5f736c6c /gst/goom/gstgoom.c | |
| parent | 7f0745bb7f26c69766bb0c64458c6543588cc4dc (diff) | |
configure.ac: Add checks for Flex/Yacc/Bison and other furry animals, for the new goom 2k4 based plugin
Original commit message from CVS:
2008-02-23 Bastien Nocera <hadess@hadess.net>
* configure.ac: Add checks for Flex/Yacc/Bison and other
furry animals, for the new goom 2k4 based plugin
* gst/goom/*: Update to use goom 2k4, uses liboil to detect
CPU optimisations (not working yet), move the old plugin to...
* gst/goom2k1/*: ... here, in case somebody is sick enough
Fixes #515073
Diffstat (limited to 'gst/goom/gstgoom.c')
| -rw-r--r-- | gst/goom/gstgoom.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index ca9b3111..7ba6654a 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -44,7 +44,7 @@ #include <gst/gst.h> #include "gstgoom.h" #include <gst/video/video.h> -#include "goom_core.h" +#include "goom.h" GST_DEBUG_CATEGORY_STATIC (goom_debug); #define GST_CAT_DEFAULT goom_debug @@ -187,7 +187,7 @@ gst_goom_init (GstGoom * goom) goom->rate = 0; goom->duration = 0; - goom_init (&(goom->goomdata), goom->width, goom->height); + goom->plugin = goom_init (goom->width, goom->height); } static void @@ -195,7 +195,7 @@ gst_goom_finalize (GObject * object) { GstGoom *goom = GST_GOOM (object); - goom_close (&(goom->goomdata)); + goom_close (goom->plugin); g_object_unref (goom->adapter); @@ -250,7 +250,7 @@ gst_goom_src_setcaps (GstPad * pad, GstCaps * caps) &goom->fps_d)) return FALSE; - goom_set_resolution (&(goom->goomdata), goom->width, goom->height); + goom_set_resolution (goom->plugin, goom->width, goom->height); /* size of the output buffer in bytes, depth is always 4 bytes */ goom->outsize = goom->width * goom->height * 4; @@ -523,7 +523,8 @@ gst_goom_chain (GstPad * pad, GstBuffer * buffer) GST_BUFFER_DURATION (outbuf) = goom->duration; GST_BUFFER_SIZE (outbuf) = goom->outsize; - out_frame = (guchar *) goom_update (&(goom->goomdata), goom->datain); + out_frame = (guchar *) goom_update (goom->plugin, goom->datain, 0, 0, + NULL, NULL); memcpy (GST_BUFFER_DATA (outbuf), out_frame, goom->outsize); GST_DEBUG ("Pushing frame with time=%" GST_TIME_FORMAT ", duration=%" |