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

FS-10560: [freeswitch-core] Add channel count to fsv #resolve

This commit is contained in:
Anthony Minessale 2017-07-31 12:10:56 -05:00
parent 144d3733cf
commit 94eb8ac0a7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod/applications/mod_fsv/mod_fsv.c
View File

@ -38,7 +38,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_fsv_load);
SWITCH_MODULE_DEFINITION(mod_fsv, mod_fsv_load, NULL, NULL); SWITCH_MODULE_DEFINITION(mod_fsv, mod_fsv_load, NULL, NULL);
#define VID_BIT (1 << 31) #define VID_BIT (1 << 31)
#define VERSION 4201 #define VERSION 4202
struct file_header { struct file_header {
int32_t version; int32_t version;
@ -47,6 +47,7 @@ struct file_header {
uint32_t audio_rate; uint32_t audio_rate;
uint32_t audio_ptime; uint32_t audio_ptime;
switch_time_t created; switch_time_t created;
int channels;
}; };
struct record_helper { struct record_helper {
@ -61,7 +62,7 @@ static void record_video_thread(switch_core_session_t *session, void *obj)
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
switch_status_t status; switch_status_t status;
switch_frame_t *read_frame; switch_frame_t *read_frame;
int bytes; int bytes, j = 0;
while (switch_channel_ready(channel)) { while (switch_channel_ready(channel)) {
status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
@ -74,6 +75,10 @@ static void record_video_thread(switch_core_session_t *session, void *obj)
continue; continue;
} }
if (j < 240 && (++j % 60) == 0) {
switch_core_session_request_video_refresh(session);
}
bytes = read_frame->packetlen | VID_BIT; bytes = read_frame->packetlen | VID_BIT;
switch_mutex_lock(eh->mutex); switch_mutex_lock(eh->mutex);
@ -150,7 +155,7 @@ SWITCH_STANDARD_APP(record_fsv_function)
NULL, NULL,
read_impl.samples_per_second, read_impl.samples_per_second,
read_impl.microseconds_per_packet / 1000, read_impl.microseconds_per_packet / 1000,
1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, read_impl.number_of_channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
} else { } else {
@ -164,6 +169,7 @@ SWITCH_STANDARD_APP(record_fsv_function)
if (switch_channel_test_flag(channel, CF_VIDEO)) { if (switch_channel_test_flag(channel, CF_VIDEO)) {
struct file_header h; struct file_header h;
memset(&h, 0, sizeof(h)); memset(&h, 0, sizeof(h));
vid_codec = switch_core_session_get_video_read_codec(session); vid_codec = switch_core_session_get_video_read_codec(session);
h.version = VERSION; h.version = VERSION;
@ -174,6 +180,7 @@ SWITCH_STANDARD_APP(record_fsv_function)
} }
h.audio_rate = read_impl.samples_per_second; h.audio_rate = read_impl.samples_per_second;
h.audio_ptime = read_impl.microseconds_per_packet / 1000; h.audio_ptime = read_impl.microseconds_per_packet / 1000;
h.channels = read_impl.number_of_channels;
if (write(fd, &h, sizeof(h)) != sizeof(h)) { if (write(fd, &h, sizeof(h)) != sizeof(h)) {
switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "File write failed"); switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "File write failed");
@ -184,6 +191,7 @@ SWITCH_STANDARD_APP(record_fsv_function)
eh.mutex = mutex; eh.mutex = mutex;
eh.fd = fd; eh.fd = fd;
switch_core_media_start_engine_function(session, SWITCH_MEDIA_TYPE_VIDEO, record_video_thread, &eh); switch_core_media_start_engine_function(session, SWITCH_MEDIA_TYPE_VIDEO, record_video_thread, &eh);
switch_core_session_request_video_refresh(session);
} }
@ -337,13 +345,15 @@ SWITCH_STANDARD_APP(play_fsv_function)
goto end; goto end;
} }
if (!h.channels) h.channels = 1;
if (switch_core_codec_init(&codec, if (switch_core_codec_init(&codec,
"L16", "L16",
NULL, NULL,
NULL, NULL,
h.audio_rate, h.audio_rate,
h.audio_ptime, h.audio_ptime,
1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, h.channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
} else { } else {