summaryrefslogtreecommitdiffstats
path: root/gst/wavparse
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-12-18 09:31:49 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-12-18 09:31:49 +0000
commit76a5c85de768c993780179b5492c3cdf4c478e6b (patch)
tree535a7b728791fff0ae46e14d9848b45f8fc2d101 /gst/wavparse
parent3bb5da14bb925eb010665bae929f619eee6e69fc (diff)
Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding...
Original commit message from CVS: Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding. This should fix mp3 playback.
Diffstat (limited to 'gst/wavparse')
-rw-r--r--gst/wavparse/gstwavparse.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 4031684b..cc550e88 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -97,6 +97,7 @@ GST_PAD_TEMPLATE_FACTORY (src_template_factory,
GST_CAPS_NEW (
"wavparse_mpeg",
"audio/mpeg",
+ "mpegversion", GST_PROPS_INT (1),
"rate", GST_PROPS_INT_RANGE (8000, 48000),
"channels", GST_PROPS_INT_RANGE (1, 2),
"layer", GST_PROPS_INT_RANGE (1, 3)
@@ -640,21 +641,21 @@ gst_wavparse_parse_fmt (GstWavParse *wavparse)
}
caps = GST_CAPS_NEW ("parsewav_src",
- mime,
- "rate", GST_PROPS_INT (wavparse->rate),
- "channels", GST_PROPS_INT (wavparse->channels)
+ mime,
+ "rate", GST_PROPS_INT (wavparse->rate),
+ "channels", GST_PROPS_INT (wavparse->channels)
);
}
case GST_RIFF_WAVE_FORMAT_PCM:
caps = GST_CAPS_NEW ("parsewav_src",
- "audio/x-raw-int",
- "endianness", GST_PROPS_INT (G_LITTLE_ENDIAN),
- "signed", GST_PROPS_BOOLEAN ((wavparse->width > 8) ? TRUE : FALSE),
- "width", GST_PROPS_INT (wavparse->width),
- "depth", GST_PROPS_INT (wavparse->width),
- "rate", GST_PROPS_INT (wavparse->rate),
- "channels", GST_PROPS_INT (wavparse->channels)
+ "audio/x-raw-int",
+ "endianness", GST_PROPS_INT (G_LITTLE_ENDIAN),
+ "signed", GST_PROPS_BOOLEAN ((wavparse->width > 8) ? TRUE : FALSE),
+ "width", GST_PROPS_INT (wavparse->width),
+ "depth", GST_PROPS_INT (wavparse->width),
+ "rate", GST_PROPS_INT (wavparse->rate),
+ "channels", GST_PROPS_INT (wavparse->channels)
);
break;
@@ -663,10 +664,11 @@ gst_wavparse_parse_fmt (GstWavParse *wavparse)
int layer = (wavparse->format == GST_RIFF_WAVE_FORMAT_MPEGL12) ? 2 : 3;
caps = GST_CAPS_NEW ("parsewav_src",
- "audio/mpeg",
- "layer", GST_PROPS_INT (layer),
- "rate", GST_PROPS_INT (wavparse->rate),
- "channels", GST_PROPS_INT (wavparse->channels)
+ "audio/mpeg",
+ "mpegversion", GST_PROPS_INT (1),
+ "layer", GST_PROPS_INT (layer),
+ "rate", GST_PROPS_INT (wavparse->rate),
+ "channels", GST_PROPS_INT (wavparse->channels)
);
}
break;