Move fdsrc back into gstreamer core elements.

Original commit message from CVS:
* configure.ac:
* gst/fdsrc/Makefile.am:
* gst/fdsrc/gstfdsrc.c:
* gst/fdsrc/gstfdsrc.h:
Move fdsrc back into gstreamer core elements.

* gst/level/gstlevel.c: (gst_level_class_init),
(gst_level_transform_ip):
* gst/videobox/gstvideobox.c: (gst_video_box_set_property):
Basetransform changes.

5 files changed, 17 insertions, 399 deletions

diff --git a/gst/fdsrc/Makefile.am b/gst/fdsrc/Makefile.am
deleted file mode 100644
index 611d9bfe..00000000
--- a/gst/fdsrc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-plugin_LTLIBRARIES = libgstfdsrc.la
-
-libgstfdsrc_la_SOURCES = gstfdsrc.c
-libgstfdsrc_la_CFLAGS = $(GST_CFLAGS)
-libgstfdsrc_la_LIBADD = $(GST_LIBS) 
-libgstfdsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
-
-noinst_HEADERS = gstfdsrc.h
-
diff --git a/gst/fdsrc/gstfdsrc.c b/gst/fdsrc/gstfdsrc.c
deleted file mode 100644
index cb39d170..00000000
--- a/gst/fdsrc/gstfdsrc.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Philippe Khalaf <burger@speedy.org>
- *
- * gstfdsrc.c: 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <errno.h>
-
-#include "gstfdsrc.h"
-
-#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_fdsrc_debug);
-#define GST_CAT_DEFAULT gst_fdsrc_debug
-
-GstElementDetails gst_fdsrc_details = GST_ELEMENT_DETAILS ("Disk Source",
-    "Source/File",
-    "Synchronous read from a file",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
-
-/* FdSrc signals and args */
-enum
-{
-  SIGNAL_TIMEOUT,
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_0,
-  ARG_FD,
-  ARG_BLOCKSIZE,
-  ARG_TIMEOUT
-};
-
-static guint gst_fdsrc_signals[LAST_SIGNAL] = { 0 };
-
-#define _do_init(bla) \
-    GST_DEBUG_CATEGORY_INIT (gst_fdsrc_debug, "fdsrc", 0, "fdsrc element");
-
-GST_BOILERPLATE_FULL (GstFdSrc, gst_fdsrc, GstElement, GST_TYPE_PUSH_SRC,
-    _do_init);
-
-static void gst_fdsrc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_fdsrc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static GstStateChangeReturn gst_fdsrc_change_state (GstElement * element,
-    GstStateChange transition);
-
-static GstFlowReturn gst_fdsrc_create (GstPushSrc * psrc, GstBuffer ** outbuf);
-
-static void
-gst_fdsrc_base_init (gpointer g_class)
-{
-  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_add_pad_template (gstelement_class,
-      gst_static_pad_template_get (&srctemplate));
-  gst_element_class_set_details (gstelement_class, &gst_fdsrc_details);
-}
-static void
-gst_fdsrc_class_init (GstFdSrcClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstBaseSrcClass *gstbasesrc_class;
-  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
-  GstPushSrcClass *gstpush_src_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gstbasesrc_class = (GstBaseSrcClass *) klass;
-  gstpush_src_class = (GstPushSrcClass *) klass;
-
-  parent_class = g_type_class_ref (GST_TYPE_PUSH_SRC);
-
-  gobject_class->set_property = gst_fdsrc_set_property;
-  gobject_class->get_property = gst_fdsrc_get_property;
-
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FD,
-      g_param_spec_int ("fd", "fd", "An open file descriptor to read from",
-          0, G_MAXINT, 0, G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BLOCKSIZE,
-      g_param_spec_ulong ("blocksize", "Block size",
-          "Size in bytes to read per buffer", 1, G_MAXULONG, DEFAULT_BLOCKSIZE,
-          G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TIMEOUT,
-      g_param_spec_uint64 ("timeout", "Timeout", "Read timeout in nanoseconds",
-          0, G_MAXUINT64, 0, G_PARAM_READWRITE));
-
-  gst_fdsrc_signals[SIGNAL_TIMEOUT] =
-      g_signal_new ("timeout", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
-      G_STRUCT_OFFSET (GstFdSrcClass, timeout), NULL, NULL,
-      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  gstelement_class->change_state = gst_fdsrc_change_state;
-
-  gstpush_src_class->create = gst_fdsrc_create;
-
-}
-
-static void
-gst_fdsrc_init (GstFdSrc * fdsrc, GstFdSrcClass * g_class)
-{
-  // TODO set live only if it's actually a live source
-  gst_base_src_set_live (GST_BASE_SRC (fdsrc), TRUE);
-
-  fdsrc->fd = 0;
-  fdsrc->curoffset = 0;
-  fdsrc->blocksize = DEFAULT_BLOCKSIZE;
-  fdsrc->timeout = 0;
-  fdsrc->seq = 0;
-}
-
-static GstStateChangeReturn
-gst_fdsrc_change_state (GstElement * element, GstStateChange transition)
-{
-  GstFdSrc *src = GST_FDSRC (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      src->curoffset = 0;
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      break;
-    default:
-      break;
-  }
-
-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  return GST_STATE_CHANGE_SUCCESS;
-}
-
-
-static void
-gst_fdsrc_set_property (GObject * object, guint prop_id, const GValue * value,
-    GParamSpec * pspec)
-{
-  GstFdSrc *src;
-
-  g_return_if_fail (GST_IS_FDSRC (object));
-
-  src = GST_FDSRC (object);
-
-  switch (prop_id) {
-    case ARG_FD:
-      src->fd = g_value_get_int (value);
-      break;
-    case ARG_BLOCKSIZE:
-      src->blocksize = g_value_get_ulong (value);
-      break;
-    case ARG_TIMEOUT:
-      src->timeout = g_value_get_uint64 (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_fdsrc_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstFdSrc *src;
-
-  g_return_if_fail (GST_IS_FDSRC (object));
-
-  src = GST_FDSRC (object);
-
-  switch (prop_id) {
-    case ARG_BLOCKSIZE:
-      g_value_set_ulong (value, src->blocksize);
-      break;
-    case ARG_FD:
-      g_value_set_int (value, src->fd);
-      break;
-    case ARG_TIMEOUT:
-      g_value_set_uint64 (value, src->timeout);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static GstFlowReturn
-gst_fdsrc_create (GstPushSrc * psrc, GstBuffer ** outbuf)
-{
-  GstFdSrc *src;
-  GstBuffer *buf;
-  glong readbytes;
-
-#ifndef HAVE_WIN32
-  fd_set readfds;
-  struct timeval t, *tp = &t;
-  gint retval;
-#endif
-
-  src = GST_FDSRC (psrc);
-
-  /* create the buffer */
-  buf = gst_buffer_new_and_alloc (src->blocksize);
-
-#ifndef HAVE_WIN32
-  FD_ZERO (&readfds);
-  FD_SET (src->fd, &readfds);
-
-  if (src->timeout != 0) {
-    GST_TIME_TO_TIMEVAL (src->timeout, t);
-  } else
-    tp = NULL;
-
-  do {
-    retval = select (src->fd + 1, &readfds, NULL, NULL, tp);
-  } while (retval == -1 && errno == EINTR);     /* retry if interrupted */
-
-  if (retval == -1) {
-    GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
-        ("select on file descriptor: %s.", g_strerror (errno)));
-    return GST_FLOW_ERROR;
-  } else if (retval == 0) {
-    g_signal_emit (G_OBJECT (src), gst_fdsrc_signals[SIGNAL_TIMEOUT], 0);
-    return GST_FLOW_ERROR;
-  }
-#endif
-
-  do {
-    readbytes = read (src->fd, GST_BUFFER_DATA (buf), src->blocksize);
-  } while (readbytes == -1 && errno == EINTR);  /* retry if interrupted */
-
-  if (readbytes > 0) {
-    GST_BUFFER_OFFSET (buf) = src->curoffset;
-    GST_BUFFER_SIZE (buf) = readbytes;
-    GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
-    src->curoffset += readbytes;
-
-    /* we're done, return the buffer */
-    *outbuf = buf;
-    return GST_FLOW_OK;
-  } else if (readbytes == 0) {
-    return GST_FLOW_ERROR;
-  } else {
-    GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
-        ("read on file descriptor: %s.", g_strerror (errno)));
-    return GST_FLOW_ERROR;
-  }
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "fdsrc", GST_RANK_NONE, GST_TYPE_FDSRC);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "fdsrc",
-    "A source that reads from a file descriptor",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
diff --git a/gst/fdsrc/gstfdsrc.h b/gst/fdsrc/gstfdsrc.h
deleted file mode 100644
index 00042426..00000000
--- a/gst/fdsrc/gstfdsrc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Philippe Khalaf <burger@speedy.org>
- *
- * gstfdsrc.h: 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_FDSRC_H__
-#define __GST_FDSRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_FDSRC \
-  (gst_fdsrc_get_type())
-#define GST_FDSRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FDSRC,GstFdSrc))
-#define GST_FDSRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FDSRC,GstFdSrcClass))
-#define GST_IS_FDSRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FDSRC))
-#define GST_IS_FDSRC_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FDSRC))
-
-
-typedef struct _GstFdSrc GstFdSrc;
-typedef struct _GstFdSrcClass GstFdSrcClass;
-
-struct _GstFdSrc {
-  GstPushSrc element;
-
-  /* fd */
-  gint fd;
-
-  gulong curoffset; /* current offset in file */
-  gulong blocksize; /* bytes per read */
-  guint64 timeout;  /* read timeout, in nanoseconds */
-  
-  gulong seq;       /* buffer sequence number */
-};
-
-struct _GstFdSrcClass {
-  GstPushSrcClass parent_class;
-
-  /* signals */
-  void (*timeout) (GstElement *element);
-};
-
-GType gst_fdsrc_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_FDSRC_H__ */
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 8f1210f1..e3dabd8a 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -74,7 +74,6 @@ enum
 GST_BOILERPLATE (GstLevel, gst_level, GstBaseTransform,
     GST_TYPE_BASE_TRANSFORM);
 
-
 static void gst_level_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_level_get_property (GObject * object, guint prop_id,
@@ -82,8 +81,8 @@ static void gst_level_get_property (GObject * object, guint prop_id,
 
 static gboolean gst_level_set_caps (GstBaseTransform * trans, GstCaps * in,
     GstCaps * out);
-static GstFlowReturn gst_level_transform (GstBaseTransform * trans,
-    GstBuffer * in, GstBuffer * out);
+static GstFlowReturn gst_level_transform_ip (GstBaseTransform * trans,
+    GstBuffer * in);
 
 
 static void
@@ -129,7 +128,8 @@ gst_level_class_init (GstLevelClass * klass)
   GST_DEBUG_CATEGORY_INIT (level_debug, "level", 0, "Level calculation");
 
   trans_class->set_caps = gst_level_set_caps;
-  trans_class->transform = gst_level_transform;
+  trans_class->transform_ip = gst_level_transform_ip;
+  trans_class->passthrough_on_same_caps = TRUE;
 }
 
 static void
@@ -331,7 +331,7 @@ gst_level_message_append_channel (GstMessage * m, gdouble rms, gdouble peak,
 }
 
 static GstFlowReturn
-gst_level_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
+gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
 {
   GstLevel *filter;
   gpointer in_data;
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 6d6d1b92..2aff4074 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -290,6 +290,12 @@ gst_video_box_set_property (GObject * object, guint prop_id,
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+
+  if (video_box->box_left == 0 && video_box->box_right == 0 &&
+      video_box->box_top == 0 && video_box->box_bottom == 0)
+    gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (video_box), TRUE);
+  else
+    gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (video_box), FALSE);
 }
 static void
 gst_video_box_get_property (GObject * object, guint prop_id, GValue * value,
@@ -376,20 +382,16 @@ gst_video_box_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
   return ret;
 }
 
-#define ROUND_UP_2(x)  (((x)+1)&~1)
-#define ROUND_UP_4(x)  (((x)+3)&~3)
-#define ROUND_UP_8(x)  (((x)+7)&~7)
-
 /* see gst-plugins/gst/games/gstvideoimage.c, paint_setup_I420() */
-#define GST_VIDEO_I420_Y_ROWSTRIDE(width) (ROUND_UP_4(width))
-#define GST_VIDEO_I420_U_ROWSTRIDE(width) (ROUND_UP_8(width)/2)
-#define GST_VIDEO_I420_V_ROWSTRIDE(width) ((ROUND_UP_8(GST_VIDEO_I420_Y_ROWSTRIDE(width)))/2)
+#define GST_VIDEO_I420_Y_ROWSTRIDE(width) (GST_ROUND_UP_4(width))
+#define GST_VIDEO_I420_U_ROWSTRIDE(width) (GST_ROUND_UP_8(width)/2)
+#define GST_VIDEO_I420_V_ROWSTRIDE(width) ((GST_ROUND_UP_8(GST_VIDEO_I420_Y_ROWSTRIDE(width)))/2)
 
 #define GST_VIDEO_I420_Y_OFFSET(w,h) (0)
-#define GST_VIDEO_I420_U_OFFSET(w,h) (GST_VIDEO_I420_Y_OFFSET(w,h)+(GST_VIDEO_I420_Y_ROWSTRIDE(w)*ROUND_UP_2(h)))
-#define GST_VIDEO_I420_V_OFFSET(w,h) (GST_VIDEO_I420_U_OFFSET(w,h)+(GST_VIDEO_I420_U_ROWSTRIDE(w)*ROUND_UP_2(h)/2))
+#define GST_VIDEO_I420_U_OFFSET(w,h) (GST_VIDEO_I420_Y_OFFSET(w,h)+(GST_VIDEO_I420_Y_ROWSTRIDE(w)*GST_ROUND_UP_2(h)))
+#define GST_VIDEO_I420_V_OFFSET(w,h) (GST_VIDEO_I420_U_OFFSET(w,h)+(GST_VIDEO_I420_U_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2))
 
-#define GST_VIDEO_I420_SIZE(w,h)     (GST_VIDEO_I420_V_OFFSET(w,h)+(GST_VIDEO_I420_V_ROWSTRIDE(w)*ROUND_UP_2(h)/2))
+#define GST_VIDEO_I420_SIZE(w,h)     (GST_VIDEO_I420_V_OFFSET(w,h)+(GST_VIDEO_I420_V_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2))
 
 static gboolean
 gst_video_box_get_unit_size (GstBaseTransform * trans, GstCaps * caps,