Skip to content

F
freeswitch
提交 0932532e authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

simplify file interface for stream file interfaces, cleanup. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7042 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 445da648
隐藏空白字符变更
内嵌 并排
正在显示 包含 19 行增加 和 67 行删除
src/mod/formats/mod_local_stream/mod_local_stream.c
浏览文件 @ 0932532e
...@@ -85,7 +85,6 @@ static int do_rand(void) ...@@ -85,7 +85,6 @@ static int do_rand(void)
return index; return index;
} }
static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj) static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj)
{ {
local_stream_source_t *source = obj; local_stream_source_t *source = obj;
...@@ -151,7 +150,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void ...@@ -151,7 +150,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
} }
continue; continue;
} }
} }
if (skip > 0) { if (skip > 0) {
...@@ -180,7 +178,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void ...@@ -180,7 +178,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
return NULL; return NULL;
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s rate: %d\n", fname, source->rate); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s rate: %d\n", fname, source->rate);
while (RUNNING) { while (RUNNING) {
...@@ -217,7 +214,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void ...@@ -217,7 +214,6 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
switch_dir_close(source->dir_handle); switch_dir_close(source->dir_handle);
source->dir_handle = NULL; source->dir_handle = NULL;
} }
if (fd > -1) { if (fd > -1) {
...@@ -262,8 +258,6 @@ static switch_status_t local_stream_file_open(switch_file_handle_t *handle, cons ...@@ -262,8 +258,6 @@ static switch_status_t local_stream_file_open(switch_file_handle_t *handle, cons
goto end; goto end;
} }
handle->samples = 0; handle->samples = 0;
handle->samplerate = source->rate; handle->samplerate = source->rate;
handle->channels = source->channels; handle->channels = source->channels;
...@@ -318,11 +312,6 @@ static switch_status_t local_stream_file_close(switch_file_handle_t *handle) ...@@ -318,11 +312,6 @@ static switch_status_t local_stream_file_close(switch_file_handle_t *handle)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t local_stream_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len)
{ {
local_stream_context_t *context = handle->private_info; local_stream_context_t *context = handle->private_info;
...@@ -344,21 +333,6 @@ static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void ...@@ -344,21 +333,6 @@ static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t local_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t local_stream_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t local_stream_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string)
{
return SWITCH_STATUS_FALSE;
}
/* Registration */ /* Registration */
static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
...@@ -372,7 +346,6 @@ static void launch_threads(void) ...@@ -372,7 +346,6 @@ static void launch_threads(void)
switch_thread_t *thread; switch_thread_t *thread;
switch_threadattr_t *thd_attr = NULL; switch_threadattr_t *thd_attr = NULL;
if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
return; return;
...@@ -442,14 +415,11 @@ static void launch_threads(void) ...@@ -442,14 +415,11 @@ static void launch_threads(void)
switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_detach_set(thd_attr, 1);
switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool); switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool);
} }
switch_xml_free(xml); switch_xml_free(xml);
} }
SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load) SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load)
{ {
switch_file_interface_t *file_interface; switch_file_interface_t *file_interface;
...@@ -462,10 +432,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load) ...@@ -462,10 +432,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load)
file_interface->file_open = local_stream_file_open; file_interface->file_open = local_stream_file_open;
file_interface->file_close = local_stream_file_close; file_interface->file_close = local_stream_file_close;
file_interface->file_read = local_stream_file_read; file_interface->file_read = local_stream_file_read;
file_interface->file_write = local_stream_file_write;
file_interface->file_seek = local_stream_file_seek;
file_interface->file_set_string = local_stream_file_set_string;
file_interface->file_get_string = local_stream_file_get_string;
memset(&globals, 0, sizeof(globals)); memset(&globals, 0, sizeof(globals));
switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool);
......
src/mod/formats/mod_tone_stream/mod_tone_stream.c
浏览文件 @ 0932532e
...@@ -30,14 +30,11 @@ ...@@ -30,14 +30,11 @@
* *
*/ */
#include <switch.h> #include <switch.h>
/* for apr_pstrcat */
#define DEFAULT_PREBUFFER_SIZE 1024 * 16
SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load); SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load);
SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL); SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown);
static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map) static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map)
{ {
switch_buffer_t *audio_buffer = ts->user_data; switch_buffer_t *audio_buffer = ts->user_data;
...@@ -113,44 +110,21 @@ static switch_status_t tone_stream_file_close(switch_file_handle_t *handle) ...@@ -113,44 +110,21 @@ static switch_status_t tone_stream_file_close(switch_file_handle_t *handle)
switch_buffer_t *audio_buffer = handle->private_info; switch_buffer_t *audio_buffer = handle->private_info;
switch_buffer_destroy(&audio_buffer); switch_buffer_destroy(&audio_buffer);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t tone_stream_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t tone_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) static switch_status_t tone_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len)
{ {
switch_buffer_t *audio_buffer = handle->private_info; switch_buffer_t *audio_buffer = handle->private_info;
switch_size_t bytes; switch_size_t bytes;
if ((bytes = (uint32_t) switch_buffer_read_loop(audio_buffer, data, *len * 2)) <= 0) { if ((bytes = switch_buffer_read_loop(audio_buffer, data, *len * 2)) <= 0) {
*len = 0; *len = 0;
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} else {
*len = bytes / 2;
} }
*len = bytes / 2;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
}
static switch_status_t tone_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t tone_stream_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string)
{
return SWITCH_STATUS_FALSE;
}
static switch_status_t tone_stream_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string)
{
return SWITCH_STATUS_FALSE;
} }
/* Registration */ /* Registration */
...@@ -169,10 +143,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load) ...@@ -169,10 +143,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load)
file_interface->file_open = tone_stream_file_open; file_interface->file_open = tone_stream_file_open;
file_interface->file_close = tone_stream_file_close; file_interface->file_close = tone_stream_file_close;
file_interface->file_read = tone_stream_file_read; file_interface->file_read = tone_stream_file_read;
file_interface->file_write = tone_stream_file_write;
file_interface->file_seek = tone_stream_file_seek;
file_interface->file_set_string = tone_stream_file_set_string;
file_interface->file_get_string = tone_stream_file_get_string;
/* 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;
......
src/switch_core_file.c
浏览文件 @ 0932532e
...@@ -178,6 +178,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh, ...@@ -178,6 +178,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh,
switch_assert(fh != NULL); switch_assert(fh != NULL);
switch_assert(fh->file_interface != NULL); switch_assert(fh->file_interface != NULL);
if (!fh->file_interface->file_write) {
return SWITCH_STATUS_FALSE;
}
if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) {
if (!fh->resampler) { if (!fh->resampler) {
...@@ -225,6 +229,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, ...@@ -225,6 +229,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh,
switch_assert(fh != NULL); switch_assert(fh != NULL);
switch_assert(fh->file_interface != NULL); switch_assert(fh->file_interface != NULL);
if (!fh->file_interface->file_seek) {
return SWITCH_STATUS_FALSE;
}
switch_set_flag(fh, SWITCH_FILE_SEEK); switch_set_flag(fh, SWITCH_FILE_SEEK);
status = fh->file_interface->file_seek(fh, cur_pos, samples, whence); status = fh->file_interface->file_seek(fh, cur_pos, samples, whence);
if (samples) { if (samples) {
...@@ -238,6 +246,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t ...@@ -238,6 +246,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t
switch_assert(fh != NULL); switch_assert(fh != NULL);
switch_assert(fh->file_interface != NULL); switch_assert(fh->file_interface != NULL);
if (!fh->file_interface->file_set_string) {
return SWITCH_STATUS_FALSE;
}
return fh->file_interface->file_set_string(fh, col, string); return fh->file_interface->file_set_string(fh, col, string);
} }
...@@ -246,6 +258,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t ...@@ -246,6 +258,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t
switch_assert(fh != NULL); switch_assert(fh != NULL);
switch_assert(fh->file_interface != NULL); switch_assert(fh->file_interface != NULL);
if (!fh->file_interface->file_get_string) {
return SWITCH_STATUS_FALSE;
}
return fh->file_interface->file_get_string(fh, col, string); return fh->file_interface->file_get_string(fh, col, string);
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论