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

gst/audioconvert/gstaudioconvert.c: Previous fix was too simplistic, and broke the tests. Use a better approach; only...

Browse source 
Original commit message from CVS:
* gst/audioconvert/gstaudioconvert.c: (make_lossless_changes),
(strip_width_64), (append_with_other_format):
Previous fix was too simplistic, and broke the tests. Use a better
approach; only strip 64 from widths for integer audio.
This commit is contained in:
Michael Smith 2007-03-16 17:29:09 +00:00
parent 5759241eb4
commit 3bc107dd77
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-03-16 Michael Smith <msmith@fluendo.com>
* gst/audioconvert/gstaudioconvert.c: (make_lossless_changes),
(strip_width_64), (append_with_other_format):
Previous fix was too simplistic, and broke the tests. Use a better
approach; only strip 64 from widths for integer audio.
2007-03-16 Michael Smith <msmith@fluendo.com> 2007-03-16 Michael Smith <msmith@fluendo.com>
* gst/audioconvert/gstaudioconvert.c: (make_lossless_changes), * gst/audioconvert/gstaudioconvert.c: (make_lossless_changes),

30
gst/audioconvert/gstaudioconvert.c
View file

@ -380,7 +380,7 @@ static GstStructure *
make_lossless_changes (GstStructure * s, gboolean isfloat) make_lossless_changes (GstStructure * s, gboolean isfloat)
{ {
if (isfloat) { if (isfloat) {
/* float doesn't have a depth or signedness field and only supports a /* float doesn't have a depth or signedness field and only supports
* widths of 32/64 and native endianness */ * widths of 32/64 and native endianness */
gst_structure_remove_field (s, "depth"); gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "signed"); gst_structure_remove_field (s, "signed");
@ -413,13 +413,34 @@ make_lossless_changes (GstStructure * s, gboolean isfloat)
gst_structure_set_value (s, "signed", &list); gst_structure_set_value (s, "signed", &list);
g_value_unset (&val); g_value_unset (&val);
g_value_unset (&list); g_value_unset (&list);
/* We don't handle 64 bit integer audio, so we set the width here as well */
gst_structure_set (s, "width", G_TYPE_INT, 32, NULL);
} }
return s; return s;
} }
static void
strip_width_64 (GstStructure * s)
{
const GValue *v = gst_structure_get_value (s, "width");
GValue widths = { 0 };
if (GST_VALUE_HOLDS_LIST (v)) {
int i;
int len = gst_value_list_get_size (v);
g_value_init (&widths, GST_TYPE_LIST);
for (i = 0; i < len; i++) {
const GValue *width = gst_value_list_get_value (v, i);
if (g_value_get_int (width) != 64)
gst_value_list_append_value (&widths, width);
}
gst_structure_set_value (s, "width", &widths);
g_value_unset (&widths);
}
}
/* Little utility function to create a related structure for float/int */ /* Little utility function to create a related structure for float/int */
static void static void
append_with_other_format (GstCaps * caps, GstStructure * s, gboolean isfloat) append_with_other_format (GstCaps * caps, GstStructure * s, gboolean isfloat)
@ -430,6 +451,9 @@ append_with_other_format (GstCaps * caps, GstStructure * s, gboolean isfloat)
s2 = gst_structure_copy (s); s2 = gst_structure_copy (s);
gst_structure_set_name (s2, "audio/x-raw-int"); gst_structure_set_name (s2, "audio/x-raw-int");
s = make_lossless_changes (s2, FALSE); s = make_lossless_changes (s2, FALSE);
/* If 64 bit float was allowed; remove width 64: we don't support it for
* integer*/
strip_width_64 (s);
gst_caps_append_structure (caps, s2); gst_caps_append_structure (caps, s2);
} else { } else {
s2 = gst_structure_copy (s); s2 = gst_structure_copy (s);