configure.ac: Improve mpeg2enc detection. This is for distributions that do ship mjpegtools, but without mpeg2enc. Al...

Original commit message from CVS:
2003-12-21  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* configure.ac:
Improve mpeg2enc detection. This is for distributions that do
ship mjpegtools, but without mpeg2enc. Also does object check
for might there ever be ABI incompatibility.
* ext/mpeg2enc/gstmpeg2enc.cc:
Add Andrew as second maintainer (he's helping me), and also add
an error if no caps was set. This happens if I pull before capsnego
and that's something I should solve sometime else.
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_blockgroup):
Fix time parsing.
* gst/matroska/matroska-mux.c: (gst_matroska_mux_audio_pad_link),
(gst_matroska_mux_track_header):
Add caps to templates.
* gst/mpegaudioparse/gstmpegaudioparse.c: (mp3_sink_factory):
Add mpegversion=1 to prevent confusion with MPEG/AAC.
* gst/mpegstream/gstmpegdemux.c:
Remove layer since it causes warnings about unfixed caps.
* gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_get):
Fix obvious typo (we error out if caps were set, we should of
course error out if *no* caps were set).
* sys/oss/gstosselement.c: (gst_osselement_convert):
Fix format conversion, we confused bits/bytes.
* sys/oss/gstosselement.h:
Improve documentation for 'bps'.
* sys/v4l/TODO:
Remove stuff about plugins that need removing - this was done
ages ago.
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init),
(gst_v4lmjpegsrc_src_convert), (gst_v4lmjpegsrc_src_query):
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_init), (gst_v4lsrc_src_convert),
(gst_v4lsrc_src_query):
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_init),
(gst_v4l2src_src_convert), (gst_v4l2src_src_query):
Add get_query_types(), get_formats() and query() functions.

3 files changed, 99 insertions, 48 deletions

diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 03aff113..79321622 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -791,7 +791,7 @@ gst_osselement_convert (GstOssElement *oss,
 	  *dest_value = src_value * GST_SECOND / oss->bps;
           break;
         case GST_FORMAT_DEFAULT:
-	  *dest_value = src_value / (oss->channels * oss->width);
+	  *dest_value = src_value / (oss->width * oss->channels / 8);
           break;
         default:
           res = FALSE;
@@ -815,7 +815,7 @@ gst_osselement_convert (GstOssElement *oss,
 	  *dest_value = src_value * GST_SECOND / oss->rate;
           break;
         case GST_FORMAT_BYTES:
-	  *dest_value = src_value * oss->channels * oss->width;
+	  *dest_value = src_value * oss->width * oss->channels / 8;
           break;
         default:
           res = FALSE;
diff --git a/sys/oss/gstosselement.h b/sys/oss/gstosselement.h
index 2890c411..f9d8182e 100644
--- a/sys/oss/gstosselement.h
+++ b/sys/oss/gstosselement.h
@@ -69,7 +69,7 @@ struct _GstOssElement
   gint		 fragment_size;
   GstOssOpenMode mode;
 
-  /* stats */
+  /* stats bytes per *second* */
   guint		 bps;
 
   /* parameters */
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index c006dbc5..cd98162f 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -51,56 +51,67 @@ enum {
 	ARG_USE_FIXED_FPS
 };
 
+GST_FORMATS_FUNCTION (GstPad *, gst_v4l2src_get_formats,
+		      GST_FORMAT_TIME, GST_FORMAT_DEFAULT);
+GST_QUERY_TYPE_FUNCTION (GstPad *, gst_v4l2src_get_query_types,
+			 GST_QUERY_POSITION);
 
 /* init functions */
-static void			gst_v4l2src_class_init		(GstV4l2SrcClass *klass);
-static void			gst_v4l2src_base_init		(GstV4l2SrcClass *klass);
-static void			gst_v4l2src_init		(GstV4l2Src      *v4l2src);
+static void	gst_v4l2src_class_init		(GstV4l2SrcClass *klass);
+static void	gst_v4l2src_base_init		(GstV4l2SrcClass *klass);
+static void	gst_v4l2src_init		(GstV4l2Src      *v4l2src);
 
 /* signal functions */
-static void			gst_v4l2src_open		(GstElement      *element,
-								 const gchar     *device);
-static void			gst_v4l2src_close		(GstElement      *element,
-								 const gchar     *device);
-
-/* pad/buffer functions */
-static gboolean			gst_v4l2src_srcconvert		(GstPad          *pad,
-								 GstFormat       src_format,
-								 gint64          src_value,
-								 GstFormat       *dest_format,
-								 gint64          *dest_value);
-static GstPadLinkReturn		gst_v4l2src_srcconnect		(GstPad          *pad,
-								 GstCaps         *caps);
-static GstCaps *		gst_v4l2src_getcaps		(GstPad          *pad,
-								 GstCaps         *caps);
-static GstData *		gst_v4l2src_get			(GstPad          *pad);
+static void	gst_v4l2src_open		(GstElement      *element,
+						 const gchar     *device);
+static void	gst_v4l2src_close		(GstElement      *element,
+						 const gchar     *device);
+
+/* pad/info functions */
+static gboolean	gst_v4l2src_src_convert		(GstPad          *pad,
+						 GstFormat       src_format,
+						 gint64          src_value,
+						 GstFormat       *dest_format,
+						 gint64          *dest_value);
+static gboolean gst_v4l2src_src_query		(GstPad          *pad,
+						 GstQueryType    type, 
+						 GstFormat       *format,
+						 gint64          *value);
+
+/* buffer functions */
+static GstPadLinkReturn
+		gst_v4l2src_srcconnect		(GstPad          *pad,
+						 GstCaps         *caps);
+static GstCaps *gst_v4l2src_getcaps		(GstPad          *pad,
+						 GstCaps         *caps);
+static GstData *gst_v4l2src_get			(GstPad          *pad);
 
 /* get/set params */
-static void			gst_v4l2src_set_property	(GObject         *object,
-								 guint           prop_id,
-								 const GValue    *value,
-								 GParamSpec      *pspec);
-static void			gst_v4l2src_get_property	(GObject         *object,
-								 guint           prop_id,
-								 GValue          *value,
-								 GParamSpec      *pspec);
+static void	gst_v4l2src_set_property	(GObject         *object,
+						 guint           prop_id,
+						 const GValue    *value,
+						 GParamSpec      *pspec);
+static void	gst_v4l2src_get_property	(GObject         *object,
+						 guint           prop_id,
+						 GValue          *value,
+						 GParamSpec      *pspec);
 
 /* state handling */
-static GstElementStateReturn	gst_v4l2src_change_state	(GstElement      *element);
+static GstElementStateReturn
+		gst_v4l2src_change_state	(GstElement      *element);
 
 /* set_clock function for A/V sync */
-static void			gst_v4l2src_set_clock		(GstElement     *element,
-								 GstClock       *clock);
-
+static void	gst_v4l2src_set_clock		(GstElement     *element,
+						 GstClock       *clock);
 
 /* bufferpool functions */
-static GstBuffer *		gst_v4l2src_buffer_new		(GstBufferPool   *pool,
-								 guint64         offset,
-								 guint           size,
-								 gpointer        user_data);
-static void			gst_v4l2src_buffer_free		(GstBufferPool   *pool,
-								 GstBuffer       *buf,
-								 gpointer        user_data);
+static GstBuffer *gst_v4l2src_buffer_new	(GstBufferPool   *pool,
+						 guint64         offset,
+						 guint           size,
+						 gpointer        user_data);
+static void	gst_v4l2src_buffer_free		(GstBufferPool   *pool,
+						 GstBuffer       *buf,
+						 gpointer        user_data);
 
 
 static GstPadTemplate *src_template;
@@ -220,8 +231,14 @@ gst_v4l2src_init (GstV4l2Src *v4l2src)
 
 	gst_pad_set_get_function(v4l2src->srcpad, gst_v4l2src_get);
 	gst_pad_set_link_function(v4l2src->srcpad, gst_v4l2src_srcconnect);
-	gst_pad_set_convert_function (v4l2src->srcpad, gst_v4l2src_srcconvert);
 	gst_pad_set_getcaps_function (v4l2src->srcpad, gst_v4l2src_getcaps);
+	gst_pad_set_convert_function (v4l2src->srcpad, gst_v4l2src_src_convert);
+	gst_pad_set_formats_function (v4l2src->srcpad,
+				      gst_v4l2src_get_formats);
+	gst_pad_set_query_function (v4l2src->srcpad,
+				    gst_v4l2src_src_query);
+	gst_pad_set_query_type_function (v4l2src->srcpad,
+					 gst_v4l2src_get_query_types);
 
 	v4l2src->bufferpool = gst_buffer_pool_new(NULL, NULL,
 					gst_v4l2src_buffer_new,
@@ -290,13 +307,12 @@ gst_v4l2src_get_fps (GstV4l2Src *v4l2src)
 	return 0.;
 }
 
-
 static gboolean
-gst_v4l2src_srcconvert (GstPad    *pad,
-                        GstFormat  src_format,
-                        gint64     src_value,
-                        GstFormat *dest_format,
-                        gint64    *dest_value)
+gst_v4l2src_src_convert (GstPad    *pad,
+                         GstFormat  src_format,
+                         gint64     src_value,
+                         GstFormat *dest_format,
+                         gint64    *dest_value)
 {
 	GstV4l2Src *v4l2src;
 	gdouble fps;
@@ -334,6 +350,41 @@ gst_v4l2src_srcconvert (GstPad    *pad,
 	return TRUE;
 }
 
+static gboolean
+gst_v4l2src_src_query (GstPad      *pad,
+                       GstQueryType type, 
+                       GstFormat   *format,
+                       gint64      *value)
+{
+  GstV4l2Src *v4l2src = GST_V4L2SRC (gst_pad_get_parent (pad));
+  gboolean res = TRUE;
+  gdouble fps;
+
+  if ((fps = gst_v4l2src_get_fps(v4l2src)) == 0)
+    return FALSE;
+
+  switch (type) {
+    case GST_QUERY_POSITION:
+      switch (*format) {
+        case GST_FORMAT_TIME:
+          *value = v4l2src->handled * GST_SECOND / fps;
+          break;
+        case GST_FORMAT_DEFAULT:
+          *value = v4l2src->handled;
+          break;
+        default:
+          res = FALSE;
+          break;
+      }
+      break;
+    default:
+      res = FALSE;
+      break;
+  }
+
+  return res;
+}
+
 
 static GstCaps *
 gst_v4l2src_v4l2fourcc_to_caps (guint32        fourcc,