mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulse: update for ring buffer audio format type enum rename

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-12-25 21:45:45 +00:00
parent bf4c6bd92b
commit 2799bcd32e
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/pulse/pulsesink.c
View file

@ -1713,10 +1713,10 @@ static GstBuffer *
gst_pulsesink_payload (GstAudioBaseSink * sink, GstBuffer * buf) gst_pulsesink_payload (GstAudioBaseSink * sink, GstBuffer * buf)
{ {
switch (sink->ringbuffer->spec.type) { switch (sink->ringbuffer->spec.type) {
case GST_BUFTYPE_AC3: case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3:
case GST_BUFTYPE_EAC3: case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3:
case GST_BUFTYPE_DTS: case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS:
case GST_BUFTYPE_MPEG: case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG:
{ {
/* FIXME: alloc memory from PA if possible */ /* FIXME: alloc memory from PA if possible */
gint framesize = gst_audio_iec61937_frame_size (&sink->ringbuffer->spec); gint framesize = gst_audio_iec61937_frame_size (&sink->ringbuffer->spec);

21
ext/pulse/pulseutil.c
View file

@ -136,13 +136,13 @@ gstaudioformat_to_pasampleformat (GstAudioFormat format,
gboolean gboolean
gst_pulse_fill_sample_spec (GstAudioRingBufferSpec * spec, pa_sample_spec * ss) gst_pulse_fill_sample_spec (GstAudioRingBufferSpec * spec, pa_sample_spec * ss)
{ {
if (spec->type == GST_BUFTYPE_RAW) { if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
if (!gstaudioformat_to_pasampleformat (GST_AUDIO_INFO_FORMAT (&spec->info), if (!gstaudioformat_to_pasampleformat (GST_AUDIO_INFO_FORMAT (&spec->info),
&ss->format)) &ss->format))
return FALSE; return FALSE;
} else if (spec->type == GST_BUFTYPE_MU_LAW) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW) {
ss->format = PA_SAMPLE_ULAW; ss->format = PA_SAMPLE_ULAW;
} else if (spec->type == GST_BUFTYPE_A_LAW) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW) {
ss->format = PA_SAMPLE_ALAW; ss->format = PA_SAMPLE_ALAW;
} else } else
return FALSE; return FALSE;
@ -166,24 +166,25 @@ gst_pulse_fill_format_info (GstAudioRingBufferSpec * spec, pa_format_info ** f,
format = pa_format_info_new (); format = pa_format_info_new ();
if (spec->type == GST_BUFTYPE_MU_LAW && GST_AUDIO_INFO_WIDTH (ainfo) == 8) { if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW
&& GST_AUDIO_INFO_WIDTH (ainfo) == 8) {
format->encoding = PA_ENCODING_PCM; format->encoding = PA_ENCODING_PCM;
sf = PA_SAMPLE_ULAW; sf = PA_SAMPLE_ULAW;
} else if (spec->type == GST_BUFTYPE_A_LAW } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW
&& GST_AUDIO_INFO_WIDTH (ainfo) == 8) { && GST_AUDIO_INFO_WIDTH (ainfo) == 8) {
format->encoding = PA_ENCODING_PCM; format->encoding = PA_ENCODING_PCM;
sf = PA_SAMPLE_ALAW; sf = PA_SAMPLE_ALAW;
} else if (spec->type == GST_BUFTYPE_RAW) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
format->encoding = PA_ENCODING_PCM; format->encoding = PA_ENCODING_PCM;
if (!gstaudioformat_to_pasampleformat (GST_AUDIO_INFO_FORMAT (ainfo), &sf)) if (!gstaudioformat_to_pasampleformat (GST_AUDIO_INFO_FORMAT (ainfo), &sf))
goto fail; goto fail;
} else if (spec->type == GST_BUFTYPE_AC3) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3) {
format->encoding = PA_ENCODING_AC3_IEC61937; format->encoding = PA_ENCODING_AC3_IEC61937;
} else if (spec->type == GST_BUFTYPE_EAC3) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3) {
format->encoding = PA_ENCODING_EAC3_IEC61937; format->encoding = PA_ENCODING_EAC3_IEC61937;
} else if (spec->type == GST_BUFTYPE_DTS) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS) {
format->encoding = PA_ENCODING_DTS_IEC61937; format->encoding = PA_ENCODING_DTS_IEC61937;
} else if (spec->type == GST_BUFTYPE_MPEG) { } else if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG) {
format->encoding = PA_ENCODING_MPEG_IEC61937; format->encoding = PA_ENCODING_MPEG_IEC61937;
} else { } else {
goto fail; goto fail;