kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-23 20:28:43 +00:00
Code Issues Projects Releases Wiki Activity

FS-10249: [mod_av] Audio gradually falls behind video in recordings #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2017-05-18 16:30:20 -05:00
parent cc92f5a2ce
commit e7397a896e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch_core_media_bug.c
View File

@ -577,10 +577,9 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
switch_status_t status; switch_status_t status;
int w = 0, h = 0, ok = 1; int w = 0, h = 0, ok = 1;
flush_video_queue(main_q, 1);
if ((status = switch_queue_pop(main_q, &pop)) == SWITCH_STATUS_SUCCESS) { if ((status = switch_queue_pop(main_q, &pop)) == SWITCH_STATUS_SUCCESS) {
switch_img_free(&img);
if (!pop) { if (!pop) {
goto end; goto end;
} }
@ -589,12 +588,11 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
w = img->d_w; w = img->d_w;
h = img->d_h; h = img->d_h;
if (other_q) { if (other_q) {
flush_video_queue(other_q, 1); flush_video_queue(other_q, 1);
if ((status = switch_queue_trypop(other_q, &other_pop)) == SWITCH_STATUS_SUCCESS) { if ((status = switch_queue_pop(other_q, &other_pop)) == SWITCH_STATUS_SUCCESS) {
switch_img_free(&other_img);
if (!(other_img = (switch_image_t *) other_pop)) { if (!(other_img = (switch_image_t *) other_pop)) {
goto end; goto end;
} }
@ -621,6 +619,7 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
if (other_img) { if (other_img) {
switch_img_patch(IMG, other_img, w / 2, 0); switch_img_patch(IMG, other_img, w / 2, 0);
switch_img_free(&other_img);
} }
} }
@ -634,6 +633,7 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
} }
} }
bug->video_ping_frame = NULL; bug->video_ping_frame = NULL;
switch_img_free(&img);
switch_thread_rwlock_unlock(bug->session->bug_rwlock); switch_thread_rwlock_unlock(bug->session->bug_rwlock);
if (!ok) { if (!ok) {