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

FS-7514: drop extra frames

This commit is contained in:
Anthony Minessale 2015-03-05 15:46:25 -06:00 committed by Michael Jerris
parent 6cb4de9957
commit 8b47053915
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2345,15 +2345,25 @@ static switch_status_t vlc_read_video_frame(switch_core_session_t *session, swit
switch_img_free(&tech_pvt->read_video_frame.img); switch_img_free(&tech_pvt->read_video_frame.img);
if (tech_pvt->context->video_queue && switch_queue_pop(tech_pvt->context->video_queue, &pop) == SWITCH_STATUS_SUCCESS) { if (tech_pvt->context->video_queue) {
switch_image_t *img = (switch_image_t *) pop; while(switch_queue_size(tech_pvt->context->video_queue) > 1) {
if (!img) return SWITCH_STATUS_FALSE; if (switch_queue_trypop(tech_pvt->context->video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img = (switch_image_t *) pop;
switch_img_free(&img);
} else {
break;
}
}
if (switch_queue_pop(tech_pvt->context->video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img = (switch_image_t *) pop;
if (!img) return SWITCH_STATUS_FALSE;
tech_pvt->read_video_frame.img = img; tech_pvt->read_video_frame.img = img;
*frame = &tech_pvt->read_video_frame; *frame = &tech_pvt->read_video_frame;
switch_set_flag(*frame, SFF_RAW_RTP); switch_set_flag(*frame, SFF_RAW_RTP);
switch_clear_flag(*frame, SFF_CNG); switch_clear_flag(*frame, SFF_CNG);
(*frame)->codec = &tech_pvt->video_codec; (*frame)->codec = &tech_pvt->video_codec;
}
} else { } else {
*frame = &tech_pvt->read_frame; *frame = &tech_pvt->read_frame;
tech_pvt->read_frame.codec = &tech_pvt->video_codec; tech_pvt->read_frame.codec = &tech_pvt->video_codec;