summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-02 08:46:31 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-02 08:46:31 +0800
commit0c693997314f6d0e65b92e0ed3f4c4d5e7955481 (patch)
treea72bcde07d09f9e75901ea76008d93b69036910c
parente4ffdde8aa579077b4e7836a52f48e5ecdb77acf (diff)
downloadmarcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar.gz
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar.bz2
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar.lz
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar.xz
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.tar.zst
marcuscom-ports-0c693997314f6d0e65b92e0ed3f4c4d5e7955481.zip
The 32-bit audio patches are not needed since the sound is resampled before
sending it to the sink. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5997 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c73
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssink.c25
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssrc.c25
3 files changed, 0 insertions, 123 deletions
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 579a1434b..c39b2e9c3 100644
--- a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c
+++ b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c
@@ -1,78 +1,5 @@
--- sys/oss/gstosshelper.c.orig Sat Apr 1 18:22:31 2006
+++ sys/oss/gstosshelper.c Sat Apr 1 18:22:38 2006
-@@ -102,6 +102,21 @@ gst_oss_helper_probe_caps (gint fd)
- else
- format_mask |= AFMT_S16_BE | AFMT_U16_BE;
-
-+#if defined(AFMT_S24_LE)
-+ if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
-+ format_mask |= AFMT_S24_LE | AFMT_U24_LE;
-+ else
-+ format_mask |= AFMT_S24_BE | AFMT_U24_BE;
-+#endif
-+
-+#if defined(AFMT_S32_LE)
-+ if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
-+ format_mask |= AFMT_S32_LE | AFMT_U32_LE;
-+ else
-+ format_mask |= AFMT_S32_BE | AFMT_U32_BE;
-+#endif
-+
-+
- caps = gst_caps_new_empty ();
-
- /* assume that the most significant bit of format_mask is 0 */
-@@ -202,6 +217,50 @@ gst_oss_helper_get_format_structure (uns
- sign = FALSE;
- width = 16;
- break;
-+#if defined(AFMT_S24_LE)
-+ case AFMT_S24_LE:
-+ endianness = G_LITTLE_ENDIAN;
-+ sign = TRUE;
-+ width = 24;
-+ break;
-+ case AFMT_S24_BE:
-+ endianness = G_BIG_ENDIAN;
-+ sign = TRUE;
-+ width = 24;
-+ break;
-+ case AFMT_U24_LE:
-+ endianness = G_LITTLE_ENDIAN;
-+ sign = FALSE;
-+ width = 24;
-+ break;
-+ case AFMT_U24_BE:
-+ endianness = G_BIG_ENDIAN;
-+ sign = FALSE;
-+ width = 24;
-+ break;
-+#endif
-+#if defined(AFMT_S32_LE)
-+ case AFMT_S32_LE:
-+ endianness = G_LITTLE_ENDIAN;
-+ sign = TRUE;
-+ width = 32;
-+ break;
-+ case AFMT_S32_BE:
-+ endianness = G_BIG_ENDIAN;
-+ sign = TRUE;
-+ width = 32;
-+ break;
-+ case AFMT_U32_LE:
-+ endianness = G_LITTLE_ENDIAN;
-+ sign = FALSE;
-+ width = 32;
-+ break;
-+ case AFMT_U32_BE:
-+ endianness = G_BIG_ENDIAN;
-+ sign = FALSE;
-+ width = 32;
-+ break;
-+#endif
- default:
- g_assert_not_reached ();
- return NULL;
@@ -232,6 +291,11 @@ gst_oss_helper_rate_probe_check (GstOssP
probe->rates = g_array_new (FALSE, FALSE, sizeof (int));
diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssink.c b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssink.c
deleted file mode 100644
index 98ab012a1..000000000
--- a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssink.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- sys/oss/gstosssink.c.orig Sat Apr 1 18:22:44 2006
-+++ sys/oss/gstosssink.c Sat Apr 1 18:23:25 2006
-@@ -98,6 +98,22 @@ static GstStaticPadTemplate osssink_sink
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw-int, "
-+#if defined(AFMT_S32_LE)
-+ "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
-+ "signed = (boolean) { TRUE, FALSE }, "
-+ "width = (int) 32, "
-+ "depth = (int) 32, "
-+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
-+ "audio/x-raw-int, "
-+#endif
-+#if defined(AFMT_S24_LE)
-+ "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
-+ "signed = (boolean) { TRUE, FALSE }, "
-+ "width = (int) 24, "
-+ "depth = (int) 24, "
-+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
-+ "audio/x-raw-int, "
-+#endif
- "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
- "signed = (boolean) { TRUE, FALSE }, "
- "width = (int) 16, "
diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssrc.c b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssrc.c
deleted file mode 100644
index f7132a42e..000000000
--- a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosssrc.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- sys/oss/gstosssrc.c.orig Sat Apr 1 18:22:52 2006
-+++ sys/oss/gstosssrc.c Sat Apr 1 18:22:56 2006
-@@ -94,6 +94,22 @@ static GstStaticPadTemplate osssrc_src_f
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw-int, "
-+#if defined(AFMT_S32_LE)
-+ "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
-+ "signed = (boolean) { TRUE, FALSE }, "
-+ "width = (int) 32, "
-+ "depth = (int) 32, "
-+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
-+ "audio/x-raw-int, "
-+#endif
-+#if defined(AFMT_S24_LE)
-+ "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
-+ "signed = (boolean) { TRUE, FALSE }, "
-+ "width = (int) 24, "
-+ "depth = (int) 24, "
-+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
-+ "audio/x-raw-int, "
-+#endif
- "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
- "signed = (boolean) { TRUE, FALSE }, "
- "width = (int) 16, "