mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "rtspsrc: Proxy rtpjitterbuffer do-retransmission property"

Browse source 
This reverts commit 9f7b1128b1.

This should be handled automatically be rtspsrc if the AVPF profile
is used, and manual enabling of it can be done with the new-manager
signal.
This commit is contained in:
Sebastian Dröge 2014-01-24 12:37:39 +01:00
parent 43feb82feb
commit 8054cd5df3
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/rtsp/gstrtspsrc.c
View file

@ -173,7 +173,6 @@ gst_rtsp_src_buffer_mode_get_type (void)
#define DEFAULT_TCP_TIMEOUT 20000000 #define DEFAULT_TCP_TIMEOUT 20000000
#define DEFAULT_LATENCY_MS 2000 #define DEFAULT_LATENCY_MS 2000
#define DEFAULT_DROP_ON_LATENCY FALSE #define DEFAULT_DROP_ON_LATENCY FALSE
#define DEFAULT_DO_RETRANSMISSION FALSE
#define DEFAULT_CONNECTION_SPEED 0 #define DEFAULT_CONNECTION_SPEED 0
#define DEFAULT_NAT_METHOD GST_RTSP_NAT_DUMMY #define DEFAULT_NAT_METHOD GST_RTSP_NAT_DUMMY
#define DEFAULT_DO_RTCP TRUE #define DEFAULT_DO_RTCP TRUE
@ -203,7 +202,6 @@ enum
PROP_TCP_TIMEOUT, PROP_TCP_TIMEOUT,
PROP_LATENCY, PROP_LATENCY,
PROP_DROP_ON_LATENCY, PROP_DROP_ON_LATENCY,
PROP_DO_RETRANSMISSION,
PROP_CONNECTION_SPEED, PROP_CONNECTION_SPEED,
PROP_NAT_METHOD, PROP_NAT_METHOD,
PROP_DO_RTCP, PROP_DO_RTCP,
@ -406,12 +404,6 @@ gst_rtspsrc_class_init (GstRTSPSrcClass * klass)
"Tells the jitterbuffer to never exceed the given latency in size", "Tells the jitterbuffer to never exceed the given latency in size",
DEFAULT_DROP_ON_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_DROP_ON_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DO_RETRANSMISSION,
g_param_spec_boolean ("do-retransmission", "Do retransmission",
"Send retransmission events upstream when a packet is late",
DEFAULT_DO_RETRANSMISSION,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED, g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED,
g_param_spec_uint64 ("connection-speed", "Connection Speed", g_param_spec_uint64 ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)", "Network connection speed in kbps (0 = unknown)",
@ -700,7 +692,6 @@ gst_rtspsrc_init (GstRTSPSrc * src)
gst_rtspsrc_set_tcp_timeout (src, DEFAULT_TCP_TIMEOUT); gst_rtspsrc_set_tcp_timeout (src, DEFAULT_TCP_TIMEOUT);
src->latency = DEFAULT_LATENCY_MS; src->latency = DEFAULT_LATENCY_MS;
src->drop_on_latency = DEFAULT_DROP_ON_LATENCY; src->drop_on_latency = DEFAULT_DROP_ON_LATENCY;
src->do_retransmission = DEFAULT_DO_RETRANSMISSION;
src->connection_speed = DEFAULT_CONNECTION_SPEED; src->connection_speed = DEFAULT_CONNECTION_SPEED;
src->nat_method = DEFAULT_NAT_METHOD; src->nat_method = DEFAULT_NAT_METHOD;
src->do_rtcp = DEFAULT_DO_RTCP; src->do_rtcp = DEFAULT_DO_RTCP;
@ -891,9 +882,6 @@ gst_rtspsrc_set_property (GObject * object, guint prop_id, const GValue * value,
case PROP_DROP_ON_LATENCY: case PROP_DROP_ON_LATENCY:
rtspsrc->drop_on_latency = g_value_get_boolean (value); rtspsrc->drop_on_latency = g_value_get_boolean (value);
break; break;
case PROP_DO_RETRANSMISSION:
rtspsrc->do_retransmission = g_value_get_boolean (value);
break;
case PROP_CONNECTION_SPEED: case PROP_CONNECTION_SPEED:
rtspsrc->connection_speed = g_value_get_uint64 (value); rtspsrc->connection_speed = g_value_get_uint64 (value);
break; break;
@ -1026,9 +1014,6 @@ gst_rtspsrc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_DROP_ON_LATENCY: case PROP_DROP_ON_LATENCY:
g_value_set_boolean (value, rtspsrc->drop_on_latency); g_value_set_boolean (value, rtspsrc->drop_on_latency);
break; break;
case PROP_DO_RETRANSMISSION:
g_value_set_boolean (value, rtspsrc->do_retransmission);
break;
case PROP_CONNECTION_SPEED: case PROP_CONNECTION_SPEED:
g_value_set_uint64 (value, rtspsrc->connection_speed); g_value_set_uint64 (value, rtspsrc->connection_speed);
break; break;
@ -2793,11 +2778,6 @@ gst_rtspsrc_stream_configure_manager (GstRTSPSrc * src, GstRTSPStream * stream,
NULL); NULL);
} }
if (g_object_class_find_property (klass, "do-retransmission")) {
g_object_set (src->manager, "do-retransmission", src->do_retransmission,
NULL);
}
/* buffer mode pauses are handled by adding offsets to buffer times, /* buffer mode pauses are handled by adding offsets to buffer times,
* but some depayloaders may have a hard time syncing output times * but some depayloaders may have a hard time syncing output times
* with such input times, e.g. container ones, most notably ASF */ * with such input times, e.g. container ones, most notably ASF */

1
gst/rtsp/gstrtspsrc.h
View file

@ -204,7 +204,6 @@ struct _GstRTSPSrc {
GTimeVal *ptcp_timeout; GTimeVal *ptcp_timeout;
guint latency; guint latency;
gboolean drop_on_latency; gboolean drop_on_latency;
gboolean do_retransmission;
guint64 connection_speed; guint64 connection_speed;
GstRTSPNatMethod nat_method; GstRTSPNatMethod nat_method;
gboolean do_rtcp; gboolean do_rtcp;