mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseaudiosrc: don't try to fixate "width" field for alaw/mulaw

Browse source 
Fixes warning when trying to fixate e.g. pulsesrc ! audio/x-alaw ! fakesink.
This commit is contained in:
Tim-Philipp Müller 2011-09-10 18:30:55 +01:00
parent 76ed3fb04d
commit 55182ed841
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/audio/gstbaseaudiosrc.c
View file

@ -534,14 +534,17 @@ gst_base_audio_src_fixate (GstBaseSrc * bsrc, GstCaps * caps)
/* fields for all formats */ /* fields for all formats */
gst_structure_fixate_field_nearest_int (s, "rate", 44100); gst_structure_fixate_field_nearest_int (s, "rate", 44100);
gst_structure_fixate_field_nearest_int (s, "channels", 2); gst_structure_fixate_field_nearest_int (s, "channels", 2);
gst_structure_fixate_field_nearest_int (s, "width", 16);
/* fields for int */ /* fields for int and/or float, but maybe not others like alaw/mulaw */
if (gst_structure_has_field (s, "depth")) { if (gst_structure_has_field (s, "width")) {
gst_structure_get_int (s, "width", &width); gst_structure_fixate_field_nearest_int (s, "width", 16);
/* round width to nearest multiple of 8 for the depth */
depth = GST_ROUND_UP_8 (width); if (gst_structure_has_field (s, "depth")) {
gst_structure_fixate_field_nearest_int (s, "depth", depth); gst_structure_get_int (s, "width", &width);
/* round width to nearest multiple of 8 for the depth */
depth = GST_ROUND_UP_8 (width);
gst_structure_fixate_field_nearest_int (s, "depth", depth);
}
} }
if (gst_structure_has_field (s, "signed")) if (gst_structure_has_field (s, "signed"))
gst_structure_fixate_field_boolean (s, "signed", TRUE); gst_structure_fixate_field_boolean (s, "signed", TRUE);
@ -561,8 +564,7 @@ gst_base_audio_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
spec->latency_time = src->latency_time; spec->latency_time = src->latency_time;
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
if (!gst_ring_buffer_parse_caps (spec, caps)) if (!gst_ring_buffer_parse_caps (spec, caps)) {
{
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
goto parse_error; goto parse_error;
} }