[prev in list] [next in list] [prev in thread] [next in thread]
List: gstreamer-cvs
Subject: [gst-cvs] gst-plugins-bad: baseparse: reflow update_bitrate code
From: mnauw () kemper ! freedesktop ! org (Mark Nauwelaerts)
Date: 2010-10-29 12:20:53
Message-ID: 20101029122053.0DC0010056 () kemper ! freedesktop ! org
[Download RAW message or body]
Module: gst-plugins-bad
Branch: master
Commit: 61cf6f2ffa54b8bbd60f412a07297417da7e30fc
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=61cf6f2ffa54b8bbd60f412a07297417da7e30fc
Author: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Mon Oct 25 14:15:50 2010 +0200
baseparse: reflow update_bitrate code
... which makes local variables represent real state better, and avoids
triggering unneeded updates/actions.
---
gst/audioparsers/gstbaseparse.c | 42 ++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/gst/audioparsers/gstbaseparse.c b/gst/audioparsers/gstbaseparse.c
index 324cec9..fbbe30a 100644
--- a/gst/audioparsers/gstbaseparse.c
+++ b/gst/audioparsers/gstbaseparse.c
@@ -1140,27 +1140,30 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, \
GstBuffer * buffer) GST_LOG_OBJECT (parse, "frame bitrate %u, avg bitrate %u", \
frame_bitrate, parse->priv->avg_bitrate);
- if (frame_bitrate < parse->priv->min_bitrate) {
- parse->priv->min_bitrate = frame_bitrate;
- update_min = TRUE;
- }
-
- if (frame_bitrate > parse->priv->max_bitrate) {
- parse->priv->max_bitrate = frame_bitrate;
- update_max = TRUE;
- }
+ if (parse->priv->framecount < MIN_FRAMES_TO_POST_BITRATE) {
+ goto exit;
+ } else if (parse->priv->framecount == MIN_FRAMES_TO_POST_BITRATE) {
+ /* always post all at threshold time */
+ update_min = update_max = update_avg = TRUE;
+ } else {
+ if (frame_bitrate < parse->priv->min_bitrate) {
+ parse->priv->min_bitrate = frame_bitrate;
+ update_min = TRUE;
+ }
- old_avg_bitrate = parse->priv->posted_avg_bitrate;
- if ((gint) (old_avg_bitrate - parse->priv->avg_bitrate) > update_threshold ||
- (gint) (parse->priv->avg_bitrate - old_avg_bitrate) > update_threshold)
- update_avg = TRUE;
+ if (frame_bitrate > parse->priv->max_bitrate) {
+ parse->priv->max_bitrate = frame_bitrate;
+ update_max = TRUE;
+ }
- /* always post all at threshold time */
- if (parse->priv->framecount == MIN_FRAMES_TO_POST_BITRATE)
- gst_base_parse_post_bitrates (parse, TRUE, TRUE, TRUE);
+ old_avg_bitrate = parse->priv->posted_avg_bitrate;
+ if ((gint) (old_avg_bitrate - parse->priv->avg_bitrate) > update_threshold
+ || (gint) (parse->priv->avg_bitrate - old_avg_bitrate) >
+ update_threshold)
+ update_avg = TRUE;
+ }
- if (parse->priv->framecount > MIN_FRAMES_TO_POST_BITRATE &&
- (update_min || update_avg || update_max))
+ if ((update_min || update_avg || update_max))
gst_base_parse_post_bitrates (parse, update_min, update_avg, update_max);
/* If average bitrate changes that much and no valid (time) duration provided,
@@ -1170,6 +1173,9 @@ gst_base_parse_update_bitrates (GstBaseParse * parse, GstBuffer \
* buffer) GST_CLOCK_TIME_IS_VALID (parse->priv->duration)))
gst_element_post_message (GST_ELEMENT (parse),
gst_message_new_duration (GST_OBJECT (parse), GST_FORMAT_TIME, -1));
+
+exit:
+ return;
}
/**
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
gstreamer-cvs mailing list
gstreamer-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic