kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-24 04:37:38 +00:00
Code Issues Projects Releases Wiki Activity

[Core] Fix locking and a memory leak in switch_core_session_write_video_frame() and switch_core_session_write_text_frame().

Browse Source
This commit is contained in:
Andrey Volk 2020-04-25 02:56:06 +04:00
parent 2d6e2e2fa3
commit 1956911e4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_core_media.c
View File

@ -14562,7 +14562,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO]; v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];
if (v_engine->thread_write_lock && v_engine->thread_write_lock != switch_thread_self()) { if (v_engine->thread_write_lock && v_engine->thread_write_lock != switch_thread_self()) {
return SWITCH_STATUS_SUCCESS; switch_goto_status(SWITCH_STATUS_SUCCESS, done);
} }
if (!smh->video_init && smh->mparams->video_key_first && (now - smh->video_last_key_time) > smh->mparams->video_key_first) { if (!smh->video_init && smh->mparams->video_key_first && (now - smh->video_last_key_time) > smh->mparams->video_key_first) {
@ -14598,7 +14598,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
if (vid_params.width && vid_params.height && ((vid_params.width != img->d_w) || (vid_params.height != img->d_h))) { if (vid_params.width && vid_params.height && ((vid_params.width != img->d_w) || (vid_params.height != img->d_h))) {
switch_img_letterbox(img, &dup_img, vid_params.width, vid_params.height, "#000000f"); switch_img_letterbox(img, &dup_img, vid_params.width, vid_params.height, "#000000f");
if (!(img = dup_img)) { if (!(img = dup_img)) {
return SWITCH_STATUS_INUSE; switch_goto_status(SWITCH_STATUS_INUSE, done);
} }
} }
} }
@ -15509,7 +15509,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_text_frame(switch_core
if (!switch_buffer_inuse(t_engine->tf->write_buffer)) { if (!switch_buffer_inuse(t_engine->tf->write_buffer)) {
t_engine->tf->write_empty++; t_engine->tf->write_empty++;
return SWITCH_STATUS_BREAK; switch_goto_status(SWITCH_STATUS_BREAK, done);
} }
frame = &t_engine->tf->text_write_frame; frame = &t_engine->tf->text_write_frame;