Menu
▾
▴
[gst-cvs] zeenix gst-plugins: gst-plugins/ext/libcaca/
|
From: Zeeshan A. <ze...@pd...> - 2004-01-11 22:15:55
|
CVS Root: /home/cvs/gstreamer
Module: gst-plugins
Changes by: zeenix
Date: Sun Jan 11 2004 14:17:01 PST
Log message:
It should work now, but it does'nt (All i see is a black-window) :(
Modified files:
ext/libcaca : gstcacasink.c gstcacasink.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/libcaca/gstcacasink.c.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/libcaca/gstcacasink.h.diff?r1=1.1&r2=1.2
====Begin Diffs====
Index: gstcacasink.c
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ext/libcaca/gstcacasink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstcacasink.c 15 Dec 2003 22:27:28 -0000 1.1
+++ gstcacasink.c 11 Jan 2004 22:16:49 -0000 1.2
@@ -23,6 +23,7 @@
#include <string.h>
#include <sys/time.h>
+#include <gst/navigation/navigation.h>
#include "gstcacasink.h"
@@ -36,37 +37,32 @@
/* cacasink signals and args */
enum {
- SIGNAL_FRAME_DISPLAYED,
- SIGNAL_HAVE_SIZE,
LAST_SIGNAL
};
enum {
ARG_0,
- ARG_WIDTH,
- ARG_HEIGHT,
+ ARG_SCREEN_WIDTH,
+ ARG_SCREEN_HEIGHT,
ARG_DITHER,
- ARG_FRAMES_DISPLAYED,
- ARG_FRAME_TIME,
};
-GST_PAD_TEMPLATE_FACTORY (sink_template,
+static GstStaticPadTemplate sink_template =
+GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- gst_caps_new (
- "cacasink_caps",
- "video/x-raw-rgb",
- GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_32
- )
-)
+ GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24));
static void gst_cacasink_base_init (gpointer g_class);
static void gst_cacasink_class_init (GstCACASinkClass *klass);
static void gst_cacasink_init (GstCACASink *cacasink);
+static void gst_cacasink_interface_init (GstImplementsInterfaceClass *klass);
+static gboolean gst_cacasink_interface_supported (GstImplementsInterface *iface, GType type);
+static void gst_cacasink_navigation_init (GstNavigationInterface *iface);
+static void gst_cacasink_navigation_send_event (GstNavigation *navigation, GstStructure *structure);
-static void gst_cacasink_set_clock (GstElement *element, GstClock *clock);
static void gst_cacasink_chain (GstPad *pad, GstData *_data);
static void gst_cacasink_set_property (GObject *object, guint prop_id,
@@ -77,7 +73,6 @@
static GstElementStateReturn gst_cacasink_change_state (GstElement *element);
static GstElementClass *parent_class = NULL;
-static guint gst_cacasink_signals[LAST_SIGNAL] = { 0 };
GType
gst_cacasink_get_type (void)
@@ -94,9 +89,27 @@
NULL,
sizeof(GstCACASink),
0,
- (GInstanceInitFunc)gst_cacasink_init,
+ (GInstanceInitFunc) gst_cacasink_init,
};
- cacasink_type = g_type_register_static(GST_TYPE_ELEMENT, "GstCACASink", &cacasink_info, 0);
+
+ static const GInterfaceInfo iface_info = {
+ (GInterfaceInitFunc) gst_cacasink_interface_init,
+ NULL,
+ NULL,
+ };
+
+ static const GInterfaceInfo navigation_info = {
+ (GInterfaceInitFunc) gst_cacasink_navigation_init,
+ NULL,
+ NULL,
+ };
+
+ cacasink_type = g_type_register_static (GST_TYPE_VIDEOSINK, "GstCACASink", &cacasink_info, 0);
+
+ g_type_add_interface_static (cacasink_type, GST_TYPE_IMPLEMENTS_INTERFACE,
+ &iface_info);
+ g_type_add_interface_static (cacasink_type, GST_TYPE_NAVIGATION,
+ &navigation_info);
}
return cacasink_type;
}
@@ -110,7 +123,7 @@
GEnumValue *dithers;
gint n_dithers;
gint i;
- gchar caca_dithernames[] = {
+ gchar *caca_dithernames[] = {
"NONE", "ORDERED2", "ORDERED4", "ORDERED8", "RANDOM", NULL};
n_dithers = 5;
@@ -136,9 +149,9 @@
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- gst_element_class_add_pad_template (element_class,
- GST_PAD_TEMPLATE_GET (sink_template));
gst_element_class_set_details (element_class, &gst_cacasink_details);
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&sink_template));
}
static void
@@ -146,64 +159,90 @@
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
+ GstVideoSinkClass *gstvs_class;
gobject_class = (GObjectClass*)klass;
gstelement_class = (GstElementClass*)klass;
+ gstvs_class = (GstVideoSinkClass*) klass;
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_WIDTH,
- g_param_spec_int("width","width","width",
+ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SCREEN_WIDTH,
+ g_param_spec_int("screen_width","screen_width","screen_width",
G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_HEIGHT,
- g_param_spec_int("height","height","height",
+ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SCREEN_HEIGHT,
+ g_param_spec_int("screen_height","screen_height","screen_height",
G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DITHER,
g_param_spec_enum("dither","dither","dither",
- GST_TYPE_CACADITHER,0,G_PARAM_READWRITE)); /* CHECKME! */
- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FRAMES_DISPLAYED,
- g_param_spec_int("frames_displayed","frames_displayed","frames_displayed",
- G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FRAME_TIME,
- g_param_spec_int("frame_time","frame_time","frame_time",
- G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
+ GST_TYPE_CACADITHER, 0, G_PARAM_READWRITE));
gobject_class->set_property = gst_cacasink_set_property;
gobject_class->get_property = gst_cacasink_get_property;
- gst_cacasink_signals[SIGNAL_FRAME_DISPLAYED] =
- g_signal_new ("frame_displayed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GstCACASinkClass, frame_displayed), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
- gst_cacasink_signals[SIGNAL_HAVE_SIZE] =
- g_signal_new ("have_size", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GstCACASinkClass, have_size), NULL, NULL,
- gst_marshal_VOID__INT_INT, G_TYPE_NONE, 2,
- G_TYPE_UINT, G_TYPE_UINT);
-
gstelement_class->change_state = gst_cacasink_change_state;
- gstelement_class->set_clock = gst_cacasink_set_clock;
}
+static void
+gst_cacasink_interface_init (GstImplementsInterfaceClass *klass)
+{
+ klass->supported = gst_cacasink_interface_supported;
+}
+
+static gboolean
+gst_cacasink_interface_supported (GstImplementsInterface *iface, GType type)
+{
+ g_assert (type == GST_TYPE_NAVIGATION);
+
+ return (GST_STATE (iface) != GST_STATE_NULL);
+}
+
+static void
+gst_cacasink_navigation_init (GstNavigationInterface *iface)
+{
+ iface->send_event = gst_cacasink_navigation_send_event;
+}
+
+static void
+gst_cacasink_navigation_send_event (GstNavigation *navigation,
+ GstStructure *structure)
+{
+ GstCACASink *cacasink = GST_CACASINK (navigation);
+ GstEvent *event;
+
+ event = gst_event_new (GST_EVENT_NAVIGATION);
+ /*GST_EVENT_TIMESTAMP (event) = 0;*/
+ event->event_data.structure.structure = structure;
+
+ /* FIXME
+ * Obviously, the pointer x,y coordinates need to be adjusted by the
+ * window size and relation to the bounding window. */
+
+ gst_pad_send_event (gst_pad_get_peer (GST_VIDEOSINK_PAD(cacasink)),
+ event);
+}
static GstPadLinkReturn
-gst_cacasink_sinkconnect (GstPad *pad, GstCaps *caps)
+gst_cacasink_sinkconnect (GstPad *pad, const GstCaps *caps)
{
GstCACASink *cacasink;
+ GstStructure *structure;
cacasink = GST_CACASINK (gst_pad_get_parent (pad));
- if (!GST_CAPS_IS_FIXED (caps))
- return GST_PAD_LINK_DELAYED;
+ /*if (!GST_CAPS_IS_FIXED (caps))
+ return GST_PAD_LINK_DELAYED;*/
- gst_caps_get_int (caps, "width", &cacasink->image_width);
- gst_caps_get_int (caps, "height", &cacasink->image_height);
- gst_caps_get_int (caps, "bpp", &cacasink->bpp);
- gst_caps_get_int (caps, "red_mask", &cacasink->red_mask);
- gst_caps_get_int (caps, "green_mask", &cacasink->green_mask);
- gst_caps_get_int (caps, "blue_mask", &cacasink->blue_mask);
+ structure = gst_caps_get_structure (caps, 0);
+ gst_structure_get_int (structure, "width",
+ &(GST_VIDEOSINK_WIDTH (cacasink)));
+ gst_structure_get_int (structure, "height",
+ &(GST_VIDEOSINK_HEIGHT (cacasink)));
+ gst_structure_get_int (structure, "bpp", &cacasink->bpp);
+ gst_structure_get_int (structure, "red_mask", &cacasink->red_mask);
+ gst_structure_get_int (structure, "green_mask", &cacasink->green_mask);
+ gst_structure_get_int (structure, "blue_mask", &cacasink->blue_mask);
- g_signal_emit( G_OBJECT (cacasink), gst_cacasink_signals[SIGNAL_HAVE_SIZE], 0,
- cacasink->image_width, cacasink->image_height);
+ gst_video_sink_got_video_size (GST_VIDEOSINK (cacasink), GST_VIDEOSINK_WIDTH (cacasink), GST_VIDEOSINK_HEIGHT (cacasink));
/*if (cacasink->bitmap != NULL) {
caca_free_bitmap (cacasink->bitmap);
@@ -215,32 +254,23 @@
}
static void
-gst_cacasink_set_clock (GstElement *element, GstClock *clock)
-{
- GstCACASink *cacasink = GST_CACASINK (element);
-
- cacasink->clock = clock;
-}
-
-static void
gst_cacasink_init (GstCACASink *cacasink)
{
- cacasink->sinkpad = gst_pad_new_from_template (
- GST_PAD_TEMPLATE_GET (sink_template), "sink");
- gst_element_add_pad (GST_ELEMENT (cacasink), cacasink->sinkpad);
- gst_pad_set_chain_function (cacasink->sinkpad, gst_cacasink_chain);
- gst_pad_set_link_function (cacasink->sinkpad, gst_cacasink_sinkconnect);
+ GST_VIDEOSINK_PAD (cacasink) = gst_pad_new_from_template (
+ gst_static_pad_template_get (&sink_template), "sink");
+ gst_element_add_pad (GST_ELEMENT (cacasink), GST_VIDEOSINK_PAD (cacasink));
+ gst_pad_set_chain_function (GST_VIDEOSINK_PAD (cacasink),
+ gst_cacasink_chain);
+ gst_pad_set_link_function (GST_VIDEOSINK_PAD (cacasink),
+ gst_cacasink_sinkconnect);
- cacasink->screen_width = -1;
- cacasink->screen_height = -1;
- cacasink->image_width = GST_CACA_DEFAULT_IMAGE_WIDTH;
- cacasink->image_height = GST_CACA_DEFAULT_IMAGE_HEIGHT;
+ cacasink->screen_width = GST_CACA_DEFAULT_SCREEN_WIDTH;
+ cacasink->screen_height = GST_CACA_DEFAULT_SCREEN_HEIGHT;
cacasink->bpp = GST_CACA_DEFAULT_BPP;
cacasink->red_mask = GST_CACA_DEFAULT_RED_MASK;
cacasink->green_mask = GST_CACA_DEFAULT_GREEN_MASK;
cacasink->blue_mask = GST_CACA_DEFAULT_BLUE_MASK;
- cacasink->clock = NULL;
cacasink->bitmap = NULL;
GST_FLAG_SET(cacasink, GST_ELEMENT_THREAD_SUGGESTED);
@@ -251,6 +281,8 @@
{
GstBuffer *buf = GST_BUFFER (_data);
GstCACASink *cacasink;
+ GstClockTime time = GST_BUFFER_TIMESTAMP (buf);
+ gint64 jitter;
g_return_if_fail (pad != NULL);
g_return_if_fail (GST_IS_PAD (pad));
@@ -258,18 +290,32 @@
cacasink = GST_CACASINK (gst_pad_get_parent (pad));
- GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
+ if (GST_VIDEOSINK_CLOCK (cacasink) && time != -1) {
+ GstClockReturn ret;
- if (cacasink->clock) {
- GstClockID id = gst_clock_new_single_shot_id (cacasink->clock, GST_BUFFER_TIMESTAMP(buf));
- gst_element_clock_wait (GST_ELEMENT (cacasink), id, NULL);
- gst_clock_id_free (id);
+ cacasink->id = gst_clock_new_single_shot_id (
+ GST_VIDEOSINK_CLOCK (cacasink), time);
+
+ GST_DEBUG ("videosink: clock %s wait: %" G_GUINT64_FORMAT " %u",
+ GST_OBJECT_NAME (GST_VIDEOSINK_CLOCK (cacasink)),
+ time, GST_BUFFER_SIZE (buf));
+
+ ret = gst_clock_id_wait (cacasink->id, &jitter);
+ gst_clock_id_free (cacasink->id);
+ cacasink->id = NULL;
}
+ //caca_clear ();
caca_draw_bitmap (0, 0, cacasink->screen_width-1, cacasink->screen_height-1, cacasink->bitmap, GST_BUFFER_DATA (buf));
caca_refresh ();
- g_signal_emit(G_OBJECT(cacasink),gst_cacasink_signals[SIGNAL_FRAME_DISPLAYED], 0);
+ if (GST_VIDEOSINK_CLOCK (cacasink)) {
+ jitter = gst_clock_get_time (GST_VIDEOSINK_CLOCK (cacasink)) - time;
+
+ cacasink->correction = (cacasink->correction + jitter) >> 1;
+ cacasink->correction = 0;
+ }
+
gst_buffer_unref(buf);
}
@@ -304,11 +350,11 @@
cacasink = GST_CACASINK(object);
switch (prop_id) {
- case ARG_WIDTH: {
+ case ARG_SCREEN_WIDTH: {
g_value_set_int (value, cacasink->screen_width);
break;
}
- case ARG_HEIGHT: {
+ case ARG_SCREEN_HEIGHT: {
g_value_set_int (value, cacasink->screen_height);
break;
}
@@ -316,14 +362,6 @@
g_value_set_enum (value, cacasink->dither);
break;
}
- case ARG_FRAMES_DISPLAYED: {
- g_value_set_int (value, cacasink->frames_displayed);
- break;
- }
- case ARG_FRAME_TIME: {
- g_value_set_int (value, cacasink->frame_time/1000000);
- break;
- }
default: {
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -338,18 +376,19 @@
caca_init ();
- screen_width = caca_get_width ();
- screen_height = caca_get_height ();
- caca_set_dithering (cacasink->dither);
+ cacasink->screen_width = caca_get_width ();
+ cacasink->screen_height = caca_get_height ();
+ caca_set_dithering (cacasink->dither + CACA_DITHERING_NONE);
- caca->bitmap = caca_create_bitmap (
+ cacasink->bitmap = caca_create_bitmap (
cacasink->bpp,
- cacasink->image_width,
- cacasink->image_height,
- cacasink->image_width * cacasink->bpp/8,
+ GST_VIDEOSINK_WIDTH (cacasink),
+ GST_VIDEOSINK_HEIGHT (cacasink),
+ GST_VIDEOSINK_WIDTH (cacasink) * cacasink->bpp/8,
cacasink->red_mask,
cacasink->green_mask,
- cacasink->blue_mask);
+ cacasink->blue_mask,
+ 0);
GST_FLAG_SET (cacasink, GST_CACASINK_OPEN);
@@ -392,6 +431,10 @@
static gboolean
plugin_init (GstPlugin *plugin)
{
+ /* Loading the library containing GstVideoSink, our parent object */
+ if (!gst_library_load ("gstvideo"))
+ return FALSE;
+
if (!gst_element_register (plugin, "cacasink", GST_RANK_NONE, GST_TYPE_CACASINK))
return FALSE;
@@ -405,7 +448,7 @@
"Colored ASCII Art video sink",
plugin_init,
VERSION,
- "GPL",
+ GST_LICENSE,
GST_PACKAGE,
GST_ORIGIN
)
Index: gstcacasink.h
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ext/libcaca/gstcacasink.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstcacasink.h 15 Dec 2003 22:27:28 -0000 1.1
+++ gstcacasink.h 11 Jan 2004 22:16:49 -0000 1.2
@@ -22,6 +22,7 @@
#define __GST_CACASINK_H__
#include <gst/gst.h>
+#include <gst/video/gstvideosink.h>
#include <gst/video/video.h>
#include <caca.h>
@@ -30,13 +31,16 @@
extern "C" {
#endif /* __cplusplus */
+#define GST_CACA_DEFAULT_SCREEN_WIDTH 80
+#define GST_CACA_DEFAULT_SCREEN_HEIGHT 25
+#define GST_CACA_DEFAULT_BPP 24
+#define GST_CACA_DEFAULT_RED_MASK R_MASK_32_INT
+#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_INT
+#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32_INT
-#define GST_CACA_DEFAULT_IMAGE_WIDTH 320
-#define GST_CACA_DEFAULT_IMAGE_HEIGHT 240
-#define GST_CACA_DEFAULT_BPP 32
-#define GST_CACA_DEFAULT_RED_MASK R_MASK_32
-#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32
-#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32
+//#define GST_CACA_DEFAULT_RED_MASK R_MASK_32_REVERSE_INT
+//#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_REVERSE_INT
+//#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32_REVERSE_INT
#define GST_TYPE_CACASINK \
(gst_cacasink_get_type())
@@ -59,31 +63,26 @@
typedef struct _GstCACASinkClass GstCACASinkClass;
struct _GstCACASink {
- GstElement element;
+ GstVideoSink videosink;
GstPad *sinkpad;
gulong format;
gint screen_width, screen_height;
- gint image_width, image_height;
guint bpp;
guint dither;
guint red_mask, green_mask, blue_mask;
- gint frames_displayed;
- guint64 frame_time;
-
- GstClock *clock;
+ gint64 correction;
+ GstClockID id;
struct caca_bitmap *bitmap;
};
struct _GstCACASinkClass {
- GstElementClass parent_class;
+ GstVideoSinkClass parent_class;
/* signals */
- void (*frame_displayed) (GstElement *element);
- void (*have_size) (GstElement *element, guint width, guint height);
};
GType gst_cacasink_get_type(void);
|