mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-13 02:45:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: Fix integer overflow in bitrate calculation

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=793284
This commit is contained in:
Nicolas Dufresne 2018-02-21 22:25:25 -05:00
parent a84b886a7d
commit 91798e16cc
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libs/gst/base/gstbaseparse.c
View file

@ -1796,7 +1796,9 @@ static void
gst_base_parse_update_bitrates (GstBaseParse * parse, GstBaseParseFrame * frame) gst_base_parse_update_bitrates (GstBaseParse * parse, GstBaseParseFrame * frame)
{ {
guint64 data_len, frame_dur; guint64 data_len, frame_dur;
gint overhead, frame_bitrate; gint overhead;
guint frame_bitrate;
guint64 frame_bitrate64;
GstBuffer *buffer = frame->buffer; GstBuffer *buffer = frame->buffer;
overhead = frame->overhead; overhead = frame->overhead;
@ -1809,11 +1811,17 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBaseParseFrame * frame)
/* duration should be valid by now, /* duration should be valid by now,
* either set by subclass or maybe based on fps settings */ * either set by subclass or maybe based on fps settings */
if (GST_BUFFER_DURATION_IS_VALID (buffer) && parse->priv->acc_duration != 0) { if (GST_BUFFER_DURATION_IS_VALID (buffer) && parse->priv->acc_duration != 0) {
guint64 avg_bitrate;
/* Calculate duration of a frame from buffer properties */ /* Calculate duration of a frame from buffer properties */
frame_dur = GST_BUFFER_DURATION (buffer); frame_dur = GST_BUFFER_DURATION (buffer);
parse->priv->avg_bitrate = (8 * parse->priv->data_bytecount * GST_SECOND) / avg_bitrate = gst_util_uint64_scale (GST_SECOND,
parse->priv->acc_duration; 8 * parse->priv->data_bytecount, parse->priv->acc_duration);
if (avg_bitrate > G_MAXUINT)
return;
parse->priv->avg_bitrate = avg_bitrate;
} else { } else {
/* No way to figure out frame duration (is this even possible?) */ /* No way to figure out frame duration (is this even possible?) */
return; return;
@ -1828,11 +1836,16 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBaseParseFrame * frame)
parse->priv->tags_changed = TRUE; parse->priv->tags_changed = TRUE;
} }
if (frame_dur) if (!frame_dur)
frame_bitrate = (8 * data_len * GST_SECOND) / frame_dur;
else
return; return;
frame_bitrate64 = gst_util_uint64_scale (GST_SECOND, 8 * data_len, frame_dur);
if (frame_bitrate64 > G_MAXUINT)
return;
frame_bitrate = (guint) frame_bitrate64;
GST_LOG_OBJECT (parse, "frame bitrate %u, avg bitrate %u", frame_bitrate, GST_LOG_OBJECT (parse, "frame bitrate %u, avg bitrate %u", frame_bitrate,
parse->priv->avg_bitrate); parse->priv->avg_bitrate);