kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-01 03:05:50 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4613 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-15 22:49:58 +00:00
parent 16291f437c
commit 9ffe54df46
3 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/switch_types.h
View File

@ -732,6 +732,7 @@ SWITCH_FILE_DATA_RAW = (1 << 7) - Read data as is
SWITCH_FILE_PAUSE = (1 << 8) - Pause SWITCH_FILE_PAUSE = (1 << 8) - Pause
SWITCH_FILE_NATIVE = (1 << 9) - File is in native format (no transcoding) SWITCH_FILE_NATIVE = (1 << 9) - File is in native format (no transcoding)
SWITCH_FILE_SEEK = (1 << 10) - File has done a seek SWITCH_FILE_SEEK = (1 << 10) - File has done a seek
SWITCH_FILE_OPEN = (1 << 11) - File is open
</pre> </pre>
*/ */
typedef enum { typedef enum {
@ -745,7 +746,8 @@ typedef enum {
SWITCH_FILE_DATA_RAW = (1 << 7), SWITCH_FILE_DATA_RAW = (1 << 7),
SWITCH_FILE_PAUSE = (1 << 8), SWITCH_FILE_PAUSE = (1 << 8),
SWITCH_FILE_NATIVE = (1 << 9), SWITCH_FILE_NATIVE = (1 << 9),
SWITCH_FILE_SEEK = (1 << 10) SWITCH_FILE_SEEK = (1 << 10),
SWITCH_FILE_OPEN = (1 << 11)
} switch_file_flag_t; } switch_file_flag_t;
typedef enum { typedef enum {

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

@ -1724,22 +1724,30 @@ static void conference_loop_output(conference_member_t *member)
/* Sub-Routine called by a record entity inside a conference */ /* Sub-Routine called by a record entity inside a conference */
static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, void *obj) static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, void *obj)
{ {
switch_frame_t write_frame = {0};
uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
switch_file_handle_t fh = {0}; switch_file_handle_t fh = {0};
conference_member_t smember = {0}, *member; conference_member_t smember = {0}, *member;
conference_record_t *rec = (conference_record_t *) obj; conference_record_t *rec = (conference_record_t *) obj;
conference_obj_t *conference = rec->conference; conference_obj_t *conference = rec->conference;
uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval);
uint32_t bytes = samples * 2; //uint32_t bytes = samples * 2;
uint32_t mux_used; uint32_t low_count = 0, mux_used;
char *vval; char *vval;
switch_timer_t timer = {0};
uint32_t rlen;
if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
return NULL; return NULL;
} }
if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, rec->pool) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer success interval: %u samples: %u\n", conference->interval, samples);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n");
return NULL;
}
switch_mutex_lock(globals.hash_mutex); switch_mutex_lock(globals.hash_mutex);
globals.threads++; globals.threads++;
switch_mutex_unlock(globals.hash_mutex); switch_mutex_unlock(globals.hash_mutex);
@ -1748,9 +1756,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
member->flags = MFLAG_CAN_HEAR | MFLAG_NOCHANNEL | MFLAG_RUNNING; member->flags = MFLAG_CAN_HEAR | MFLAG_NOCHANNEL | MFLAG_RUNNING;
write_frame.data = data;
write_frame.buflen = sizeof(data);
member->conference = conference; member->conference = conference;
member->native_rate = conference->rate; member->native_rate = conference->rate;
member->rec_path = rec->path; member->rec_path = rec->path;
@ -1796,29 +1801,45 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
} }
while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) { while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) {
if ((mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer)) >= bytes) { mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
if (mux_used) {
switch_mutex_lock(member->audio_out_mutex);
switch_buffer_zero(member->mux_buffer);
switch_mutex_unlock(member->audio_out_mutex);
mux_used = 0;
}
switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER);
}
if (mux_used) {
/* Flush the output buffer and write all the data (presumably muxed) to the file */ /* Flush the output buffer and write all the data (presumably muxed) to the file */
switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->audio_out_mutex);
write_frame.data = data; low_count = 0;
while ((write_frame.datalen = (uint32_t)switch_buffer_read(member->mux_buffer, write_frame.data, mux_used))) {
if ((rlen = (uint32_t)switch_buffer_read(member->mux_buffer, data, sizeof(data)))) {
if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) { if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) {
switch_size_t len = (switch_size_t) mux_used / 2; switch_size_t len = (switch_size_t) rlen / sizeof(int16_t);
switch_core_file_write(&fh, write_frame.data, &len); if (switch_core_file_write(&fh, data, &len) != SWITCH_STATUS_SUCCESS) {
goto end;
}
} }
} }
switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_out_mutex);
} else { } else {
switch_yield(20000); switch_core_timer_next(&timer);
} }
} /* Rinse ... Repeat */ } /* Rinse ... Repeat */
end: end:
switch_core_timer_destroy(&timer);
conference_del_member(conference, member); conference_del_member(conference, member);
switch_buffer_destroy(&member->audio_buffer); switch_buffer_destroy(&member->audio_buffer);
switch_buffer_destroy(&member->mux_buffer); switch_buffer_destroy(&member->mux_buffer);
switch_clear_flag_locked(member, MFLAG_RUNNING); switch_clear_flag_locked(member, MFLAG_RUNNING);
if (fh.fd) { if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
switch_core_file_close(&fh); switch_core_file_close(&fh);
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n");
@ -2293,7 +2314,6 @@ static void conference_list(conference_obj_t *conference, switch_stream_handle_t
uint32_t count = 0; uint32_t count = 0;
if (switch_test_flag(member, MFLAG_NOCHANNEL)) { if (switch_test_flag(member, MFLAG_NOCHANNEL)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "continue\n");
continue; continue;
} }

10
src/switch_core.c
View File

@ -1025,7 +1025,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh,
switch_status_t status; switch_status_t status;
char stream_name[128] = ""; char stream_name[128] = "";
char *rhs = NULL; char *rhs = NULL;
if ((rhs = strstr(file_path, SWITCH_URL_SEPARATOR))) { if ((rhs = strstr(file_path, SWITCH_URL_SEPARATOR))) {
switch_copy_string(stream_name, file_path, (rhs+1) - file_path); switch_copy_string(stream_name, file_path, (rhs+1) - file_path);
ext = stream_name; ext = stream_name;
@ -1069,7 +1069,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh,
fh->channels = 1; fh->channels = 1;
} }
return fh->file_interface->file_open(fh, file_path); if ((status = fh->file_interface->file_open(fh, file_path)) == SWITCH_STATUS_SUCCESS) {
switch_set_flag(fh, SWITCH_FILE_OPEN);
}
return status;
} }
SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len) SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len)
@ -1113,7 +1117,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t
SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh) SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
{ {
switch_clear_flag(fh, SWITCH_FILE_OPEN);
return fh->file_interface->file_close(fh); return fh->file_interface->file_close(fh);
} }
SWITCH_DECLARE(switch_status_t) switch_core_directory_open(switch_directory_handle_t *dh, SWITCH_DECLARE(switch_status_t) switch_core_directory_open(switch_directory_handle_t *dh,