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

FS-7513: break is safer than continue 

when the encoder returns 0, it means no more data will come and we should not try again
This commit is contained in:
Seven Du 2015-04-16 10:15:56 +08:00 committed by Michael Jerris
parent f6886b05d1
commit 30463bfc1e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1595,7 +1595,7 @@ static void write_canvas_image_to_codec_group(conference_obj_t *conference, code
switch_assert((encode_status == SWITCH_STATUS_SUCCESS && frame->m) || !frame->m); switch_assert((encode_status == SWITCH_STATUS_SUCCESS && frame->m) || !frame->m);
if (frame->datalen == 0) { if (frame->datalen == 0) {
continue; break;
} }
if (frame->timestamp) { if (frame->timestamp) {

2
src/switch_core_media.c
View File

@ -10393,7 +10393,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
frame->flags &= ~SFF_PICTURE_RESET; frame->flags &= ~SFF_PICTURE_RESET;
} }
if (frame->datalen == 0) continue; if (frame->datalen == 0) break;
switch_set_flag(frame, SFF_RAW_RTP_PARSE_FRAME); switch_set_flag(frame, SFF_RAW_RTP_PARSE_FRAME);
status = switch_core_session_write_encoded_video_frame(session, frame, flags, stream_id); status = switch_core_session_write_encoded_video_frame(session, frame, flags, stream_id);