FCL/sf/mw/gstreamer: comparison gstreamer_core/plugins/elements/gstfdsrc.c

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:element-fdsrc
+* @short_description: read from a unix file descriptor
 * @see_also: #GstFdSink
 *
 * Read data from a unix file descriptor.
-*
-* To generate data, enter some data on the console folowed by enter.
-* The above mentioned pipeline should dump data packets to the console.
-*
-* If the #GstFdSrc:timeout property is set to a value bigger than 0, fdsrc will
-* generate an element message named
-* <classname>&quot;GstFdSrcTimeout&quot;</classname>
-* if no data was recieved in the given timeout.
-* The message's structure contains one field:
-* <itemizedlist>
-* <listitem>
-*   <para>
-*   #guint64
-*   <classname>&quot;timeout&quot;</classname>: the timeout in microseconds that
-*   expired when waiting for data.
-*   </para>
-* </listitem>
-* </itemizedlist>
-*
-* <refsect2>
-* <title>Example launch line</title>
-* |[
-* echo "Hello GStreamer" | gst-launch -v fdsrc ! fakesink dump=true
-* ]| A simple pipeline to read from the standard input and dump the data
-* with a fakesink as hex ascii block.
-* </refsect2>
-*
-* Last reviewed on 2008-06-20 (0.10.21)
 */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#ifdef __SYMBIAN32__
+#include <gst_global.h>
+#endif
 #include "gst/gst_private.h"
 #include <sys/types.h>
-#ifdef G_OS_WIN32
-#include <io.h>                 /* lseek, open, close, read */
-#undef lseek
-#define lseek _lseeki64
-#undef off_t
-#define off_t guint64
-#endif
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #endif
 #include <stdlib.h>
 #include <errno.h>
 #include "gstfdsrc.h"
+#ifdef __SYMBIAN32__
+#include <glib_global.h>
+#include <gobject_global.h>
+#include <gstpoll.h>
+#include <gstelement.h>
+#endif
+#define DEFAULT_BLOCKSIZE       4096
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
 GST_PAD_SRC,
 GST_PAD_ALWAYS,
 GST_STATIC_CAPS_ANY);
 GST_DEBUG_CATEGORY_STATIC (gst_fd_src_debug);
 #define GST_CAT_DEFAULT gst_fd_src_debug
-#define DEFAULT_FD              0
-#define DEFAULT_TIMEOUT         0
 enum
 {
 PROP_0,
 PROP_FD,
-PROP_TIMEOUT,
-PROP_LAST
 };
 static void gst_fd_src_uri_handler_init (gpointer g_iface, gpointer iface_data);
 static void
 static gboolean gst_fd_src_unlock (GstBaseSrc * bsrc);
 static gboolean gst_fd_src_unlock_stop (GstBaseSrc * bsrc);
 static gboolean gst_fd_src_is_seekable (GstBaseSrc * bsrc);
 static gboolean gst_fd_src_get_size (GstBaseSrc * src, guint64 * size);
 static gboolean gst_fd_src_do_seek (GstBaseSrc * src, GstSegment * segment);
-static gboolean gst_fd_src_query (GstBaseSrc * src, GstQuery * query);
 static GstFlowReturn gst_fd_src_create (GstPushSrc * psrc, GstBuffer ** outbuf);
 static void
 gst_fd_src_base_init (gpointer g_class)
 static void
 gst_fd_src_class_init (GstFdSrcClass * klass)
 {
 GObjectClass *gobject_class;
 GstBaseSrcClass *gstbasesrc_class;
+GstElementClass *gstelement_class;
 GstPushSrcClass *gstpush_src_class;
 gobject_class = G_OBJECT_CLASS (klass);
+gstelement_class = GST_ELEMENT_CLASS (klass);
 gstbasesrc_class = GST_BASE_SRC_CLASS (klass);
 gstpush_src_class = GST_PUSH_SRC_CLASS (klass);
 parent_class = g_type_class_peek_parent (klass);
 gobject_class->get_property = gst_fd_src_get_property;
 gobject_class->dispose = gst_fd_src_dispose;
 g_object_class_install_property (gobject_class, PROP_FD,
 g_param_spec_int ("fd", "fd", "An open file descriptor to read from",
-0, G_MAXINT, DEFAULT_FD, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+0, G_MAXINT, 0, G_PARAM_READWRITE));
-/**
-* GstFdSrc:timeout
-*
-* Post a message after timeout microseconds
-*
-* Since: 0.10.21
-*/
-g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TIMEOUT,
-g_param_spec_uint64 ("timeout", "Timeout",
-"Post a message after timeout microseconds (0 = disabled)", 0,
-G_MAXUINT64, DEFAULT_TIMEOUT,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_fd_src_start);
 gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_fd_src_stop);
 gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_fd_src_unlock);
 gstbasesrc_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_fd_src_unlock_stop);
 gstbasesrc_class->is_seekable = GST_DEBUG_FUNCPTR (gst_fd_src_is_seekable);
 gstbasesrc_class->get_size = GST_DEBUG_FUNCPTR (gst_fd_src_get_size);
 gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (gst_fd_src_do_seek);
-gstbasesrc_class->query = GST_DEBUG_FUNCPTR (gst_fd_src_query);
 gstpush_src_class->create = GST_DEBUG_FUNCPTR (gst_fd_src_create);
 }
 static void
 gst_fd_src_init (GstFdSrc * fdsrc, GstFdSrcClass * klass)
 {
+fdsrc->fd = -1;
 fdsrc->new_fd = 0;
 fdsrc->seekable_fd = FALSE;
-fdsrc->fd = DEFAULT_FD;
-fdsrc->timeout = DEFAULT_TIMEOUT;
 fdsrc->uri = g_strdup_printf ("fd://0");
 fdsrc->curoffset = 0;
 }
 static void
 gst_fd_src_update_fd (GstFdSrc * src)
 {
 struct stat stat_results;
 /* we need to always update the fdset since it may not have existed when
-* gst_fd_src_update_fd () was called earlier */
+* gst_fd_src_update_fd() was called earlier */
 if (src->fdset != NULL) {
 GstPollFD fd = GST_POLL_FD_INIT;
 if (src->fd >= 0) {
 fd.fd = src->fd;
 } else {
 GST_DEBUG_OBJECT (src, "state above ready, not updating to new fd yet");
 }
 GST_OBJECT_UNLOCK (object);
 break;
-case PROP_TIMEOUT:
+default:
-src->timeout = g_value_get_uint64 (value);
+G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-GST_DEBUG_OBJECT (src, "poll timeout set to %" GST_TIME_FORMAT,
+break;
-GST_TIME_ARGS (src->timeout));
+}
+}
+static void
+gst_fd_src_get_property (GObject * object, guint prop_id, GValue * value,
+GParamSpec * pspec)
+{
+GstFdSrc *src = GST_FD_SRC (object);
+switch (prop_id) {
+case PROP_FD:
+g_value_set_int (value, src->fd);
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 break;
 }
 }
-static void
-gst_fd_src_get_property (GObject * object, guint prop_id, GValue * value,
-GParamSpec * pspec)
-{
-GstFdSrc *src = GST_FD_SRC (object);
-switch (prop_id) {
-case PROP_FD:
-g_value_set_int (value, src->fd);
-break;
-case PROP_TIMEOUT:
-g_value_set_uint64 (value, src->timeout);
-break;
-default:
-G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-break;
-}
-}
 static GstFlowReturn
 gst_fd_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
 {
 GstFdSrc *src;
 GstBuffer *buf;
 gssize readbytes;
 guint blocksize;
-GstClockTime timeout;
 #ifndef HAVE_WIN32
-gboolean try_again;
 gint retval;
 #endif
 src = GST_FD_SRC (psrc);
-if (src->timeout > 0) {
-timeout = src->timeout * GST_USECOND;
-} else {
-timeout = GST_CLOCK_TIME_NONE;
-}
 #ifndef HAVE_WIN32
 do {
-try_again = FALSE;
+retval = gst_poll_wait (src->fdset, GST_CLOCK_TIME_NONE);
+} while (retval == -1 && (errno == EINTR || errno == EAGAIN));        /* retry if interrupted */
-GST_LOG_OBJECT (src, "doing poll, timeout %" GST_TIME_FORMAT,
-GST_TIME_ARGS (src->timeout));
+if (retval == -1) {
+if (errno == EBUSY)
-retval = gst_poll_wait (src->fdset, timeout);
+goto stopped;
-GST_LOG_OBJECT (src, "poll returned %d", retval);
+else
+goto select_error;
-if (G_UNLIKELY (retval == -1)) {
+}
-if (errno == EINTR || errno == EAGAIN) {
-/* retry if interrupted */
-try_again = TRUE;
-} else if (errno == EBUSY) {
-goto stopped;
-} else {
-goto poll_error;
-}
-} else if (G_UNLIKELY (retval == 0)) {
-try_again = TRUE;
-/* timeout, post element message */
-gst_element_post_message (GST_ELEMENT_CAST (src),
-gst_message_new_element (GST_OBJECT_CAST (src),
-gst_structure_new ("GstFdSrcTimeout",
-"timeout", G_TYPE_UINT64, src->timeout, NULL)));
-}
-} while (G_UNLIKELY (try_again));     /* retry if interrupted or timeout */
 #endif
 blocksize = GST_BASE_SRC (src)->blocksize;
 /* create the buffer */
-buf = gst_buffer_try_new_and_alloc (blocksize);
+buf = gst_buffer_new_and_alloc (blocksize);
-if (G_UNLIKELY (buf == NULL)) {
-GST_ERROR_OBJECT (src, "Failed to allocate %u bytes", blocksize);
-return GST_FLOW_ERROR;
-}
 do {
 readbytes = read (src->fd, GST_BUFFER_DATA (buf), blocksize);
 GST_LOG_OBJECT (src, "read %" G_GSSIZE_FORMAT, readbytes);
 } while (readbytes == -1 && errno == EINTR);  /* retry if interrupted */
 return GST_FLOW_OK;
 /* ERRORS */
 #ifndef HAVE_WIN32
-poll_error:
+select_error:
 {
 GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
-("poll on file descriptor: %s.", g_strerror (errno)));
+("select on file descriptor: %s.", g_strerror (errno)));
-GST_DEBUG_OBJECT (psrc, "Error during poll");
+GST_DEBUG_OBJECT (psrc, "Error during select");
 return GST_FLOW_ERROR;
 }
 stopped:
 {
-GST_DEBUG_OBJECT (psrc, "Poll stopped");
+GST_DEBUG_OBJECT (psrc, "Select stopped");
 return GST_FLOW_WRONG_STATE;
 }
 #endif
 eos:
 {
 return GST_FLOW_ERROR;
 }
 }
 static gboolean
-gst_fd_src_query (GstBaseSrc * basesrc, GstQuery * query)
-{
-gboolean ret = FALSE;
-GstFdSrc *src = GST_FD_SRC (basesrc);
-switch (GST_QUERY_TYPE (query)) {
-case GST_QUERY_URI:
-gst_query_set_uri (query, src->uri);
-ret = TRUE;
-break;
-default:
-ret = FALSE;
-break;
-}
-if (!ret)
-ret = GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
-return ret;
-}
-static gboolean
 gst_fd_src_is_seekable (GstBaseSrc * bsrc)
 {
 GstFdSrc *src = GST_FD_SRC (bsrc);
 return src->seekable_fd;
 GST_DEBUG_OBJECT (src, "lseek returned %" G_GINT64_FORMAT, offset);
 return FALSE;
 }
 /*** GSTURIHANDLER INTERFACE *************************************************/
+#ifdef __SYMBIAN32__
-static GstURIType
+GstURIType
+#else
+static guint
+#endif
 gst_fd_src_uri_get_type (void)
 {
 return GST_URI_SRC;
 }
 static gchar **
 gst_fd_src_uri_get_protocols (void)
 {
 static gchar *protocols[] = { "fd", NULL };
 return protocols;
 }
 static const gchar *
 gst_fd_src_uri_get_uri (GstURIHandler * handler)
 {
 GstFdSrc *src = GST_FD_SRC (handler);

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3