summaryrefslogtreecommitdiffstats
path: root/gst/multipart/multipartmux.c
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2008-08-22 11:29:26 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2008-08-22 11:29:26 +0000
commita10d127c355c094aaa0c1890b001f9a833c926a7 (patch)
tree70853a0307ce5e93951b51123faae067f219e7d3 /gst/multipart/multipartmux.c
parentf209c1be01b142d06400e8db66f8bb52537d8972 (diff)
gst/multipart/: Conform to RFC2046. audio/basic is mulaw 8000Hz mono.
Original commit message from CVS: * gst/multipart/multipartdemux.c: * gst/multipart/multipartmux.c: Conform to RFC2046. audio/basic is mulaw 8000Hz mono.
Diffstat (limited to 'gst/multipart/multipartmux.c')
-rw-r--r--gst/multipart/multipartmux.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index 498f8252..a4a1300f 100644
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -291,6 +291,8 @@ gst_multipart_mux_get_mime (GstMultipartMux * mux, GstStructure * s)
GstMultipartMuxClass *klass;
const gchar *mime;
const gchar *name;
+ gint rate;
+ gint channels;
klass = GST_MULTIPART_MUX_GET_CLASS (mux);
@@ -302,6 +304,17 @@ gst_multipart_mux_get_mime (GstMultipartMux * mux, GstStructure * s)
/* no mime type mapping, use name */
mime = name;
}
+ /* RFC2046 requires audio/basic to be mulaw 8000Hz mono */
+ if (g_ascii_strcasecmp (mime, "audio/basic") == 0) {
+ if (gst_structure_get_int (s, "rate", &rate) &&
+ gst_structure_get_int (s, "channels", &channels)) {
+ if (rate != 8000 || channels != 1) {
+ mime = name;
+ }
+ } else {
+ mime = name;
+ }
+ }
return mime;
}