|
From: <ret...@us...> - 2007-11-19 09:29:38
|
Revision: 274
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=274&view=rev
Author: retrakker
Date: 2007-11-19 01:29:38 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
Attempt to fix GStreamer capture with newest GStreamer > 0.10.11
Modified Paths:
--------------
trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2007-11-06 20:33:30 UTC (rev 273)
+++ trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2007-11-19 09:29:38 UTC (rev 274)
@@ -23,29 +23,30 @@
struct _AR2VideoParamT {
+
+ /* size of the image */
+ int width, height;
+ /* the actual video buffer */
+ ARUint8 *videoBuffer;
+
/* GStreamer pipeline */
GstElement *pipeline;
/* GStreamer identity needed for probing */
GstElement *probe;
-
- /* size of the image */
- int width, height;
- /* the actual video buffer */
- ARUint8 *videoBuffer;
-
};
-static AR2VideoParamT *gVid = 0;
+static AR2VideoParamT *gVid = NULL;
static gboolean
cb_have_data (GstPad *pad,
GstBuffer *buffer,
gpointer u_data)
{
+
const GstCaps *caps;
GstStructure *str;
@@ -53,10 +54,12 @@
gdouble rate;
AR2VideoParamT *vid = (AR2VideoParamT*)u_data;
+
+ if (vid == NULL) return FALSE;
/* only do initialy for the buffer */
- if (vid->videoBuffer == 0)
+ if (vid->videoBuffer == NULL && buffer)
{
/*
@@ -70,23 +73,22 @@
gst_structure_get_int(str,"width",&width);
gst_structure_get_int(str,"height",&height);
gst_structure_get_double(str,"framerate",&rate);
-
- g_print("libARvideo: GStreamer negotiated %dx%d\n",width,height);
vid->width = width;
vid->height = height;
+
+ g_print("libARvideo: GStreamer negotiated %dx%d (size: %d / expected: %d)\n",width,height,buffer->size, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
/* allocate the buffer */
- vid->videoBuffer = malloc(buffer->size);
+
+ arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
- return TRUE;
-
}
- else
+
+ if (vid->videoBuffer)
{
- /* copy the video buffer */
- memcpy(vid->videoBuffer, buffer->data, buffer->size);
- }
+ memcpy(vid->videoBuffer, buffer->data, buffer->size);
+ }
return TRUE;
}
@@ -213,7 +215,7 @@
arMalloc( vid, AR2VideoParamT, 1 );
/* initialise buffer */
- vid->videoBuffer = 0;
+ vid->videoBuffer = NULL;
/* report the current version and features */
g_print ("libARvideo: %s\n", gst_version_string());
@@ -253,11 +255,12 @@
/* install the probe callback for capturing */
+
gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid);
+
+ /* gst_object_unref(pad);*/
-
-
#if 0
/* request ready state */
gst_element_set_state (vid->pipeline, GST_STATE_READY);
@@ -288,10 +291,15 @@
}
/* now preroll for V4L v2 interfaces */
- if ((strstr(config, "v4l2src") != 0) ||
+ if (
+ (strstr(config, "v4l2src") != 0) ||
(strstr(config, "dv1394src") != 0) ||
- (strstr(config, "rtspsrc") != 0) )
+ (strstr(config, "rtspsrc") != 0) /* ||
+ (strstr(config, "videotestsrc") != 0) */)
{
+
+ g_print ("libARvdeo: need special prerolling for GStreamer\n");
+
/* set playing state of the pipeline */
gst_element_set_state (vid->pipeline, GST_STATE_PLAYING);
@@ -388,3 +396,4 @@
*y = vid->height; // height of your static image
}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-07-01 00:20:25
|
Revision: 281
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=281&view=rev
Author: retrakker
Date: 2008-06-30 17:20:34 -0700 (Mon, 30 Jun 2008)
Log Message:
-----------
Better support for forced prerolling in GStreamer. Checking if a live
pipeline returns NO_PREROLL and consequently force internal preroll to
fetch dimensions of the video.
Modified Paths:
--------------
trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-03-04 11:26:53 UTC (rev 280)
+++ trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-07-01 00:20:34 UTC (rev 281)
@@ -63,29 +63,8 @@
/* only do initialy for the buffer */
if (vid->videoBuffer == NULL && buffer)
- {
-
- /*
- * Get the capabilities of the frame, we need that in order
- * to extract information about the frame
- */
- caps=gst_pad_get_negotiated_caps(pad);
- str=gst_caps_get_structure(caps,0);
-
- /* Get some data about the frame */
- gst_structure_get_int(str,"width",&width);
- gst_structure_get_int(str,"height",&height);
- gst_structure_get_double(str,"framerate",&rate);
-
- vid->width = width;
- vid->height = height;
-
- g_print("libARvideo: GStreamer negotiated %dx%d (size: %d / expected: %d)\n",width,height,buffer->size, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
-
- /* allocate the buffer */
-
- arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
-
+ {
+ g_print("libARvideo error! Buffer not allocated\n");
}
if (vid->videoBuffer)
@@ -96,18 +75,22 @@
return TRUE;
}
-void
-testing_pad(GstPad *pad)
-{
+
+static
+void video_caps_notify(GObject* obj, GParamSpec* pspec, gpointer data) {
+
const GstCaps *caps;
GstStructure *str;
gint width,height;
gdouble rate;
+
+ AR2VideoParamT *vid = (AR2VideoParamT*)data;
- caps=gst_pad_get_negotiated_caps(pad);
+ caps = gst_pad_get_negotiated_caps((GstPad*)obj);
if (caps) {
+
str=gst_caps_get_structure(caps,0);
/* Get some data about the frame */
@@ -115,13 +98,18 @@
gst_structure_get_int(str,"height",&height);
gst_structure_get_double(str,"framerate",&rate);
- g_print("libARvideo: GStreamer negotiated %dx%d\n",width,height);
- } else {
- return;
-#if 0
- g_print("Nothing yet!");
-#endif
+ g_print("libARvideo: GStreamer negotiated %dx%d @%3.3fps\n", width, height,rate);
+ vid->width = width;
+ vid->height = height;
+
+ g_print("libARvideo: allocating %d bytes\n",(vid->width * vid->height * AR_PIX_SIZE_DEFAULT));
+
+ /* allocate the buffer */
+ arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
+
+
+
}
}
@@ -193,6 +181,7 @@
GstPad *pad, *peerpad;
GstXML *xml;
GstStateChangeReturn _ret;
+ int is_live;
char *config;
/* If no config string is supplied, we should use the environment variable, otherwise set a sane default */
@@ -258,56 +247,52 @@
g_print("Pipeline has no element named 'artoolkit'!\n");
return 0;
};
-
+
/* get the pad from the probe (the source pad seems to be more flexible) */
pad = gst_element_get_pad (vid->probe, "src");
-
+ /* get the peerpad aka sink */
+ peerpad = gst_pad_get_peer(pad);
+
/* install the probe callback for capturing */
gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid);
-
-
-#if 0
- /* request ready state */
+
+ g_signal_connect(pad, "notify::caps", G_CALLBACK(video_caps_notify), vid);
+
+ /* Needed to fill the information for ARVidInfo */
gst_element_set_state (vid->pipeline, GST_STATE_READY);
-
- /* check if stream is ready */
+
+ /* wait until it's up and running or failed */
if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
g_error ("libARvideo: failed to put GStreamer into READY state!\n");
} else {
+
+ is_live = (_ret == GST_STATE_CHANGE_NO_PREROLL) ? 1 : 0;
g_print ("libARvideo: GStreamer pipeline is READY!\n");
}
-#endif
/* Needed to fill the information for ARVidInfo */
- gst_element_set_state (vid->pipeline, GST_STATE_PAUSED);
+ _ret = gst_element_set_state (vid->pipeline, GST_STATE_PAUSED);
- peerpad = gst_pad_get_peer(pad);
-
- testing_pad(peerpad);
+ is_live = (_ret == GST_STATE_CHANGE_NO_PREROLL) ? 1 : 0;
+ /* wait until it's up and running or failed */
+ if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
+ g_error ("libARvideo: failed to put GStreamer into PAUSED state!\n");
+ } else {
+ g_print ("libARvideo: GStreamer pipeline is PAUSED!\n",is_live);
+ }
+
/* dismiss the pad */
gst_object_unref (pad);
/* dismiss the peer-pad */
gst_object_unref (peerpad);
-
- /* wait until it's up and running or failed */
- if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
- g_error ("libARvideo: failed to put GStreamer into PAUSE state!\n");
- } else {
- g_print ("libARvideo: GStreamer pipeline is PAUSED!\n");
- }
- /* now preroll for V4L v2 interfaces */
- if (
- (strstr(config, "v4l2src") != 0) ||
- (strstr(config, "dv1394src") != 0) ||
- (strstr(config, "rtspsrc") != 0) /* ||
- (strstr(config, "videotestsrc") != 0) */)
- {
+ /* now preroll for live sources */
+ if (is_live) {
- g_print ("libARvdeo: need special prerolling for GStreamer\n");
+ g_print ("libARvdeo: need special prerolling for live sources\n");
/* set playing state of the pipeline */
gst_element_set_state (vid->pipeline, GST_STATE_PLAYING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-07-01 22:23:18
|
Revision: 282
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=282&view=rev
Author: retrakker
Date: 2008-07-01 15:23:26 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Small fix to return 0 for ar2VideoCapNext() - implementation needs to be
added to check on actual GStreamer state.
Modified Paths:
--------------
trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-07-01 00:20:34 UTC (rev 281)
+++ trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-07-01 22:23:26 UTC (rev 282)
@@ -166,8 +166,7 @@
int arVideoCapNext( void )
{
- ar2VideoCapNext(gVid);
- return 0;
+ return ar2VideoCapNext(gVid);;
}
/*---------------------------------------------------------------------------*/
@@ -378,8 +377,7 @@
int
ar2VideoCapNext(AR2VideoParamT *vid)
{
- /* gstreamer should */
- return TRUE;
+ return 0;
}
int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
