Author: anthm Date: Mon Oct 1 12:34:28 2007 New Revision: 5772 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_async.c Log: set the variable RECORD_STEREO=true to make record_session create stereo files with each leg in it's own channel, note you cannot play these files with freewitch with playback because we don't support stereo files Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Oct 1 12:34:28 2007 @@ -786,7 +786,8 @@ SMBF_READ_STREAM = (1 << 0), SMBF_WRITE_STREAM = (1 << 1), SMBF_WRITE_REPLACE = (1 << 2), - SMBF_READ_REPLACE = (1 << 3) + SMBF_READ_REPLACE = (1 << 3), + SMBF_STEREO = (1 << 4) } switch_media_bug_flag_t; /*! Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Oct 1 12:34:28 2007 @@ -119,32 +119,49 @@ bytes = (datalen > frame->datalen) ? datalen : frame->datalen; - + if (bytes) { + int16_t tmp[960], *tp = tmp; + dp = (int16_t *) data; fp = (int16_t *) frame->data; - rlen = frame->datalen / 2; wlen = datalen / 2; blen = bytes / 2; - for (x = 0; x < blen; x++) { - int32_t z = 0; - - if (x < rlen) { - z += (int32_t) *(fp + x); + if (switch_test_flag(bug, SMBF_STEREO)) { + for (x = 0; x < blen; x++) { + if (x < rlen) { + *(tp++) = *(fp + x); + } else { + *(tp++) = 0; + } + if (x < wlen) { + *(tp++) = *(dp + x); + } else { + *(tp++) = 0; + } } - if (x < wlen) { - z += (int32_t) *(dp + x); + memcpy(frame->data, tmp, bytes * 2); + } else { + for (x = 0; x < blen; x++) { + int32_t z = 0; + + if (x < rlen) { + z += (int32_t) *(fp + x); + } + if (x < wlen) { + z += (int32_t) *(dp + x); + } + switch_normalize_to_16bit(z); + *(fp + x) = (int16_t) z; } - switch_normalize_to_16bit(z); - *(fp + x) = (int16_t) z; } frame->datalen = bytes; frame->samples = bytes / sizeof(int16_t); frame->rate = read_codec->implementation->samples_per_second; - + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Oct 1 12:34:28 2007 @@ -302,7 +302,8 @@ switch_media_bug_t *bug; switch_status_t status; time_t to = 0; - + switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM; + int channels; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -317,19 +318,26 @@ } } - read_codec = switch_core_session_get_read_codec(session); assert(read_codec != NULL); - fh->channels = read_codec->implementation->number_of_channels; + channels = read_codec->implementation->number_of_channels; + + if ((p = switch_channel_get_variable(channel, "RECORD_STEREO")) && switch_true(p)) { + flags |= SMBF_STEREO; + channels = 2; + } + + fh->channels = channels; fh->samplerate = read_codec->implementation->samples_per_second; if (switch_core_file_open(fh, file, - read_codec->implementation->number_of_channels, + channels, read_codec->implementation->samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", file); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session); return SWITCH_STATUS_GENERR; @@ -376,8 +384,9 @@ if (limit) { to = time(NULL) + limit; } - - if ((status = switch_core_media_bug_add(session, record_callback, fh, to, SMBF_BOTH, &bug)) != SWITCH_STATUS_SUCCESS) { + + if ((status = switch_core_media_bug_add(session, record_callback, fh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file); switch_core_file_close(fh); return status; }