diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-04-02 15:33:42 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-04-02 15:33:42 +0800 |
| commit | 5ae284412dd857d742099dd96e4ede3e60e44fe0 (patch) | |
| tree | 0eeea8cdbf40cb097351f610626e8c83f5926c5c /multimedia | |
| parent | 17c6e0e59ebb80971bbaef8e66b3050fe87dabda (diff) | |
| download | marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar.gz marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar.bz2 marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar.lz marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar.xz marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.tar.zst marcuscom-ports-5ae284412dd857d742099dd96e4ede3e60e44fe0.zip | |
Instead of the nasty hard-coded hack to work around the sample rate problem,
use a more flexible approach that still allows gst to do rate auto-detection.
Suggested by: ariff
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5999 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer-plugins-good/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c | 38 |
2 files changed, 20 insertions, 22 deletions
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile index c0f88587b..8edf5c169 100644 --- a/multimedia/gstreamer-plugins-good/Makefile +++ b/multimedia/gstreamer-plugins-good/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.3 2006/04/01 23:27:58 marcus Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.4 2006/04/02 00:13:43 marcus Exp $ # -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia COMMENT= Good gstreamer-plugins diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c index c39b2e9c3..34fdd3119 100644 --- a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c +++ b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c @@ -1,22 +1,20 @@ ---- sys/oss/gstosshelper.c.orig Sat Apr 1 18:22:31 2006 -+++ sys/oss/gstosshelper.c Sat Apr 1 18:22:38 2006 -@@ -232,6 +291,11 @@ gst_oss_helper_rate_probe_check (GstOssP +--- sys/oss/gstosshelper.c.orig Sun Apr 2 03:23:53 2006 ++++ sys/oss/gstosshelper.c Sun Apr 2 03:25:44 2006 +@@ -343,13 +344,17 @@ gst_oss_helper_rate_check_rate (GstOssPr + int format; + int n_channels; + int ret; ++ int rst; - probe->rates = g_array_new (FALSE, FALSE, sizeof (int)); + rate = irate; + format = probe->format; + n_channels = probe->n_channels; ++ rst = 4000; /* XXX Lowest supported rate for FreeBSD. */ -+ probe->min = 8000; -+ probe->max = 100000; -+ result = FALSE; -+ goto out; -+ - probe->min = gst_oss_helper_rate_check_rate (probe, 1000); - n_checks++; - probe->max = gst_oss_helper_rate_check_rate (probe, 100000); -@@ -312,6 +376,7 @@ gst_oss_helper_rate_probe_check (GstOssP - - g_free (range); - } -+out: - - while ((range = g_queue_pop_head (ranges))) { - g_free (range); + GST_LOG ("checking format %d, channels %d, rate %d", + format, n_channels, rate); ++ /* Reset rate to lowest supported rate. */ ++ ioctl (probe->fd, SNDCTL_DSP_SPEED, &rst); + ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format); + if (ret < 0) + return -1; |