From ae91d7c7171c56667ec1b36ea2ecc17a76c4cff4 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 21 Dec 2003 18:44:34 +0000
Subject: 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.
---
 sys/oss/gstosselement.c | 4 ++--
 sys/oss/gstosselement.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/oss')

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 */
-- 
cgit