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

FS-7514: sigh

This commit is contained in:
Anthony Minessale 2015-02-26 15:17:30 -06:00 committed by Michael Jerris
parent 69b955c13b
commit 19d87c46fd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod/formats/mod_vlc/mod_vlc.c
View File

@ -105,6 +105,7 @@ struct vlc_video_context {
switch_queue_t *video_queue; switch_queue_t *video_queue;
int playing; int playing;
int ending; int ending;
uint32_t sync_offset;
switch_mutex_t *video_mutex; switch_mutex_t *video_mutex;
switch_core_session_t *session; switch_core_session_t *session;
@ -819,7 +820,7 @@ int vlc_write_video_imem_get_callback(void *data, const char *cookie, int64_t *
} }
switch_mutex_unlock(context->video_mutex); switch_mutex_unlock(context->video_mutex);
} }
if (*cookie == 'v') { if (*cookie == 'v') {
switch_image_t *img = NULL; switch_image_t *img = NULL;
vlc_frame_data_t *fdata = NULL; vlc_frame_data_t *fdata = NULL;
@ -892,6 +893,11 @@ int vlc_write_video_imem_get_callback(void *data, const char *cookie, int64_t *
} }
} }
switch_cond_next();
switch_core_timer_sync(&context->timer);
*dts = *pts = context->timer.samplecount;
*size = 0; *size = 0;
*output = NULL; *output = NULL;
@ -1063,6 +1069,7 @@ SWITCH_STANDARD_APP(capture_video_function)
uint32_t off_frames = offset / read_impl.microseconds_per_packet; uint32_t off_frames = offset / read_impl.microseconds_per_packet;
int i = 0; int i = 0;
context->sync_offset = offset;
switch_mutex_lock(context->audio_mutex); switch_mutex_lock(context->audio_mutex);
switch_core_timer_sync(&context->timer); switch_core_timer_sync(&context->timer);
pts = context->timer.samplecount; pts = context->timer.samplecount;