mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtprtxreceive: use GST_DEBUG_OBJECT / GST_WARNING_OBJECT instead of GST_DEBUG / g_warning

Browse source
This commit is contained in:
George Kiagiadakis 2014-01-14 12:25:36 +01:00
parent 47788929d3
commit bf347dc50c
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/rtpmanager/gstrtprtxreceive.c
View file

@ -313,7 +313,7 @@ gst_rtp_rtx_receive_src_event (GstPad * pad, GstObject * parent,
if (g_hash_table_lookup_extended (rtx->ssrc2_ssrc1_map, if (g_hash_table_lookup_extended (rtx->ssrc2_ssrc1_map,
GUINT_TO_POINTER (ssrc), NULL, &ssrc2) GUINT_TO_POINTER (ssrc), NULL, &ssrc2)
&& GPOINTER_TO_UINT (ssrc2) != GPOINTER_TO_UINT (ssrc)) { && GPOINTER_TO_UINT (ssrc2) != GPOINTER_TO_UINT (ssrc)) {
GST_DEBUG ("Retransmited stream %" G_GUINT32_FORMAT GST_DEBUG_OBJECT (rtx, "Retransmited stream %" G_GUINT32_FORMAT
" already associated to its master", GPOINTER_TO_UINT (ssrc2)); " already associated to its master", GPOINTER_TO_UINT (ssrc2));
} else { } else {
/* not already associated but also we have to check that we have not /* not already associated but also we have to check that we have not
@ -328,8 +328,8 @@ gst_rtp_rtx_receive_src_event (GstPad * pad, GstObject * parent,
* It does not mean we reject the event, we still want to forward * It does not mean we reject the event, we still want to forward
* the request to the gstrtpsession to be translater into a FB NACK * the request to the gstrtpsession to be translater into a FB NACK
*/ */
GST_DEBUG ("Duplicated request seqnum: %" G_GUINT32_FORMAT GST_DEBUG_OBJECT (rtx, "Duplicated request seqnum: %"
", ssrc1: %" G_GUINT32_FORMAT, seqnum, ssrc); G_GUINT32_FORMAT ", ssrc1: %" G_GUINT32_FORMAT, seqnum, ssrc);
} else { } else {
/* From RFC 4588: /* From RFC 4588:
* the receiver MUST NOT have two outstanding requests for the * the receiver MUST NOT have two outstanding requests for the
@ -337,7 +337,8 @@ gst_rtp_rtx_receive_src_event (GstPad * pad, GstObject * parent,
* before the association is resolved. Otherwise it's impossible * before the association is resolved. Otherwise it's impossible
* to associate a rtx stream and its master stream * to associate a rtx stream and its master stream
*/ */
GST_DEBUG ("reject request for seqnum %" G_GUINT32_FORMAT GST_DEBUG_OBJECT (rtx,
"reject request for seqnum %" G_GUINT32_FORMAT
"of master stream %" G_GUINT32_FORMAT, seqnum, ssrc); "of master stream %" G_GUINT32_FORMAT, seqnum, ssrc);
res = TRUE; res = TRUE;
@ -353,8 +354,8 @@ gst_rtp_rtx_receive_src_event (GstPad * pad, GstObject * parent,
} else { } else {
/* the request has not been already considered /* the request has not been already considered
* insert it for the first time */ * insert it for the first time */
GST_DEBUG GST_DEBUG_OBJECT (rtx,
("packet number %" G_GUINT32_FORMAT " of master stream %" "packet number %" G_GUINT32_FORMAT " of master stream %"
G_GUINT32_FORMAT " needs to be retransmited", seqnum, ssrc); G_GUINT32_FORMAT " needs to be retransmited", seqnum, ssrc);
g_hash_table_insert (rtx->seqnum_ssrc1_map, g_hash_table_insert (rtx->seqnum_ssrc1_map,
GUINT_TO_POINTER (seqnum), GUINT_TO_POINTER (ssrc)); GUINT_TO_POINTER (seqnum), GUINT_TO_POINTER (ssrc));
@ -486,8 +487,8 @@ gst_rtp_rtx_receive_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
* to a master stream */ * to a master stream */
if (g_hash_table_lookup_extended (rtx->ssrc2_ssrc1_map, if (g_hash_table_lookup_extended (rtx->ssrc2_ssrc1_map,
GUINT_TO_POINTER (ssrc), NULL, &ssrc1)) { GUINT_TO_POINTER (ssrc), NULL, &ssrc1)) {
GST_DEBUG GST_DEBUG_OBJECT (rtx,
("packet is from retransmission stream %" G_GUINT32_FORMAT "packet is from retransmission stream %" G_GUINT32_FORMAT
" already associated to master stream %" G_GUINT32_FORMAT, ssrc, " already associated to master stream %" G_GUINT32_FORMAT, ssrc,
GPOINTER_TO_UINT (ssrc1)); GPOINTER_TO_UINT (ssrc1));
ssrc2 = ssrc; ssrc2 = ssrc;
@ -497,8 +498,8 @@ gst_rtp_rtx_receive_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
* history */ * history */
if (g_hash_table_lookup_extended (rtx->seqnum_ssrc1_map, if (g_hash_table_lookup_extended (rtx->seqnum_ssrc1_map,
GUINT_TO_POINTER (orign_seqnum), NULL, &ssrc1)) { GUINT_TO_POINTER (orign_seqnum), NULL, &ssrc1)) {
GST_DEBUG GST_DEBUG_OBJECT (rtx,
("associate retransmisted stream %" G_GUINT32_FORMAT "associate retransmisted stream %" G_GUINT32_FORMAT
" to master stream %" G_GUINT32_FORMAT " thanks to packet %" " to master stream %" G_GUINT32_FORMAT " thanks to packet %"
G_GUINT16_FORMAT "", ssrc, GPOINTER_TO_UINT (ssrc1), orign_seqnum); G_GUINT16_FORMAT "", ssrc, GPOINTER_TO_UINT (ssrc1), orign_seqnum);
ssrc2 = ssrc; ssrc2 = ssrc;
@ -514,9 +515,8 @@ gst_rtp_rtx_receive_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
/* just put a guard */ /* just put a guard */
if (GPOINTER_TO_UINT (ssrc1) == ssrc2) if (GPOINTER_TO_UINT (ssrc1) == ssrc2)
g_warning GST_WARNING_OBJECT (rtx, "RTX receiver ssrc2_ssrc1_map bad state, "
("RTX receiver ssrc2_ssrc1_map bad state, ssrc %" G_GUINT32_FORMAT "ssrc %" G_GUINT32_FORMAT " are the same\n", ssrc);
" are the same\n", ssrc);
/* also do the association between master stream and rtx stream /* also do the association between master stream and rtx stream
* every ssrc are unique so we can use the same hash table * every ssrc are unique so we can use the same hash table
@ -526,8 +526,8 @@ gst_rtp_rtx_receive_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GUINT_TO_POINTER (ssrc2)); GUINT_TO_POINTER (ssrc2));
} else { } else {
/* we are not able to associate this rtx packet with a master stream */ /* we are not able to associate this rtx packet with a master stream */
GST_DEBUG GST_DEBUG_OBJECT (rtx,
("drop rtx packet because its orign_seqnum %" G_GUINT16_FORMAT "drop rtx packet because its orign_seqnum %" G_GUINT16_FORMAT
" is not in pending retransmission requests", orign_seqnum); " is not in pending retransmission requests", orign_seqnum);
drop = TRUE; drop = TRUE;
} }