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

baseparse: fix bitrate copy-and-paste and update heuristic

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-09-20 13:30:54 +02:00 committed by Tim-Philipp Müller
parent fea135b3de
commit 723059c688
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/audioparsers/gstbaseparse.c
View file

@ -241,6 +241,7 @@ struct _GstBaseParsePrivate
guint min_bitrate; guint min_bitrate;
guint avg_bitrate; guint avg_bitrate;
guint max_bitrate; guint max_bitrate;
guint posted_avg_bitrate;
GList *pending_events; GList *pending_events;
@ -888,9 +889,11 @@ gst_base_parse_post_bitrates (GstBaseParse * parse, gboolean post_min,
gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_MINIMUM_BITRATE, parse->priv->min_bitrate, NULL); GST_TAG_MINIMUM_BITRATE, parse->priv->min_bitrate, NULL);
if (post_avg && parse->priv->post_min_bitrate) if (post_avg && parse->priv->post_avg_bitrate) {
parse->priv->posted_avg_bitrate = parse->priv->avg_bitrate;
gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE, gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE,
parse->priv->avg_bitrate, NULL); parse->priv->avg_bitrate, NULL);
}
if (post_max && parse->priv->post_max_bitrate) if (post_max && parse->priv->post_max_bitrate)
gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE,
@ -919,7 +922,7 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBuffer * buffer)
GstBaseParseClass *klass; GstBaseParseClass *klass;
guint64 data_len, frame_dur; guint64 data_len, frame_dur;
gint overhead = 0, frame_bitrate, old_avg_bitrate = parse->priv->avg_bitrate; gint overhead = 0, frame_bitrate, old_avg_bitrate;
gboolean update_min = FALSE, update_avg = FALSE, update_max = FALSE; gboolean update_min = FALSE, update_avg = FALSE, update_max = FALSE;
klass = GST_BASE_PARSE_GET_CLASS (parse); klass = GST_BASE_PARSE_GET_CLASS (parse);
@ -957,6 +960,9 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBuffer * buffer)
frame_bitrate = (8 * data_len * GST_SECOND) / frame_dur; frame_bitrate = (8 * data_len * GST_SECOND) / frame_dur;
GST_LOG_OBJECT (parse, "frame bitrate %u, avg bitrate %u", frame_bitrate,
parse->priv->avg_bitrate);
if (frame_bitrate < parse->priv->min_bitrate) { if (frame_bitrate < parse->priv->min_bitrate) {
parse->priv->min_bitrate = frame_bitrate; parse->priv->min_bitrate = frame_bitrate;
update_min = TRUE; update_min = TRUE;
@ -967,11 +973,16 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBuffer * buffer)
update_max = TRUE; update_max = TRUE;
} }
if (old_avg_bitrate / update_threshold != old_avg_bitrate = parse->priv->posted_avg_bitrate;
parse->priv->avg_bitrate / update_threshold) if ((gint) (old_avg_bitrate - parse->priv->avg_bitrate) > update_threshold ||
(gint) (parse->priv->avg_bitrate - old_avg_bitrate) > update_threshold)
update_avg = TRUE; update_avg = TRUE;
if (parse->priv->framecount >= MIN_FRAMES_TO_POST_BITRATE && /* always post all at threshold time */
if (parse->priv->framecount == MIN_FRAMES_TO_POST_BITRATE)
gst_base_parse_post_bitrates (parse, TRUE, TRUE, TRUE);
if (parse->priv->framecount > MIN_FRAMES_TO_POST_BITRATE &&
(update_min || update_avg || update_max)) (update_min || update_avg || update_max))
gst_base_parse_post_bitrates (parse, update_min, update_avg, update_max); gst_base_parse_post_bitrates (parse, update_min, update_avg, update_max);
@ -1639,7 +1650,8 @@ gst_base_parse_activate (GstBaseParse * parse, gboolean active)
parse->priv->post_max_bitrate = TRUE; parse->priv->post_max_bitrate = TRUE;
parse->priv->min_bitrate = G_MAXUINT; parse->priv->min_bitrate = G_MAXUINT;
parse->priv->max_bitrate = 0; parse->priv->max_bitrate = 0;
parse->priv->max_bitrate = 0; parse->priv->avg_bitrate = 0;
parse->priv->posted_avg_bitrate = 0;
if (parse->pending_segment) if (parse->pending_segment)
gst_event_unref (parse->pending_segment); gst_event_unref (parse->pending_segment);