FS-7656 fix various edge cases with video and non video files mixed into a source, fix a typo bug in file_read_video and fix same bug in mod_vlc, add a new flag to file_read_video to check if the handle is has active video, make mod_conference move the video in and out of a layer when the stream has video or not

This commit is contained in:
Anthony Minessale
2015-06-19 00:55:01 -05:00
parent 434d39d450
commit 385a3b545c
7 changed files with 175 additions and 65 deletions
+1
View File
@@ -916,6 +916,7 @@ SWITCH_DECLARE(switch_status_t) switch_dir_make_recursive(const char *path, swit
SWITCH_DECLARE(switch_status_t) switch_dir_open(switch_dir_t ** new_dir, const char *dirname, switch_memory_pool_t *pool);
SWITCH_DECLARE(switch_status_t) switch_dir_close(switch_dir_t *thedir);
SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir, char *buf, switch_size_t len);
SWITCH_DECLARE(uint32_t) switch_dir_count(switch_dir_t *thedir);
/** @} */
+2 -1
View File
@@ -2558,7 +2558,8 @@ typedef struct switch_frame_buffer_s switch_frame_buffer_t;
typedef enum {
SVR_BLOCK = (1 << 0),
SVR_FLUSH = (1 << 1)
SVR_FLUSH = (1 << 1),
SVR_CHECK = (1 << 2)
} switch_video_read_flag_t;
typedef enum {