mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

oss: make sure 16-bit formats are before 8-bit formats in probed caps

Browse source 
Probe supported formats in order of desirability rather than in
what order they may happen to be in the formats bitmask. Fixes
accidentally exposure of 8-bit formats in caps before 16-bit formats
(in case where U16 was not supported S8 might be listed before S16).

https://bugzilla.gnome.org/show_bug.cgi?id=706884
This commit is contained in:
Tim-Philipp Müller 2014-06-13 09:45:28 +01:00
parent 0fb59dbdba
commit ffcb884551
1 changed files with 47 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
sys/oss/gstosshelper.c
View file

@ -81,75 +81,69 @@ static int gst_oss_helper_rate_int_compare (gconstpointer a, gconstpointer b);
GstCaps * GstCaps *
gst_oss_helper_probe_caps (gint fd) gst_oss_helper_probe_caps (gint fd)
{ {
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
const guint probe_formats[] = { AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 };
#else
const guint probe_formats[] = { AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 };
#endif
GstOssProbe *probe; GstOssProbe *probe;
int i; int i, f;
gboolean ret; gboolean ret;
GstStructure *structure; GstStructure *structure;
unsigned int format_bit;
unsigned int format_mask;
GstCaps *caps; GstCaps *caps;
/* FIXME test make sure we're not currently playing */ /* FIXME test make sure we're not currently playing */
/* FIXME test both mono and stereo */ /* FIXME test both mono and stereo */
format_mask = AFMT_U8 | AFMT_S8;
if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
format_mask |= AFMT_S16_LE | AFMT_U16_LE;
else
format_mask |= AFMT_S16_BE | AFMT_U16_BE;
caps = gst_caps_new_empty (); caps = gst_caps_new_empty ();
/* assume that the most significant bit of format_mask is 0 */ /* assume that the most significant bit of format_mask is 0 */
for (format_bit = 1 << 31; format_bit > 0; format_bit >>= 1) { for (f = 0; f < G_N_ELEMENTS (probe_formats); ++f) {
if (format_bit & format_mask) { GValue rate_value = { 0 };
GValue rate_value = { 0 };
probe = g_new0 (GstOssProbe, 1); probe = g_new0 (GstOssProbe, 1);
probe->fd = fd; probe->fd = fd;
probe->format = format_bit; probe->format = probe_formats[f];
/* FIXME: this is not working for all cards, see bug #518474 */ /* FIXME: this is not working for all cards, see bug #518474 */
probe->n_channels = 2; probe->n_channels = 2;
ret = gst_oss_helper_rate_probe_check (probe);
if (probe->min == -1 || probe->max == -1) {
g_array_free (probe->rates, TRUE);
g_free (probe);
continue;
}
if (ret) {
GValue value = { 0 };
g_array_sort (probe->rates, gst_oss_helper_rate_int_compare);
g_value_init (&rate_value, GST_TYPE_LIST);
g_value_init (&value, G_TYPE_INT);
for (i = 0; i < probe->rates->len; i++) {
g_value_set_int (&value, g_array_index (probe->rates, int, i));
gst_value_list_append_value (&rate_value, &value);
}
g_value_unset (&value);
} else {
/* one big range */
g_value_init (&rate_value, GST_TYPE_INT_RANGE);
gst_value_set_int_range (&rate_value, probe->min, probe->max);
}
ret = gst_oss_helper_rate_probe_check (probe);
if (probe->min == -1 || probe->max == -1) {
g_array_free (probe->rates, TRUE); g_array_free (probe->rates, TRUE);
g_free (probe); g_free (probe);
continue;
structure = gst_oss_helper_get_format_structure (format_bit);
gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
gst_structure_set_value (structure, "rate", &rate_value);
g_value_unset (&rate_value);
gst_caps_append_structure (caps, structure);
} }
if (ret) {
GValue value = { 0 };
g_array_sort (probe->rates, gst_oss_helper_rate_int_compare);
g_value_init (&rate_value, GST_TYPE_LIST);
g_value_init (&value, G_TYPE_INT);
for (i = 0; i < probe->rates->len; i++) {
g_value_set_int (&value, g_array_index (probe->rates, int, i));
gst_value_list_append_value (&rate_value, &value);
}
g_value_unset (&value);
} else {
/* one big range */
g_value_init (&rate_value, GST_TYPE_INT_RANGE);
gst_value_set_int_range (&rate_value, probe->min, probe->max);
}
g_array_free (probe->rates, TRUE);
g_free (probe);
structure = gst_oss_helper_get_format_structure (probe_formats[f]);
gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
gst_structure_set_value (structure, "rate", &rate_value);
g_value_unset (&rate_value);
gst_caps_append_structure (caps, structure);
} }
if (gst_caps_is_empty (caps)) { if (gst_caps_is_empty (caps)) {