diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-07-12 12:27:53 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-07-12 12:32:42 +0200 |
| commit | 8248ff823265c82bfdb7b41f46eaf9336f7dfe33 (patch) | |
| tree | 3f29b0029f535bd2426865e28c634b9b43250869 /ext | |
| parent | 3111161e8afe47de44aad8b3bbac659da185bad4 (diff) | |
| download | gstreamer-8248ff823265c82bfdb7b41f46eaf9336f7dfe33.tar.gz | |
pulse: relax mulaw and alaw format checks
The audio library considers them as encoded formats and does not fill in the
sample width. The audio ringbuffers identifies the format as alaw/mulaw and that
is always 8 bits.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pulse/pulseutil.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/pulse/pulseutil.c b/ext/pulse/pulseutil.c index a232c6ea38..9febb25040 100644 --- a/ext/pulse/pulseutil.c +++ b/ext/pulse/pulseutil.c @@ -146,12 +146,10 @@ gst_pulse_fill_format_info (GstAudioRingBufferSpec * spec, pa_format_info ** f, format = pa_format_info_new (); - if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW - && GST_AUDIO_INFO_WIDTH (ainfo) == 8) { + if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW) { format->encoding = PA_ENCODING_PCM; sf = PA_SAMPLE_ULAW; - } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW - && GST_AUDIO_INFO_WIDTH (ainfo) == 8) { + } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW) { format->encoding = PA_ENCODING_PCM; sf = PA_SAMPLE_ALAW; } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) { |