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

FS-7900 #resolve

This commit is contained in:
Brian West 2015-07-27 09:29:26 -05:00
parent 75e46cedb8
commit da5416bf77
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mod/formats/mod_png/mod_png.c
View File

@ -252,6 +252,11 @@ static switch_bool_t write_png_bug_callback(switch_media_bug_t *bug, void *user_
if (!frame || !frame->img) break; if (!frame || !frame->img) break;
if (data->both_legs == SWITCH_FALSE) {
switch_img_write_png(frame->img, data->path);
return SWITCH_FALSE;
}
if (!data->write_img) { if (!data->write_img) {
switch_img_copy(frame->img, &data->write_img); switch_img_copy(frame->img, &data->write_img);
} }
@ -304,7 +309,7 @@ SWITCH_STANDARD_API(uuid_write_png_function)
argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
} }
if (argc < 2 || (argc > 2 && strcasecmp(argv[2], "concat") && strcasecmp(argv[2], "split"))) { if (argc < 2 || (argc > 2 && strcasecmp(argv[2], "concat") && strcasecmp(argv[2], "split") && strcasecmp(argv[2], "write"))) {
stream->write_function(stream, "-USAGE: <uuid> <path> [concat | split <other_path>]\n"); stream->write_function(stream, "-USAGE: <uuid> <path> [concat | split <other_path>]\n");
goto end; goto end;
} }
@ -325,29 +330,34 @@ SWITCH_STANDARD_API(uuid_write_png_function)
bug_data = switch_core_session_alloc(session_, sizeof(*bug_data)); bug_data = switch_core_session_alloc(session_, sizeof(*bug_data));
if (argc > 2) { if (argc > 2) {
switch_channel_t *channel_ = switch_core_session_get_channel(session_); if (!strcasecmp(argv[2], "write")) {
flags = SMBF_WRITE_VIDEO_PING;
} else {
if (!switch_channel_test_flag_partner(channel_, CF_VIDEO)) { switch_channel_t *channel_ = switch_core_session_get_channel(session_);
stream->write_function(stream, "-ERR Session must be bridged and other leg must have video.\n");
switch_core_session_rwunlock(session_);
goto end;
}
bug_data->both_legs = SWITCH_TRUE; if (!switch_channel_test_flag_partner(channel_, CF_VIDEO)) {
flags |= SMBF_WRITE_VIDEO_PING; stream->write_function(stream, "-ERR Session must be bridged and other leg must have video.\n");
if (!strcasecmp(argv[2], "split")) {
if (argc == 3) {
stream->write_function(stream, "-ERR Second filename expected but not given.\n");
switch_core_session_rwunlock(session_); switch_core_session_rwunlock(session_);
goto end; goto end;
} }
if (!switch_is_file_path(argv[3])) { bug_data->both_legs = SWITCH_TRUE;
const char *prefix = SWITCH_GLOBAL_dirs.images_dir; flags |= SMBF_WRITE_VIDEO_PING;
bug_data->other_path = switch_core_session_sprintf(session_, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, argv[3]);
} else { if (!strcasecmp(argv[2], "split")) {
bug_data->other_path = switch_core_session_strdup(session_, argv[3]); if (argc == 3) {
stream->write_function(stream, "-ERR Second filename expected but not given.\n");
switch_core_session_rwunlock(session_);
goto end;
}
if (!switch_is_file_path(argv[3])) {
const char *prefix = SWITCH_GLOBAL_dirs.images_dir;
bug_data->other_path = switch_core_session_sprintf(session_, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, argv[3]);
} else {
bug_data->other_path = switch_core_session_strdup(session_, argv[3]);
}
} }
} }
} }
@ -398,6 +408,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_png_load)
SWITCH_ADD_API(api_interface, "uuid_write_png", "grab an image from a call",uuid_write_png_function, ""); SWITCH_ADD_API(api_interface, "uuid_write_png", "grab an image from a call",uuid_write_png_function, "");
switch_console_set_complete("add uuid_write_png ::console::list_uuid");
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }