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

session: parse packet outside of the session lock

Browse source
This commit is contained in:
Wim Taymans 2013-07-25 17:35:02 +02:00
parent 57c27ec319
commit b069db6a2e
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/rtpmanager/rtpsession.c
View file

@ -1654,21 +1654,8 @@ rtp_session_process_rtp (RTPSession * sess, GstBuffer * buffer,
if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp)) if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp))
goto invalid_packet; goto invalid_packet;
RTP_SESSION_LOCK (sess); /* get SSRC to look up in session database */
/* ignore more RTP packets when we left the session */
if (sess->source->marked_bye)
goto ignore;
/* update arrival stats */
update_arrival_stats (sess, &arrival, TRUE, buffer, current_time,
running_time, -1);
/* get SSRC and look up in session database */
ssrc = gst_rtp_buffer_get_ssrc (&rtp); ssrc = gst_rtp_buffer_get_ssrc (&rtp);
source = obtain_source (sess, ssrc, &created, &arrival, TRUE);
if (!source)
goto collision;
/* copy available csrc for later */ /* copy available csrc for later */
count = gst_rtp_buffer_get_csrc_count (&rtp); count = gst_rtp_buffer_get_csrc_count (&rtp);
/* make sure to not overflow our array. An RTP buffer can maximally contain /* make sure to not overflow our array. An RTP buffer can maximally contain
@ -1680,6 +1667,19 @@ rtp_session_process_rtp (RTPSession * sess, GstBuffer * buffer,
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
RTP_SESSION_LOCK (sess);
/* ignore more RTP packets when we left the session */
if (sess->source->marked_bye)
goto ignore;
/* update arrival stats */
update_arrival_stats (sess, &arrival, TRUE, buffer, current_time,
running_time, -1);
source = obtain_source (sess, ssrc, &created, &arrival, TRUE);
if (!source)
goto collision;
prevsender = RTP_SOURCE_IS_SENDER (source); prevsender = RTP_SOURCE_IS_SENDER (source);
prevactive = RTP_SOURCE_IS_ACTIVE (source); prevactive = RTP_SOURCE_IS_ACTIVE (source);
oldrate = source->bitrate; oldrate = source->bitrate;
@ -1748,7 +1748,6 @@ invalid_packet:
ignore: ignore:
{ {
RTP_SESSION_UNLOCK (sess); RTP_SESSION_UNLOCK (sess);
gst_rtp_buffer_unmap (&rtp);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
GST_DEBUG ("ignoring RTP packet because we are leaving"); GST_DEBUG ("ignoring RTP packet because we are leaving");
return GST_FLOW_OK; return GST_FLOW_OK;
@ -1756,7 +1755,6 @@ ignore:
collision: collision:
{ {
RTP_SESSION_UNLOCK (sess); RTP_SESSION_UNLOCK (sess);
gst_rtp_buffer_unmap (&rtp);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
clean_arrival_stats (&arrival); clean_arrival_stats (&arrival);
GST_DEBUG ("ignoring packet because its collisioning"); GST_DEBUG ("ignoring packet because its collisioning");