mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

shmsink: Make buffer-time signed to deal with backward jumps in timestamps

Browse source
This commit is contained in:
Olivier Crête 2012-03-23 13:06:12 -04:00
parent 76436c0f63
commit 3fa160e1c8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/shm/gstshmsink.c
View file

@ -149,10 +149,10 @@ gst_shm_sink_class_init (GstShmSinkClass * klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_BUFFER_TIME, g_object_class_install_property (gobject_class, PROP_BUFFER_TIME,
g_param_spec_uint64 ("buffer-time", g_param_spec_int64 ("buffer-time",
"Buffer Time of the shm buffer", "Buffer Time of the shm buffer",
"Maximum Size of the shm buffer in nanoseconds (-1 to disable)", "Maximum Size of the shm buffer in nanoseconds (-1 to disable)",
0, G_MAXUINT64, GST_CLOCK_TIME_NONE, -1, G_MAXINT64, -1,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
signals[SIGNAL_CLIENT_CONNECTED] = g_signal_new ("client-connected", signals[SIGNAL_CLIENT_CONNECTED] = g_signal_new ("client-connected",
@ -233,7 +233,7 @@ gst_shm_sink_set_property (GObject * object, guint prop_id,
break; break;
case PROP_BUFFER_TIME: case PROP_BUFFER_TIME:
GST_OBJECT_LOCK (object); GST_OBJECT_LOCK (object);
self->buffer_time = g_value_get_uint64 (value); self->buffer_time = g_value_get_int64 (value);
GST_OBJECT_UNLOCK (object); GST_OBJECT_UNLOCK (object);
g_cond_broadcast (self->cond); g_cond_broadcast (self->cond);
break; break;
@ -272,7 +272,7 @@ gst_shm_sink_get_property (GObject * object, guint prop_id,
g_value_set_boolean (value, self->wait_for_connection); g_value_set_boolean (value, self->wait_for_connection);
break; break;
case PROP_BUFFER_TIME: case PROP_BUFFER_TIME:
g_value_set_uint64 (value, self->buffer_time); g_value_set_int64 (value, self->buffer_time);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

2
sys/shm/gstshmsink.h
View file

@ -61,7 +61,7 @@ struct _GstShmSink
gboolean wait_for_connection; gboolean wait_for_connection;
gboolean stop; gboolean stop;
gboolean unlock; gboolean unlock;
GstClockTime buffer_time; GstClockTimeDiff buffer_time;
GCond *cond; GCond *cond;
}; };