diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-03-29 17:21:50 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-03-29 17:21:50 +0200 |
| commit | 62d6c00ac9d0bb34343fb36e4e886b470bb3d899 (patch) | |
| tree | f6129c26e74814ee6194bc3dd895b634c3bcce9a /gst | |
| parent | 8effa9b92f3cb27b048f3278b14e39d5a5ddb0a2 (diff) | |
| download | gstreamer-plugins-good-62d6c00ac9d0bb34343fb36e4e886b470bb3d899.tar.gz | |
audiopanorama: fix supported template caps and sample processing
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/audiofx/audiopanorama.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/audiofx/audiopanorama.c b/gst/audiofx/audiopanorama.c index 6d4b62ab0..e8c312d75 100644 --- a/gst/audiofx/audiopanorama.c +++ b/gst/audiofx/audiopanorama.c @@ -94,11 +94,11 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " - "format = (string) { " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (S16) "}, " + "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, " "rate = (int) [ 1, MAX ], " "channels = (int) 1, " "layout = (string) interleaved;" "audio/x-raw, " - "format = (string) { " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (S16) "}, " + "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, " "rate = (int) [ 1, MAX ], " "channels = (int) 2, " "layout = (string) interleaved, " "channel-mask = (bitmask) 0x3") ); @@ -645,7 +645,9 @@ gst_audio_panorama_transform (GstBaseTransform * base, GstBuffer * inbuf, GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_GAP); memset (outmap.data, 0, outmap.size); } else { - guint num_samples = outmap.size / GST_AUDIO_INFO_BPF (&filter->info); + /* output always stereo, input mono or stereo, + * and info describes input format */ + guint num_samples = outmap.size / (2 * GST_AUDIO_INFO_BPS (&filter->info)); filter->process (filter, inmap.data, outmap.data, num_samples); } |