gboolean handled;
gboolean marshalled;
- GHook **called_probes;
+ gulong *called_probes;
guint n_called_probes;
guint called_probes_size;
gboolean retry;
typedef struct
{
gboolean live;
- GstClockTime live_min, live_max;
- GstClockTime non_live_min, non_live_max;
+ GstClockTime min, max;
} LatencyFoldData;
static gboolean
if (res) {
gboolean live;
GstClockTime min, max;
- GstClockTime *min_store, *max_store;
gst_query_parse_latency (query, &live, &min, &max);
" max:%" G_GINT64_FORMAT, live ? "true" : "false", min, max);
if (live) {
- min_store = &fold_data->live_min;
- max_store = &fold_data->live_max;
- fold_data->live = live;
- } else {
- min_store = &fold_data->non_live_min;
- max_store = &fold_data->non_live_max;
- }
+ if (min > fold_data->min)
+ fold_data->min = min;
- if (min > *min_store)
- *min_store = min;
+ if (fold_data->max == GST_CLOCK_TIME_NONE)
+ fold_data->max = max;
+ else if (max < fold_data->max)
+ fold_data->max = max;
- if (*max_store == GST_CLOCK_TIME_NONE)
- *max_store = max;
- else if (max < *max_store)
- *max_store = max;
+ fold_data->live = TRUE;
+ }
} else if (peer) {
GST_DEBUG_OBJECT (pad, "latency query failed");
g_value_set_boolean (ret, FALSE);
retry:
fold_data.live = FALSE;
- fold_data.live_min = fold_data.non_live_min = 0;
- fold_data.live_max = fold_data.non_live_max = GST_CLOCK_TIME_NONE;
+ fold_data.min = 0;
+ fold_data.max = GST_CLOCK_TIME_NONE;
g_value_set_boolean (&ret, TRUE);
res = gst_iterator_fold (it, query_latency_default_fold, &ret, &fold_data);
query_ret = g_value_get_boolean (&ret);
if (query_ret) {
- GstClockTime min, max;
-
- if (fold_data.live) {
- min = fold_data.live_min;
- max = fold_data.live_max;
- } else {
- min = fold_data.non_live_min;
- max = fold_data.non_live_max;
- }
-
GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT
- " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false", min, max);
+ " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false",
+ fold_data.min, fold_data.max);
- if (min > max) {
+ if (fold_data.min > fold_data.max) {
GST_ERROR_OBJECT (pad, "minimum latency bigger than maximum latency");
}
- gst_query_set_latency (query, fold_data.live, min, max);
+ gst_query_set_latency (query, fold_data.live, fold_data.min, fold_data.max);
} else {
GST_LOG_OBJECT (pad, "latency query failed");
}
ret = gst_pad_query_latency_default (pad, query);
forward = FALSE;
break;
+ case GST_QUERY_BITRATE:
+ /* FIXME: better default handling */
+ forward = TRUE;
+ break;
case GST_QUERY_POSITION:
case GST_QUERY_SEEKING:
case GST_QUERY_FORMATS:
* if we're actually calling probes a second time */
if (data->retry) {
for (i = 0; i < data->n_called_probes; i++) {
- if (data->called_probes[i] == hook) {
+ if (data->called_probes[i] == hook->hook_id) {
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"hook %lu already called", hook->hook_id);
return;
if (data->called_probes_size > N_STACK_ALLOCATE_PROBES) {
data->called_probes_size *= 2;
data->called_probes =
- g_renew (GHook *, data->called_probes, data->called_probes_size);
+ g_renew (gulong, data->called_probes, data->called_probes_size);
} else {
- GHook **tmp = data->called_probes;
+ gulong *tmp = data->called_probes;
data->called_probes_size *= 2;
- data->called_probes = g_new (GHook *, data->called_probes_size);
+ data->called_probes = g_new (gulong, data->called_probes_size);
memcpy (data->called_probes, tmp,
- N_STACK_ALLOCATE_PROBES * sizeof (GHook *));
+ N_STACK_ALLOCATE_PROBES * sizeof (gulong));
}
}
- data->called_probes[data->n_called_probes++] = hook;
+ data->called_probes[data->n_called_probes++] = hook->hook_id;
flags = hook->flags >> G_HOOK_FLAG_USER_SHIFT;
type = info->type;
ProbeMarshall data;
guint cookie;
gboolean is_block;
- GHook *called_probes[N_STACK_ALLOCATE_PROBES];
+ gulong called_probes[N_STACK_ALLOCATE_PROBES];
data.pad = pad;
data.info = info;