ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-8909 #resolve [Add feature to play background video while recording inbound video]

Browse Source
This commit is contained in:
Anthony Minessale
2016-03-07 19:59:03 -06:00
parent 3ca6ed4365
commit b7227465b6
9 changed files with 264 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/switch_core.h
+2
View File
@@ -1929,6 +1929,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(_In_ switch_file_han
*/
SWITCH_DECLARE(switch_status_t) switch_core_file_close(_In_ switch_file_handle_t *fh);
SWITCH_DECLARE(switch_status_t) switch_core_file_command(switch_file_handle_t *fh, switch_file_command_t command);
SWITCH_DECLARE(switch_status_t) switch_core_file_truncate(switch_file_handle_t *fh, int64_t offset);
SWITCH_DECLARE(switch_bool_t) switch_core_file_has_video(switch_file_handle_t *fh);
src/include/switch_core_media.h
+2
View File
@@ -340,6 +340,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_lock_unlock(switch_core_s
SWITCH_DECLARE(void) switch_core_session_stop_media(switch_core_session_t *session);
SWITCH_DECLARE(switch_media_flow_t) switch_core_session_media_flow(switch_core_session_t *session, switch_media_type_t type);
SWITCH_DECLARE(switch_status_t) switch_core_media_get_vid_params(switch_core_session_t *session, switch_vid_params_t *vid_params);
SWITCH_DECLARE(switch_status_t) switch_core_media_lock_video_file(switch_core_session_t *session, switch_rw_t rw);
SWITCH_DECLARE(switch_status_t) switch_core_media_unlock_video_file(switch_core_session_t *session, switch_rw_t rw);
SWITCH_DECLARE(switch_status_t) switch_core_media_set_video_file(switch_core_session_t *session, switch_file_handle_t *fh, switch_rw_t rw);
SWITCH_DECLARE(switch_file_handle_t *) switch_core_media_get_video_file(switch_core_session_t *session, switch_rw_t rw);
SWITCH_DECLARE(switch_bool_t) switch_core_session_in_video_thread(switch_core_session_t *session);
src/include/switch_module_interfaces.h
+2
View File
@@ -289,6 +289,8 @@ struct switch_file_interface {
switch_status_t (*file_set_string) (switch_file_handle_t *fh, switch_audio_col_t col, const char *string);
/*! function to get meta data */
switch_status_t (*file_get_string) (switch_file_handle_t *fh, switch_audio_col_t col, const char **string);
/*! function to control the underlying tech of the file */
switch_status_t (*file_command) (switch_file_handle_t *fh, switch_file_command_t command);
/*! list of supported file extensions */
char **extens;
switch_thread_rwlock_t *rwlock;
src/include/switch_types.h
+6 -1
View File
@@ -1811,7 +1811,8 @@ typedef enum {
SWITCH_FILE_WRITE_OVER = (1 << 16),
SWITCH_FILE_NOMUX = (1 << 17),
SWITCH_FILE_BREAK_ON_CHANGE = (1 << 18),
SWITCH_FILE_FLAG_VIDEO = (1 << 19)
SWITCH_FILE_FLAG_VIDEO = (1 << 19),
SWITCH_FILE_FLAG_VIDEO_EOF = (1 << 20)
} switch_file_flag_enum_t;
typedef uint32_t switch_file_flag_t;
@@ -2595,6 +2596,10 @@ typedef enum {
SPY_DUAL_CROP
} switch_vid_spy_fmt_t;
typedef enum {
SCFC_FLUSH_AUDIO
} switch_file_command_t;
SWITCH_END_EXTERN_C
#endif
/* For Emacs: