From 0e01f91dc1e12f54c5e273d78a51eaf19b5234d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 24 Oct 2005 15:57:17 +0000 Subject: [PATCH] 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). --- ChangeLog | 6 ++++++ sys/oss/gstosssrc.c | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f35c01..0d60da6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-10-24 Tim-Philipp Müller + * 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 + * ext/flac/gstflacenc.c: (gst_flacenc_base_init), (gst_flacenc_init), (gst_flacenc_sink_setcaps), (gst_flacenc_seek_callback), (gst_flacenc_write_callback), diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 6c2f700..bb5d7ca 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 -- 2.7.4