summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-23 17:07:37 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-23 17:07:37 (GMT)
commit62d74a0d6a77fe064206ce5c51f4200f54e651d2 (patch)
tree2a72e59f7b663b7ac740e1f430326b9f319c4920
parentc38383444d605650e8f33eeed2e445ef36e129c9 (diff)
downloadfarstream-62d74a0d6a77fe064206ce5c51f4200f54e651d2.tar.gz
farstream-62d74a0d6a77fe064206ce5c51f4200f54e651d2.tar.xz
Revert "shm-stream-transmitter: Add property to control the buffer-time"
This reverts commit 7a8dd5ef57afc9dd279366b6c07a38c30493f927. Because the patch in shmsink was bad and did not deal with timestamps going backwards. We must re-apply this patch once a new upstream GStreamer has been released.
-rw-r--r--transmitters/shm/fs-shm-stream-transmitter.c21
-rw-r--r--transmitters/shm/fs-shm-transmitter.c12
-rw-r--r--transmitters/shm/fs-shm-transmitter.h1
3 files changed, 2 insertions, 32 deletions
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index 4568258..23c45f2 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -98,7 +98,6 @@ enum
PROP_SENDING,
PROP_PREFERRED_LOCAL_CANDIDATES,
PROP_CREATE_LOCAL_CANDIDATES,
- PROP_BUFFER_TIME,
};
struct _FsShmStreamTransmitterPrivate
@@ -128,8 +127,6 @@ struct _FsShmStreamTransmitterPrivate
ShmSrc **shm_src;
ShmSink **shm_sink;
-
- guint64 buffer_time;
};
#define FS_SHM_STREAM_TRANSMITTER_GET_PRIVATE(o) \
@@ -230,12 +227,6 @@ fs_shm_stream_transmitter_class_init (FsShmStreamTransmitterClass *klass)
PROP_CREATE_LOCAL_CANDIDATES,
pspec);
- pspec = g_param_spec_uint64 ("buffer-time",
- "BufferTime",
- "Maximum Size of the outgoing buffer in nanoseconds",
- 0, G_MAXUINT64, 20 * GST_MSECOND,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (gobject_class, PROP_BUFFER_TIME, pspec);
gobject_class->dispose = fs_shm_stream_transmitter_dispose;
gobject_class->finalize = fs_shm_stream_transmitter_finalize;
@@ -318,9 +309,6 @@ fs_shm_stream_transmitter_get_property (GObject *object,
case PROP_CREATE_LOCAL_CANDIDATES:
g_value_set_boolean (value, self->priv->create_local_candidates);
break;
- case PROP_BUFFER_TIME:
- g_value_set_uint64 (value, self->priv->buffer_time);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -356,9 +344,6 @@ fs_shm_stream_transmitter_set_property (GObject *object,
case PROP_CREATE_LOCAL_CANDIDATES:
self->priv->create_local_candidates = g_value_get_boolean (value);
break;
- case PROP_BUFFER_TIME:
- self->priv->buffer_time = g_value_get_uint64 (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -429,8 +414,7 @@ fs_shm_stream_transmitter_add_sink (FsShmStreamTransmitter *self,
self->priv->shm_sink[candidate->component_id] =
fs_shm_transmitter_get_shm_sink (self->priv->transmitter,
- candidate->component_id, candidate->ip, self->priv->buffer_time,
- ready_cb, connected_cb,
+ candidate->component_id, candidate->ip, ready_cb, connected_cb,
self, error);
if (self->priv->shm_sink[candidate->component_id] == NULL)
@@ -587,8 +571,7 @@ fs_shm_stream_transmitter_gather_local_candidates (
self->priv->shm_sink[c] =
fs_shm_transmitter_get_shm_sink (self->priv->transmitter,
- c, path, self->priv->buffer_time,
- ready_cb, connected_cb, self, error);
+ c, path, ready_cb, connected_cb, self, error);
g_free (path);
if (self->priv->shm_sink[c] == NULL)
diff --git a/transmitters/shm/fs-shm-transmitter.c b/transmitters/shm/fs-shm-transmitter.c
index 200055d..af658f8 100644
--- a/transmitters/shm/fs-shm-transmitter.c
+++ b/transmitters/shm/fs-shm-transmitter.c
@@ -744,7 +744,6 @@ ShmSink *
fs_shm_transmitter_get_shm_sink (FsShmTransmitter *self,
guint component,
const gchar *path,
- guint64 buffer_time,
ready ready_func,
connection connected_func,
gpointer cb_data,
@@ -780,17 +779,6 @@ fs_shm_transmitter_get_shm_sink (FsShmTransmitter *self,
"sync" , FALSE,
NULL);
- if (g_object_class_find_property (G_OBJECT_GET_CLASS (elem), "buffer-time"))
- {
- GST_DEBUG ("Configured shmsink with a %"G_GUINT64_FORMAT" buffer-time",
- buffer_time);
- g_object_set (elem, "buffer-time", buffer_time, NULL);
- }
- else
- {
- GST_DEBUG ("No buffer-time property in shmsink, not setting");
- }
-
if (ready_func)
g_signal_connect (self->priv->gst_sink, "ready", G_CALLBACK (ready_cb),
shm);
diff --git a/transmitters/shm/fs-shm-transmitter.h b/transmitters/shm/fs-shm-transmitter.h
index 9fccb39..978c304 100644
--- a/transmitters/shm/fs-shm-transmitter.h
+++ b/transmitters/shm/fs-shm-transmitter.h
@@ -106,7 +106,6 @@ gboolean fs_shm_transmitter_check_shm_src (FsShmTransmitter *self,
ShmSink *fs_shm_transmitter_get_shm_sink (FsShmTransmitter *self,
guint component,
const gchar *path,
- guint64 buffer_time,
ready ready_func,
connection connected_fubnc,
gpointer cb_data,