mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

aiffparse: Use gst_util_uint64_scale_ceil() instead of a custom function

Browse source
This commit is contained in:
Sebastian Dröge 2011-03-24 09:29:06 +01:00
parent 969578d84c
commit dbc2f7c4a8
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gst/aiff/aiffparse.c
View file

@ -204,25 +204,6 @@ gst_aiff_parse_init (GstAiffParse * aiffparse, GstAiffParseClass * g_class)
gst_element_add_pad (GST_ELEMENT_CAST (aiffparse), aiffparse->srcpad); gst_element_add_pad (GST_ELEMENT_CAST (aiffparse), aiffparse->srcpad);
} }
/* Compute (value * nom) % denom, avoiding overflow. This can be used
* to perform ceiling or rounding division together with
* gst_util_uint64_scale[_int]. */
#define uint64_scale_modulo(val, nom, denom) \
((val % denom) * (nom % denom) % denom)
/* Like gst_util_uint64_scale, but performs ceiling division. */
static guint64
uint64_ceiling_scale (guint64 val, guint64 num, guint64 denom)
{
guint64 result = gst_util_uint64_scale_int (val, num, denom);
if (uint64_scale_modulo (val, num, denom) == 0)
return result;
else
return result + 1;
}
static gboolean static gboolean
gst_aiff_parse_parse_file_header (GstAiffParse * aiff, GstBuffer * buf) gst_aiff_parse_parse_file_header (GstAiffParse * aiff, GstBuffer * buf)
{ {
@ -387,8 +368,8 @@ gst_aiff_parse_perform_seek (GstAiffParse * aiff, GstEvent * event)
* bytes. */ * bytes. */
if (aiff->bps > 0) if (aiff->bps > 0)
aiff->offset = aiff->offset =
uint64_ceiling_scale (seeksegment.last_stop, (guint64) aiff->bps, gst_util_uint64_scale_ceil (seeksegment.last_stop,
GST_SECOND); (guint64) aiff->bps, GST_SECOND);
else else
aiff->offset = seeksegment.last_stop; aiff->offset = seeksegment.last_stop;
GST_LOG_OBJECT (aiff, "offset=%" G_GUINT64_FORMAT, aiff->offset); GST_LOG_OBJECT (aiff, "offset=%" G_GUINT64_FORMAT, aiff->offset);
@ -404,7 +385,7 @@ gst_aiff_parse_perform_seek (GstAiffParse * aiff, GstEvent * event)
if (stop_type != GST_SEEK_TYPE_NONE) { if (stop_type != GST_SEEK_TYPE_NONE) {
if (aiff->bps > 0) if (aiff->bps > 0)
aiff->end_offset = aiff->end_offset =
uint64_ceiling_scale (stop, (guint64) aiff->bps, GST_SECOND); gst_util_uint64_scale_ceil (stop, (guint64) aiff->bps, GST_SECOND);
else else
aiff->end_offset = stop; aiff->end_offset = stop;
GST_LOG_OBJECT (aiff, "end_offset=%" G_GUINT64_FORMAT, aiff->end_offset); GST_LOG_OBJECT (aiff, "end_offset=%" G_GUINT64_FORMAT, aiff->end_offset);
@ -594,7 +575,8 @@ gst_aiff_parse_calculate_duration (GstAiffParse * aiff)
if (aiff->datasize > 0 && aiff->bps > 0) { if (aiff->datasize > 0 && aiff->bps > 0) {
aiff->duration = aiff->duration =
uint64_ceiling_scale (aiff->datasize, GST_SECOND, (guint64) aiff->bps); gst_util_uint64_scale_ceil (aiff->datasize, GST_SECOND,
(guint64) aiff->bps);
GST_INFO_OBJECT (aiff, "Got duration %" GST_TIME_FORMAT, GST_INFO_OBJECT (aiff, "Got duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (aiff->duration)); GST_TIME_ARGS (aiff->duration));
return TRUE; return TRUE;
@ -1123,9 +1105,10 @@ iterate_adapter:
if (aiff->bps > 0) { if (aiff->bps > 0) {
/* and timestamps if we have a bitrate, be careful for overflows */ /* and timestamps if we have a bitrate, be careful for overflows */
timestamp = uint64_ceiling_scale (pos, GST_SECOND, (guint64) aiff->bps); timestamp =
gst_util_uint64_scale_ceil (pos, GST_SECOND, (guint64) aiff->bps);
next_timestamp = next_timestamp =
uint64_ceiling_scale (nextpos, GST_SECOND, (guint64) aiff->bps); gst_util_uint64_scale_ceil (nextpos, GST_SECOND, (guint64) aiff->bps);
duration = next_timestamp - timestamp; duration = next_timestamp - timestamp;
/* update current running segment position */ /* update current running segment position */
@ -1345,7 +1328,7 @@ gst_aiff_parse_pad_convert (GstPad * pad,
break; break;
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (aiffparse->bps > 0) { if (aiffparse->bps > 0) {
*dest_value = uint64_ceiling_scale (src_value, GST_SECOND, *dest_value = gst_util_uint64_scale_ceil (src_value, GST_SECOND,
(guint64) aiffparse->bps); (guint64) aiffparse->bps);
break; break;
} }