kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5011 please retest with this patch

This commit is contained in:
Anthony Minessale 2013-03-19 20:54:27 -05:00
parent 2b8b6cef0c
commit 4ecba7fea8
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/switch_core_io.c
View File

@ -271,6 +271,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
if (bp->ready) { if (bp->ready) {
if (!switch_test_flag(bp, SMBF_TAP_NATIVE_READ) && !switch_test_flag(bp, SMBF_TAP_NATIVE_WRITE)) { if (!switch_test_flag(bp, SMBF_TAP_NATIVE_READ) && !switch_test_flag(bp, SMBF_TAP_NATIVE_WRITE)) {
printf("FUCKER\n\n\n");
tap_only = 0; tap_only = 0;
} }
@ -341,6 +342,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
need_codec = 0; need_codec = 0;
do_resample = 0; do_resample = 0;
do_bugs = 0; do_bugs = 0;
goto done;
} }
@ -657,7 +659,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
} }
} }
if (do_bugs) { if (do_bugs || tap_only) {
goto done; goto done;
} }
@ -985,8 +987,24 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
} }
if (session->bugs && !need_codec) { if (session->bugs && !need_codec) {
do_bugs = TRUE; switch_media_bug_t *bp;
need_codec = TRUE; int tap_only = 1;
switch_thread_rwlock_rdlock(session->bug_rwlock);
for (bp = session->bugs; bp; bp = bp->next) {
if (bp->ready) {
if (!switch_test_flag(bp, SMBF_TAP_NATIVE_READ) && !switch_test_flag(bp, SMBF_TAP_NATIVE_WRITE)) {
tap_only = 0;
break;
}
}
}
switch_thread_rwlock_unlock(session->bug_rwlock);
if (!tap_only) {
do_bugs = TRUE;
need_codec = TRUE;
}
} }
if (frame->codec->implementation->actual_samples_per_second != session->write_impl.actual_samples_per_second) { if (frame->codec->implementation->actual_samples_per_second != session->write_impl.actual_samples_per_second) {