a93a93d007
Bug 1495 - Timelines run 4% short Previously the timelines were timed by calculating the interval between each frame stored as an integer number of milliseconds so some precision is lost. For example, requesting 60 frames per second gets converted to 16 ms per frame which is actually 62.5 frames per second. This makes the timeline shorter by 4%. This patch merges the common code for timing from the timeout pools and frame sources into an internal clutter-timeout-interval file. This stores the interval directly as the FPS and counts the number of frames that have been reached instead of the elapsed time.
161 lines
5 KiB
C
161 lines
5 KiB
C
/*
|
|
* Clutter.
|
|
*
|
|
* An OpenGL based 'interactive canvas' library.
|
|
*
|
|
* Authored By Neil Roberts <neil@linux.intel.com>
|
|
*
|
|
* Copyright (C) 2008 OpenedHand
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "clutter-frame-source.h"
|
|
#include "clutter-timeout-interval.h"
|
|
|
|
typedef struct _ClutterFrameSource ClutterFrameSource;
|
|
|
|
struct _ClutterFrameSource
|
|
{
|
|
GSource source;
|
|
|
|
ClutterTimeoutInterval timeout;
|
|
};
|
|
|
|
static gboolean clutter_frame_source_prepare (GSource *source, gint *timeout);
|
|
static gboolean clutter_frame_source_check (GSource *source);
|
|
static gboolean clutter_frame_source_dispatch (GSource *source,
|
|
GSourceFunc callback,
|
|
gpointer user_data);
|
|
|
|
static GSourceFuncs clutter_frame_source_funcs =
|
|
{
|
|
clutter_frame_source_prepare,
|
|
clutter_frame_source_check,
|
|
clutter_frame_source_dispatch,
|
|
NULL
|
|
};
|
|
|
|
/**
|
|
* clutter_frame_source_add_full:
|
|
* @priority: the priority of the frame source. Typically this will be in the
|
|
* range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
|
|
* @fps: the number of times per second to call the function
|
|
* @func: function to call
|
|
* @data: data to pass to the function
|
|
* @notify: function to call when the timeout source is removed
|
|
*
|
|
* Sets a function to be called at regular intervals with the given
|
|
* priority. The function is called repeatedly until it returns
|
|
* %FALSE, at which point the timeout is automatically destroyed and
|
|
* the function will not be called again. The @notify function is
|
|
* called when the timeout is destroyed. The first call to the
|
|
* function will be at the end of the first @interval.
|
|
*
|
|
* This function is similar to g_timeout_add_full() except that it
|
|
* will try to compensate for delays. For example, if @func takes half
|
|
* the interval time to execute then the function will be called again
|
|
* half the interval time after it finished. In contrast
|
|
* g_timeout_add_full() would not fire until a full interval after the
|
|
* function completes so the delay between calls would be 1.0 / @fps *
|
|
* 1.5. This function does not however try to invoke the function
|
|
* multiple times to catch up missing frames if @func takes more than
|
|
* @interval ms to execute.
|
|
*
|
|
* Return value: the ID (greater than 0) of the event source.
|
|
*
|
|
* Since: 0.8
|
|
*/
|
|
guint
|
|
clutter_frame_source_add_full (gint priority,
|
|
guint fps,
|
|
GSourceFunc func,
|
|
gpointer data,
|
|
GDestroyNotify notify)
|
|
{
|
|
guint ret;
|
|
GSource *source = g_source_new (&clutter_frame_source_funcs,
|
|
sizeof (ClutterFrameSource));
|
|
ClutterFrameSource *frame_source = (ClutterFrameSource *) source;
|
|
|
|
_clutter_timeout_interval_init (&frame_source->timeout, fps);
|
|
|
|
if (priority != G_PRIORITY_DEFAULT)
|
|
g_source_set_priority (source, priority);
|
|
|
|
g_source_set_callback (source, func, data, notify);
|
|
|
|
ret = g_source_attach (source, NULL);
|
|
|
|
g_source_unref (source);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* clutter_frame_source_add:
|
|
* @fps: the number of times per second to call the function
|
|
* @func: function to call
|
|
* @data: data to pass to the function
|
|
*
|
|
* Simple wrapper around clutter_frame_source_add_full().
|
|
*
|
|
* Return value: the ID (greater than 0) of the event source.
|
|
*
|
|
* Since: 0.8
|
|
*/
|
|
guint
|
|
clutter_frame_source_add (guint fps,
|
|
GSourceFunc func,
|
|
gpointer data)
|
|
{
|
|
return clutter_frame_source_add_full (G_PRIORITY_DEFAULT,
|
|
fps, func, data, NULL);
|
|
}
|
|
|
|
static gboolean
|
|
clutter_frame_source_prepare (GSource *source, gint *delay)
|
|
{
|
|
ClutterFrameSource *frame_source = (ClutterFrameSource *) source;
|
|
GTimeVal current_time;
|
|
|
|
g_source_get_current_time (source, ¤t_time);
|
|
|
|
return _clutter_timeout_interval_prepare (¤t_time,
|
|
&frame_source->timeout,
|
|
delay);
|
|
}
|
|
|
|
static gboolean
|
|
clutter_frame_source_check (GSource *source)
|
|
{
|
|
return clutter_frame_source_prepare (source, NULL);
|
|
}
|
|
|
|
static gboolean
|
|
clutter_frame_source_dispatch (GSource *source,
|
|
GSourceFunc callback,
|
|
gpointer user_data)
|
|
{
|
|
ClutterFrameSource *frame_source = (ClutterFrameSource *) source;
|
|
|
|
return _clutter_timeout_interval_dispatch (&frame_source->timeout,
|
|
callback, user_data);
|
|
}
|