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

audio: use convert audio helper

Browse source
This commit is contained in:
Wim Taymans 2011-08-22 16:21:02 +02:00
parent c6758ecfa9
commit 2ce5c8b8be
2 changed files with 15 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
ext/vorbis/gstvorbisdec.c
View file

@ -81,7 +81,7 @@ static gboolean vorbis_dec_src_event (GstPad * pad, GstEvent * event);
static gboolean vorbis_dec_src_query (GstPad * pad, GstQuery * query);
static gboolean vorbis_dec_convert (GstPad * pad,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 * dest_value);
GstFormat dest_format, gint64 * dest_value);
static gboolean vorbis_dec_sink_query (GstPad * pad, GstQuery * query);
@ -200,13 +200,12 @@ gst_vorbis_dec_reset (GstVorbisDec * dec)
static gboolean
vorbis_dec_convert (GstPad * pad,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 * dest_value)
GstFormat dest_format, gint64 * dest_value)
{
gboolean res = TRUE;
GstVorbisDec *dec;
guint64 scale = 1;
if (src_format == *dest_format) {
if (src_format == dest_format) {
*dest_value = src_value;
return TRUE;
}
@ -217,52 +216,12 @@ vorbis_dec_convert (GstPad * pad,
goto no_header;
if (dec->sinkpad == pad &&
(src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES))
(src_format == GST_FORMAT_BYTES || dest_format == GST_FORMAT_BYTES))
goto no_format;
switch (src_format) {
case GST_FORMAT_TIME:
switch (*dest_format) {
case GST_FORMAT_BYTES:
scale = dec->info.bpf;
case GST_FORMAT_DEFAULT:
*dest_value =
scale * gst_util_uint64_scale_int (src_value, dec->vi.rate,
GST_SECOND);
break;
default:
res = FALSE;
}
break;
case GST_FORMAT_DEFAULT:
switch (*dest_format) {
case GST_FORMAT_BYTES:
*dest_value = src_value * dec->info.bpf;
break;
case GST_FORMAT_TIME:
*dest_value =
gst_util_uint64_scale_int (src_value, GST_SECOND, dec->vi.rate);
break;
default:
res = FALSE;
}
break;
case GST_FORMAT_BYTES:
switch (*dest_format) {
case GST_FORMAT_DEFAULT:
*dest_value = src_value / dec->info.bpf;
break;
case GST_FORMAT_TIME:
*dest_value = gst_util_uint64_scale_int (src_value, GST_SECOND,
dec->vi.rate * dec->info.bpf);
break;
default:
res = FALSE;
}
break;
default:
res = FALSE;
}
res = gst_audio_info_convert (&dec->info, src_format, src_value, dest_format,
dest_value);
done:
gst_object_unref (dec);
@ -312,7 +271,7 @@ vorbis_dec_src_query (GstPad * pad, GstQuery * query)
/* and convert to the final format */
if (!(res =
vorbis_dec_convert (pad, GST_FORMAT_TIME, time, &format, &value)))
vorbis_dec_convert (pad, GST_FORMAT_TIME, time, format, &value)))
goto error;
gst_query_set_position (query, format, value);
@ -338,7 +297,7 @@ vorbis_dec_src_query (GstPad * pad, GstQuery * query)
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
if (!(res =
vorbis_dec_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val)))
vorbis_dec_convert (pad, src_fmt, src_val, dest_fmt, &dest_val)))
goto error;
gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
break;
@ -376,7 +335,7 @@ vorbis_dec_sink_query (GstPad * pad, GstQuery * query)
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
if (!(res =
vorbis_dec_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val)))
vorbis_dec_convert (pad, src_fmt, src_val, dest_fmt, &dest_val)))
goto error;
gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
break;
@ -430,9 +389,9 @@ vorbis_dec_src_event (GstPad * pad, GstEvent * event)
/* First bring the requested format to time */
tformat = GST_FORMAT_TIME;
if (!(res = vorbis_dec_convert (pad, format, cur, &tformat, &tcur)))
if (!(res = vorbis_dec_convert (pad, format, cur, tformat, &tcur)))
goto convert_error;
if (!(res = vorbis_dec_convert (pad, format, stop, &tformat, &tstop)))
if (!(res = vorbis_dec_convert (pad, format, stop, tformat, &tstop)))
goto convert_error;
/* then seek with time on the peer */

33
gst/audiotestsrc/gstaudiotestsrc.c
View file

@ -316,38 +316,11 @@ gst_audio_test_src_query (GstBaseSrc * basesrc, GstQuery * query)
gint rate;
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
if (src_fmt == dest_fmt) {
dest_val = src_val;
goto done;
}
rate = GST_AUDIO_INFO_RATE (&src->info);
if (!gst_audio_info_convert (&src->info, src_fmt, src_val, dest_fmt,
dest_val))
goto error;
switch (src_fmt) {
case GST_FORMAT_DEFAULT:
switch (dest_fmt) {
case GST_FORMAT_TIME:
/* samples to time */
dest_val = gst_util_uint64_scale_int (src_val, GST_SECOND, rate);
break;
default:
goto error;
}
break;
case GST_FORMAT_TIME:
switch (dest_fmt) {
case GST_FORMAT_DEFAULT:
/* time to samples */
dest_val = gst_util_uint64_scale_int (src_val, rate, GST_SECOND);
break;
default:
goto error;
}
break;
default:
goto error;
}
done:
gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
res = TRUE;
break;