sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed deadlock between stream and ICE (#3801)

This commit is contained in:
sauwming 2023-12-14 12:15:58 +08:00 committed by GitHub
parent 4140143493
commit 378e97ca10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pjmedia/src/pjmedia/stream.c
View File

@ -1087,10 +1087,11 @@ static pj_status_t send_rtcp(pjmedia_stream *stream,
pj_status_t status;
/* We need to prevent data race since there is only a single instance
* of rtcp packet buffer. Let's just use the JB mutex for this instead
* of creating a separate lock.
* of rtcp packet buffer. And to avoid deadlock with media transport,
* we use the transport's group lock.
*/
pj_mutex_lock(stream->jb_mutex);
if (stream->transport->grp_lock)
pj_grp_lock_acquire(stream->transport->grp_lock);
/* Build RTCP RR/SR packet */
pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
@ -1211,7 +1212,8 @@ static pj_status_t send_rtcp(pjmedia_stream *stream,
}
}
pj_mutex_unlock(stream->jb_mutex);
if (stream->transport->grp_lock)
pj_grp_lock_release(stream->transport->grp_lock);
return status;
}
@ -3068,7 +3070,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);
/* Send RTCP BYE (also SDES & XR) */
if (stream->transport && stream->jb_mutex && !stream->rtcp_sdes_bye_disabled) {
if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
send_rtcp(stream, PJ_TRUE, PJ_TRUE, stream->rtcp.xr_enabled, PJ_FALSE);
#else

12
pjmedia/src/pjmedia/vid_stream.c
View File

@ -584,7 +584,12 @@ static pj_status_t send_rtcp(pjmedia_vid_stream *stream,
int len, max_len;
pj_status_t status;
pj_grp_lock_acquire( stream->grp_lock );
/* To avoid deadlock with media transport, we use the transport's
* group lock.
*/
if (stream->transport->grp_lock)
pj_grp_lock_acquire( stream->transport->grp_lock );
/* Build RTCP RR/SR packet */
pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
@ -667,7 +672,8 @@ static pj_status_t send_rtcp(pjmedia_vid_stream *stream,
}
}
pj_grp_lock_release( stream->grp_lock );
if (stream->transport->grp_lock)
pj_grp_lock_release( stream->transport->grp_lock );
return status;
}
@ -2191,7 +2197,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_destroy( pjmedia_vid_stream *stream )
pjmedia_event_unsubscribe(NULL, &stream_event_cb, stream, &stream->rtcp);
/* Send RTCP BYE (also SDES) */
if (stream->transport && stream->grp_lock && !stream->rtcp_sdes_bye_disabled) {
if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_FALSE, PJ_FALSE);
}