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

ext/mad/gstmad.c: .. and DEFAULT queries should work too. Use magic gst util scale functions in some places.

Browse source 
Original commit message from CVS:
* ext/mad/gstmad.c: (gst_mad_convert_sink), (gst_mad_convert_src),
(gst_mad_src_query), (gst_mad_chain):
.. and DEFAULT queries should work too. Use magic gst util scale
functions in some places.
This commit is contained in:
Tim-Philipp Müller 2006-04-21 20:37:43 +00:00
parent bb88d43290
commit 84d42edc7f
2 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-21 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (gst_mad_convert_sink), (gst_mad_convert_src),
(gst_mad_src_query), (gst_mad_chain):
.. and DEFAULT queries should work too. Use magic gst util scale
functions in some places.
2006-04-21 Tim-Philipp Müller <tim at centricular dot net> 2006-04-21 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (gst_mad_src_query): * ext/mad/gstmad.c: (gst_mad_src_query):

57
ext/mad/gstmad.c
View file

@ -437,6 +437,11 @@ gst_mad_convert_sink (GstPad * pad, GstFormat src_format, gint64 src_value,
gboolean res = TRUE; gboolean res = TRUE;
GstMad *mad; GstMad *mad;
if (src_format == *dest_format) {
*dest_value = src_value;
return TRUE;
}
mad = GST_MAD (GST_PAD_PARENT (pad)); mad = GST_MAD (GST_PAD_PARENT (pad));
if (mad->vbr_average == 0) if (mad->vbr_average == 0)
@ -480,6 +485,11 @@ gst_mad_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
gint bytes_per_sample; gint bytes_per_sample;
GstMad *mad; GstMad *mad;
if (src_format == *dest_format) {
*dest_value = src_value;
return TRUE;
}
mad = GST_MAD (GST_PAD_PARENT (pad)); mad = GST_MAD (GST_PAD_PARENT (pad));
bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) * 4; bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) * 4;
@ -498,7 +508,8 @@ gst_mad_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
if (byterate == 0) if (byterate == 0)
return FALSE; return FALSE;
*dest_value = src_value * GST_SECOND / byterate; *dest_value =
gst_util_uint64_scale_int (src_value, GST_SECOND, byterate);
break; break;
} }
default: default:
@ -513,7 +524,8 @@ gst_mad_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (mad->frame.header.samplerate == 0) if (mad->frame.header.samplerate == 0)
return FALSE; return FALSE;
*dest_value = src_value * GST_SECOND / mad->frame.header.samplerate; *dest_value = gst_util_uint64_scale_int (src_value, GST_SECOND,
mad->frame.header.samplerate);
break; break;
default: default:
res = FALSE; res = FALSE;
@ -525,8 +537,8 @@ gst_mad_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
scale = bytes_per_sample; scale = bytes_per_sample;
/* fallthrough */ /* fallthrough */
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_value = *dest_value = gst_util_uint64_scale_int (src_value,
src_value * scale * mad->frame.header.samplerate / GST_SECOND; scale * mad->frame.header.samplerate, GST_SECOND);
break; break;
default: default:
res = FALSE; res = FALSE;
@ -600,6 +612,7 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
case GST_QUERY_DURATION: case GST_QUERY_DURATION:
{ {
GstFormat bytes_format = GST_FORMAT_BYTES; GstFormat bytes_format = GST_FORMAT_BYTES;
GstFormat time_format = GST_FORMAT_TIME;
GstFormat req_format; GstFormat req_format;
gint64 total, total_bytes; gint64 total, total_bytes;
@ -624,24 +637,19 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
goto error; goto error;
} }
GST_LOG_OBJECT (mad, "peer pad returned total=%lld bytes", total_bytes); GST_LOG_OBJECT (mad, "peer pad returned total=%" G_GINT64_FORMAT
" bytes", total_bytes);
if (req_format != GST_FORMAT_BYTES) { if (!gst_mad_convert_sink (pad, GST_FORMAT_BYTES, total_bytes,
if (!gst_mad_convert_sink (pad, GST_FORMAT_BYTES, total_bytes, &time_format, &total)) {
&req_format, &total)) { GST_DEBUG_OBJECT (mad, "conversion BYTE => TIME failed");
goto error; goto error;
} }
} else { if (!gst_mad_convert_src (pad, GST_FORMAT_TIME, total,
GstFormat tformat = GST_FORMAT_TIME; &req_format, &total)) {
GST_DEBUG_OBJECT (mad, "conversion TIME => %s failed",
/* bytes means different things on source and sink gst_format_get_name (req_format));
* pad, so we need to do two conversions here */ goto error;
if (!gst_mad_convert_sink (pad, GST_FORMAT_BYTES, total_bytes,
&tformat, &total) ||
!gst_mad_convert_src (pad, GST_FORMAT_TIME, total,
&req_format, &total)) {
goto error;
}
} }
gst_query_set_duration (query, req_format, total); gst_query_set_duration (query, req_format, total);
@ -1545,8 +1553,11 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
mad->total_samples = total; mad->total_samples = total;
mad->last_ts = GST_CLOCK_TIME_NONE; mad->last_ts = GST_CLOCK_TIME_NONE;
} }
time_offset = mad->total_samples * (GST_SECOND / mad->rate); time_offset =
time_duration = (nsamples * (GST_SECOND / mad->rate)); gst_util_uint64_scale_int (mad->total_samples, GST_SECOND,
mad->rate);
time_duration =
gst_util_uint64_scale_int (nsamples, GST_SECOND, mad->rate);
} }
if (mad->index) { if (mad->index) {