From: Tim-Philipp Müller <tim@centricular.net>
Date: Mon, 24 Oct 2005 15:57:17 +0000 (+0000)
Subject: sys/oss/gstosssrc.c: Set bytes_per_sample correctly (is not always 4, but depends... 
X-Git-Tag: RELEASE-0_9_5~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e01f91dc1e12f54c5e273d78a51eaf19b5234d2;p=platform%2Fupstream%2Fgst-plugins-good.git

sys/oss/gstosssrc.c: Set bytes_per_sample correctly (is not always 4, but depends on width and number of channels).

Original commit message from CVS:
* sys/oss/gstosssrc.c: (gst_oss_src_prepare):
Set bytes_per_sample correctly (is not always 4, but
depends on width and number of channels).
---

diff --git a/ChangeLog b/ChangeLog
index 5f35c0164..0d60da63d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/oss/gstosssrc.c: (gst_oss_src_prepare):
+	  Set bytes_per_sample correctly (is not always 4, but 
+	  depends on width and number of channels).
+
 2005-10-24  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/flac/gstflacenc.c: (gst_flacenc_base_init),
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 6c2f70082..bb5d7caa7 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -389,8 +389,12 @@ gst_oss_src_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
 
   spec->segsize = info.fragsize;
   spec->segtotal = info.fragstotal;
-  spec->bytes_per_sample = 4;
-  oss->bytes_per_sample = 4;
+
+  if (spec->width != 16 && spec->width != 8)
+    goto dodgy_width;
+
+  spec->bytes_per_sample = (spec->width / 8) * spec->channels;
+  oss->bytes_per_sample = (spec->width / 8) * spec->channels;
   memset (spec->silence_sample, 0, spec->bytes_per_sample);
 
   GST_DEBUG ("got segsize: %d, segtotal: %d, value: %08x", spec->segsize,
@@ -411,6 +415,12 @@ wrong_format:
         ("Unable to get format %d", spec->format), (NULL));
     return FALSE;
   }
+dodgy_width:
+  {
+    GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
+        ("Unexpected width %d", spec->width), (NULL));
+    return FALSE;
+  }
 }
 
 static gboolean