提交 fe0908d6 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8126 #resolve [Pruning of a media bug may cause all media bugs on a session to be pruned]

上级 edbffd34
...@@ -10585,12 +10585,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor ...@@ -10585,12 +10585,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
if (session->bugs) { if (session->bugs) {
switch_media_bug_t *bp; switch_media_bug_t *bp;
switch_bool_t ok = SWITCH_TRUE;
int prune = 0; int prune = 0;
int patched = 0; int patched = 0;
switch_thread_rwlock_rdlock(session->bug_rwlock); switch_thread_rwlock_rdlock(session->bug_rwlock);
for (bp = session->bugs; bp; bp = bp->next) { for (bp = session->bugs; bp; bp = bp->next) {
switch_bool_t ok = SWITCH_TRUE;
if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) {
continue; continue;
} }
...@@ -10820,12 +10821,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core ...@@ -10820,12 +10821,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
if (session->bugs) { if (session->bugs) {
switch_media_bug_t *bp; switch_media_bug_t *bp;
switch_bool_t ok = SWITCH_TRUE;
int prune = 0; int prune = 0;
int patched = 0; int patched = 0;
switch_thread_rwlock_rdlock(session->bug_rwlock); switch_thread_rwlock_rdlock(session->bug_rwlock);
for (bp = session->bugs; bp; bp = bp->next) { for (bp = session->bugs; bp; bp = bp->next) {
switch_bool_t ok = SWITCH_TRUE;
if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_PAUSE_BUGS) && !switch_core_media_bug_test_flag(bp, SMBF_NO_PAUSE)) {
continue; continue;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论