Commit 068d9ecf authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

event: add constructor and parse function for new GAP event

(Whatever you do, don't mention the filler event.)
parent 0b573455
...@@ -565,6 +565,63 @@ gst_event_new_eos (void) ...@@ -565,6 +565,63 @@ gst_event_new_eos (void)
return gst_event_new (GST_EVENT_EOS); return gst_event_new (GST_EVENT_EOS);
} }
/**
* gst_event_new_gap:
* @timestamp: the start time (pts) of a gap
* @duration: the duration of the gap, or %GST_CLOCK_TIME_NONE
*
* Create a new GAP event. A gap event can be thought of as conceptually
* equivalent to a buffer to signal that there is no data for a certain
* amount of time. This is useful to signal a gap to downstream elements
* which may wait for data, such as muxers or mixers or overlays, especially
* for sparse streams such as subtitle streams.
*
* Returns: (transfer full): the new GAP event.
*/
GstEvent *
gst_event_new_gap (GstClockTime timestamp, GstClockTime duration)
{
GstEvent *event;
g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), NULL);
GST_CAT_TRACE (GST_CAT_EVENT, "creating gap %" GST_TIME_FORMAT " - "
"%" GST_TIME_FORMAT " (duration: %" GST_TIME_FORMAT ")",
GST_TIME_ARGS (timestamp),
GST_TIME_ARGS (GST_CLOCK_TIME_IS_VALID (duration) ? (timestamp +
duration) : GST_CLOCK_TIME_NONE), GST_TIME_ARGS (duration));
event = gst_event_new_custom (GST_EVENT_GAP,
gst_structure_new_id (GST_QUARK (EVENT_GAP),
GST_QUARK (TIMESTAMP), GST_TYPE_CLOCK_TIME, timestamp,
GST_QUARK (DURATION), GST_TYPE_CLOCK_TIME, duration, NULL));
return event;
}
/**
* gst_event_parse_gap:
* @timestamp: (out): location where to store the start time (pts) of the gap
* @duration: (out) (allow-none): location where to store the duration of
* the gap, or %NULL
*
* Extract timestamp and duration from a new GAP event.
*/
void
gst_event_parse_gap (GstEvent * event, GstClockTime * timestamp,
GstClockTime * duration)
{
GstStructure *structure;
g_return_if_fail (GST_IS_EVENT (event));
g_return_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_GAP);
structure = GST_EVENT_STRUCTURE (event);
gst_structure_id_get (structure,
GST_QUARK (TIMESTAMP), GST_TYPE_CLOCK_TIME, timestamp,
GST_QUARK (DURATION), GST_TYPE_CLOCK_TIME, duration, NULL);
}
/** /**
* gst_event_new_caps: * gst_event_new_caps:
* @caps: (transfer none): a #GstCaps * @caps: (transfer none): a #GstCaps
......
...@@ -490,6 +490,14 @@ void gst_event_parse_flush_stop (GstEvent *event, gboolean *rese ...@@ -490,6 +490,14 @@ void gst_event_parse_flush_stop (GstEvent *event, gboolean *rese
/* EOS event */ /* EOS event */
GstEvent * gst_event_new_eos (void) G_GNUC_MALLOC; GstEvent * gst_event_new_eos (void) G_GNUC_MALLOC;
/* GAP event */
GstEvent * gst_event_new_gap (GstClockTime ts,
GstClockTime duration) G_GNUC_MALLOC;
void gst_event_parse_gap (GstEvent * event,
GstClockTime * timestamp,
GstClockTime * duration);
/* Caps events */ /* Caps events */
GstEvent * gst_event_new_caps (GstCaps *caps) G_GNUC_MALLOC; GstEvent * gst_event_new_caps (GstCaps *caps) G_GNUC_MALLOC;
void gst_event_parse_caps (GstEvent *event, GstCaps **caps); void gst_event_parse_caps (GstEvent *event, GstCaps **caps);
......
...@@ -56,7 +56,7 @@ static const gchar *_quark_strings[] = { ...@@ -56,7 +56,7 @@ static const gchar *_quark_strings[] = {
"GstEventReconfigure", "segment", "GstQueryScheduling", "pull-mode", "GstEventReconfigure", "segment", "GstQueryScheduling", "pull-mode",
"allocator", "GstEventFlushStop", "options", "GstQueryAcceptCaps", "allocator", "GstEventFlushStop", "options", "GstQueryAcceptCaps",
"result", "GstQueryCaps", "filter", "modes", "GstEventStreamConfig", "result", "GstQueryCaps", "filter", "modes", "GstEventStreamConfig",
"codec-data", "stream-headers" "codec-data", "stream-headers", "GstEventGap"
}; };
GQuark _priv_gst_quark_table[GST_QUARK_MAX]; GQuark _priv_gst_quark_table[GST_QUARK_MAX];
......
...@@ -161,7 +161,8 @@ typedef enum _GstQuarkId ...@@ -161,7 +161,8 @@ typedef enum _GstQuarkId
GST_QUARK_EVENT_STREAM_CONFIG = 132, GST_QUARK_EVENT_STREAM_CONFIG = 132,
GST_QUARK_CODEC_DATA = 133, GST_QUARK_CODEC_DATA = 133,
GST_QUARK_STREAM_HEADERS = 134, GST_QUARK_STREAM_HEADERS = 134,
GST_QUARK_MAX = 135 GST_QUARK_EVENT_GAP = 135,
GST_QUARK_MAX = 136
} GstQuarkId; } GstQuarkId;
extern GQuark _priv_gst_quark_table[GST_QUARK_MAX]; extern GQuark _priv_gst_quark_table[GST_QUARK_MAX];
......
...@@ -62,6 +62,24 @@ GST_START_TEST (create_events) ...@@ -62,6 +62,24 @@ GST_START_TEST (create_events)
fail_unless (GST_EVENT_IS_SERIALIZED (event)); fail_unless (GST_EVENT_IS_SERIALIZED (event));
gst_event_unref (event); gst_event_unref (event);
} }
/* GAP */
{
GstClockTime ts = 0, dur = 0;
ASSERT_CRITICAL (gst_event_new_gap (GST_CLOCK_TIME_NONE, GST_SECOND));
event = gst_event_new_gap (90 * GST_SECOND, GST_SECOND);
fail_if (event == NULL);
fail_unless (GST_EVENT_TYPE (event) == GST_EVENT_GAP);
fail_if (GST_EVENT_IS_UPSTREAM (event));
fail_unless (GST_EVENT_IS_DOWNSTREAM (event));
fail_unless (GST_EVENT_IS_SERIALIZED (event));
gst_event_parse_gap (event, &ts, NULL);
fail_unless_equals_int64 (ts, 90 * GST_SECOND);
gst_event_parse_gap (event, &ts, &dur);
fail_unless_equals_int64 (dur, GST_SECOND);
gst_event_unref (event);
}
/* SEGMENT */ /* SEGMENT */
{ {
GstSegment segment, parsed; GstSegment segment, parsed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment