mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-11 17:06:45 +00:00
Code Issues 1 Projects Releases Wiki Activity

alsa: fix negotiation

Browse source 
Don't assume the format is a string because now it is a list of string in the
template.
Chain up to the parent class implementation of get_caps.
This commit is contained in:
Wim Taymans 2011-11-10 16:02:01 +01:00
parent ea9bc40bf9
commit 3254e79f04
2 changed files with 62 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
ext/alsa/gstalsa.c
View file

@ -101,6 +101,48 @@ static const struct
32, 32, SND_PCM_FORMAT_S32, SND_PCM_FORMAT_U32}
};
static void
add_format (const gchar * str, GstStructure * s, snd_pcm_format_mask_t * mask,
GstCaps * caps)
{
GstStructure *scopy;
GstAudioFormat format;
const GstAudioFormatInfo *finfo;
gint w, width = 0, depth = 0;
format = gst_audio_format_from_string (str);
if (format == GST_AUDIO_FORMAT_UNKNOWN)
return;
finfo = gst_audio_format_get_info (format);
width = GST_AUDIO_FORMAT_INFO_WIDTH (finfo);
depth = GST_AUDIO_FORMAT_INFO_DEPTH (finfo);
for (w = 0; w < G_N_ELEMENTS (pcmformats); w++)
if (pcmformats[w].width == width && pcmformats[w].depth == depth)
break;
if (w == G_N_ELEMENTS (pcmformats))
return; /* Unknown format */
if (snd_pcm_format_mask_test (mask, pcmformats[w].sformat) &&
snd_pcm_format_mask_test (mask, pcmformats[w].uformat)) {
scopy = gst_structure_copy (s);
} else if (snd_pcm_format_mask_test (mask, pcmformats[w].sformat)) {
scopy = gst_structure_copy (s);
/* FIXME, remove unsigned version */
} else if (snd_pcm_format_mask_test (mask, pcmformats[w].uformat)) {
scopy = gst_structure_copy (s);
/* FIXME, remove signed version */
} else {
scopy = NULL;
}
if (scopy) {
gst_caps_append_structure (caps, scopy);
}
}
static GstCaps *
gst_alsa_detect_formats (GstObject * obj, snd_pcm_hw_params_t * hw_params,
GstCaps * in_caps)
@ -116,11 +158,7 @@ gst_alsa_detect_formats (GstObject * obj, snd_pcm_hw_params_t * hw_params,
caps = gst_caps_new_empty ();
for (i = 0; i < gst_caps_get_size (in_caps); ++i) {
GstStructure *scopy;
const gchar *str;
GstAudioFormat format;
const GstAudioFormatInfo *finfo;
gint w, width = 0, depth = 0;
const GValue *format;
s = gst_caps_get_structure (in_caps, i);
if (!gst_structure_has_name (s, "audio/x-raw")) {
@ -128,40 +166,25 @@ gst_alsa_detect_formats (GstObject * obj, snd_pcm_hw_params_t * hw_params,
continue;
}
str = gst_structure_get_string (s, "format");
if (str == NULL)
format = gst_structure_get_value (s, "format");
if (format == NULL)
continue;
format = gst_audio_format_from_string (str);
if (format == GST_AUDIO_FORMAT_UNKNOWN)
if (GST_VALUE_HOLDS_LIST (format)) {
gint i, len;
len = gst_value_list_get_size (format);
for (i = 0; i < len; i++) {
const GValue *val;
val = gst_value_list_get_value (format, i);
if (G_VALUE_HOLDS_STRING (val))
add_format (g_value_get_string (val), s, mask, caps);
}
} else if (G_VALUE_HOLDS_STRING (format)) {
add_format (g_value_get_string (format), s, mask, caps);
} else
continue;
finfo = gst_audio_format_get_info (format);
width = GST_AUDIO_FORMAT_INFO_WIDTH (finfo);
depth = GST_AUDIO_FORMAT_INFO_DEPTH (finfo);
for (w = 0; w < G_N_ELEMENTS (pcmformats); w++)
if (pcmformats[w].width == width && pcmformats[w].depth == depth)
break;
if (w == G_N_ELEMENTS (pcmformats))
continue; /* Unknown format */
if (snd_pcm_format_mask_test (mask, pcmformats[w].sformat) &&
snd_pcm_format_mask_test (mask, pcmformats[w].uformat)) {
scopy = gst_structure_copy (s);
} else if (snd_pcm_format_mask_test (mask, pcmformats[w].sformat)) {
scopy = gst_structure_copy (s);
/* FIXME, remove unsigned version */
} else if (snd_pcm_format_mask_test (mask, pcmformats[w].uformat)) {
scopy = gst_structure_copy (s);
/* FIXME, remove signed version */
} else {
scopy = NULL;
}
if (scopy) {
gst_caps_append_structure (caps, scopy);
}
}
snd_pcm_format_mask_free (mask);

4
ext/alsa/gstalsasrc.c
View file

@ -397,7 +397,7 @@ gst_alsasrc_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
if (src->handle == NULL) {
GST_DEBUG_OBJECT (src, "device not open, using template caps");
return NULL; /* base class will get template caps for us */
return GST_BASE_SRC_CLASS (parent_class)->get_caps (bsrc, filter);
}
if (src->cached_caps) {
@ -414,6 +414,8 @@ gst_alsasrc_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
g_return_val_if_fail (pad_template != NULL, NULL);
templ_caps = gst_pad_template_get_caps (pad_template);
GST_INFO_OBJECT (src, "template caps %" GST_PTR_FORMAT, templ_caps);
caps = gst_alsa_probe_supported_formats (GST_OBJECT (src), src->handle,
templ_caps);
gst_caps_unref (templ_caps);