mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtprtxsend: change the rtx_pt_map directly in set_property() instead of delaying it for chain()

Browse source 
The same lock is held, so there is no point in complicating it...
This commit is contained in:
George Kiagiadakis 2014-01-14 12:13:49 +01:00
parent 8a0ae00ea8
commit 252dfc34c8
2 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gst/rtpmanager/gstrtprtxsend.c
View file

@ -222,8 +222,8 @@ gst_rtp_rtx_send_finalize (GObject * object)
if (rtx->external_ssrc_map) if (rtx->external_ssrc_map)
gst_structure_free (rtx->external_ssrc_map); gst_structure_free (rtx->external_ssrc_map);
g_hash_table_unref (rtx->rtx_pt_map); g_hash_table_unref (rtx->rtx_pt_map);
if (rtx->pending_rtx_pt_map) if (rtx->rtx_pt_map_structure)
gst_structure_free (rtx->pending_rtx_pt_map); gst_structure_free (rtx->rtx_pt_map_structure);
g_queue_free (rtx->pending); g_queue_free (rtx->pending);
G_OBJECT_CLASS (gst_rtp_rtx_send_parent_class)->finalize (object); G_OBJECT_CLASS (gst_rtp_rtx_send_parent_class)->finalize (object);
@ -259,7 +259,6 @@ gst_rtp_rtx_send_init (GstRtpRtxSend * rtx)
NULL, (GDestroyNotify) ssrc_rtx_data_free); NULL, (GDestroyNotify) ssrc_rtx_data_free);
rtx->rtx_ssrcs = g_hash_table_new (g_direct_hash, g_direct_equal); rtx->rtx_ssrcs = g_hash_table_new (g_direct_hash, g_direct_equal);
rtx->rtx_pt_map = g_hash_table_new (g_direct_hash, g_direct_equal); rtx->rtx_pt_map = g_hash_table_new (g_direct_hash, g_direct_equal);
rtx->rtx_pt_map_changed = FALSE;
rtx->max_size_time = DEFAULT_MAX_SIZE_TIME; rtx->max_size_time = DEFAULT_MAX_SIZE_TIME;
rtx->max_size_packets = DEFAULT_MAX_SIZE_PACKETS; rtx->max_size_packets = DEFAULT_MAX_SIZE_PACKETS;
@ -466,22 +465,6 @@ gst_rtp_rtx_send_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
return gst_pad_event_default (pad, parent, event); return gst_pad_event_default (pad, parent, event);
} }
static gboolean
structure_to_hash_table (GQuark field_id, const GValue * value, gpointer hash)
{
const gchar *field_str;
guint field_uint;
guint value_uint;
field_str = g_quark_to_string (field_id);
field_uint = atoi (field_str);
value_uint = g_value_get_uint (value);
g_hash_table_insert ((GHashTable *) hash, GUINT_TO_POINTER (field_uint),
GUINT_TO_POINTER (value_uint));
return TRUE;
}
/* like rtp_jitter_buffer_get_ts_diff() */ /* like rtp_jitter_buffer_get_ts_diff() */
static guint32 static guint32
gst_rtp_rtx_send_get_ts_diff (SSRCRtxData * data) gst_rtp_rtx_send_get_ts_diff (SSRCRtxData * data)
@ -618,14 +601,6 @@ gst_rtp_rtx_send_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GST_OBJECT_LOCK (rtx); GST_OBJECT_LOCK (rtx);
/* transfer payload type while holding the lock */
if (rtx->rtx_pt_map_changed) {
g_hash_table_remove_all (rtx->rtx_pt_map);
gst_structure_foreach (rtx->pending_rtx_pt_map, structure_to_hash_table,
rtx->rtx_pt_map);
rtx->rtx_pt_map_changed = FALSE;
}
/* do not store the buffer if it's payload type is unknown */ /* do not store the buffer if it's payload type is unknown */
if (g_hash_table_contains (rtx->rtx_pt_map, GUINT_TO_POINTER (payload_type))) { if (g_hash_table_contains (rtx->rtx_pt_map, GUINT_TO_POINTER (payload_type))) {
data = gst_rtp_rtx_send_get_ssrc_data (rtx, ssrc); data = gst_rtp_rtx_send_get_ssrc_data (rtx, ssrc);
@ -685,7 +660,7 @@ gst_rtp_rtx_send_get_property (GObject * object,
switch (prop_id) { switch (prop_id) {
case PROP_PAYLOAD_TYPE_MAP: case PROP_PAYLOAD_TYPE_MAP:
GST_OBJECT_LOCK (rtx); GST_OBJECT_LOCK (rtx);
g_value_set_boxed (value, rtx->pending_rtx_pt_map); g_value_set_boxed (value, rtx->rtx_pt_map_structure);
GST_OBJECT_UNLOCK (rtx); GST_OBJECT_UNLOCK (rtx);
break; break;
case PROP_MAX_SIZE_TIME: case PROP_MAX_SIZE_TIME:
@ -714,6 +689,22 @@ gst_rtp_rtx_send_get_property (GObject * object,
} }
} }
static gboolean
structure_to_hash_table (GQuark field_id, const GValue * value, gpointer hash)
{
const gchar *field_str;
guint field_uint;
guint value_uint;
field_str = g_quark_to_string (field_id);
field_uint = atoi (field_str);
value_uint = g_value_get_uint (value);
g_hash_table_insert ((GHashTable *) hash, GUINT_TO_POINTER (field_uint),
GUINT_TO_POINTER (value_uint));
return TRUE;
}
static void static void
gst_rtp_rtx_send_set_property (GObject * object, gst_rtp_rtx_send_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec) guint prop_id, const GValue * value, GParamSpec * pspec)
@ -730,10 +721,12 @@ gst_rtp_rtx_send_set_property (GObject * object,
break; break;
case PROP_PAYLOAD_TYPE_MAP: case PROP_PAYLOAD_TYPE_MAP:
GST_OBJECT_LOCK (rtx); GST_OBJECT_LOCK (rtx);
if (rtx->pending_rtx_pt_map) if (rtx->rtx_pt_map_structure)
gst_structure_free (rtx->pending_rtx_pt_map); gst_structure_free (rtx->rtx_pt_map_structure);
rtx->pending_rtx_pt_map = g_value_dup_boxed (value); rtx->rtx_pt_map_structure = g_value_dup_boxed (value);
rtx->rtx_pt_map_changed = TRUE; g_hash_table_remove_all (rtx->rtx_pt_map);
gst_structure_foreach (rtx->rtx_pt_map_structure, structure_to_hash_table,
rtx->rtx_pt_map);
GST_OBJECT_UNLOCK (rtx); GST_OBJECT_UNLOCK (rtx);
break; break;
case PROP_MAX_SIZE_TIME: case PROP_MAX_SIZE_TIME:

3
gst/rtpmanager/gstrtprtxsend.h
View file

@ -59,8 +59,7 @@ struct _GstRtpRtxSend
/* orig pt (uint) -> rtx pt (uint) */ /* orig pt (uint) -> rtx pt (uint) */
GHashTable *rtx_pt_map; GHashTable *rtx_pt_map;
/* orig pt (string) -> rtx pt (uint) */ /* orig pt (string) -> rtx pt (uint) */
GstStructure *pending_rtx_pt_map; GstStructure *rtx_pt_map_structure;
gboolean rtx_pt_map_changed;
/* buffering control properties */ /* buffering control properties */
guint max_size_time; guint max_size_time;