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

FS-7656 fix a/v sync on first connection (retry 1)

This commit is contained in:
Anthony Minessale 2015-06-18 15:57:21 -05:00
parent 05520fb8fd
commit 9a0bbc4543
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/formats/mod_local_stream/mod_local_stream.c
View File

@ -333,10 +333,15 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2 * source->channels); used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2 * source->channels);
if (!source->total) { if (!source->total) {
switch_mutex_lock(source->mutex);
while (switch_queue_trypop(source->video_q, &pop) == SWITCH_STATUS_SUCCESS) { while (switch_queue_trypop(source->video_q, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img = (switch_image_t *) pop; switch_image_t *img = (switch_image_t *) pop;
switch_img_free(&img); switch_img_free(&img);
} }
switch_mutex_unlock(source->mutex);
} else { } else {
uint32_t bused = 0; uint32_t bused = 0;
@ -366,7 +371,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
} }
switch_mutex_unlock(source->mutex); switch_mutex_unlock(source->mutex);
switch_mutex_lock(source->mutex);
while (switch_queue_trypop(source->video_q, &pop) == SWITCH_STATUS_SUCCESS) { while (switch_queue_trypop(source->video_q, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img = (switch_image_t *) pop; switch_image_t *img = (switch_image_t *) pop;
switch_image_t *imgcp = NULL; switch_image_t *imgcp = NULL;
@ -375,7 +380,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
switch_queue_push(source->context_list->video_q, img); switch_queue_push(source->context_list->video_q, img);
} else { } else {
if (source->context_list) { if (source->context_list) {
switch_mutex_lock(source->mutex);
for (cp = source->context_list; cp && RUNNING; cp = cp->next) { for (cp = source->context_list; cp && RUNNING; cp = cp->next) {
if (cp->video_q) { if (cp->video_q) {
imgcp = NULL; imgcp = NULL;
@ -385,11 +389,12 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
} }
} }
} }
switch_mutex_unlock(source->mutex);
} }
switch_img_free(&img); switch_img_free(&img);
} }
} }
switch_mutex_unlock(source->mutex);
} }
} }
} }