mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

alsa: if no formats in native endianness could be detected, try non-native endianness as well

Browse source 
This can happen, e.g. when using an USB sound card on
a big-endian device

https://bugzilla.gnome.org/show_bug.cgi?id=680904
This commit is contained in:
Tim-Philipp Müller 2012-10-18 00:39:42 +01:00
parent 1e329bb4f4
commit 1a69ec3fd3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/alsa/gstalsa.c
View file

@ -497,10 +497,20 @@ gst_alsa_probe_supported_formats (GstObject * obj, gchar * device,
stream_type = snd_pcm_stream (handle); stream_type = snd_pcm_stream (handle);
caps = gst_caps_copy (template_caps); caps = gst_alsa_detect_formats (obj, hw_params,
gst_caps_copy (template_caps), G_BYTE_ORDER);
if (!(caps = gst_alsa_detect_formats (obj, hw_params, caps, G_BYTE_ORDER))) /* if there are no formats in native endianness, try non-native as well */
goto subroutine_error; if (caps == NULL) {
GST_INFO_OBJECT (obj, "no formats in native endianness detected");
caps = gst_alsa_detect_formats (obj, hw_params,
gst_caps_copy (template_caps),
(G_BYTE_ORDER == G_LITTLE_ENDIAN) ? G_BIG_ENDIAN : G_LITTLE_ENDIAN);
if (caps == NULL)
goto subroutine_error;
}
if (!(caps = gst_alsa_detect_rates (obj, hw_params, caps))) if (!(caps = gst_alsa_detect_rates (obj, hw_params, caps)))
goto subroutine_error; goto subroutine_error;
@ -533,7 +543,7 @@ subroutine_error:
{ {
GST_ERROR_OBJECT (obj, "failed to query formats"); GST_ERROR_OBJECT (obj, "failed to query formats");
snd_pcm_hw_params_free (hw_params); snd_pcm_hw_params_free (hw_params);
gst_caps_unref (caps); gst_caps_replace (&caps, NULL);
return NULL; return NULL;
} }
} }