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

core tweaks 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1695 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-06-28 19:12:56 +00:00
parent e30e2c5cbd
commit 22e3e0f6df
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mod/codecs/mod_l16/mod_l16.c
View File

@ -57,7 +57,6 @@ static switch_status_t switch_raw_encode(switch_codec_t *codec,
void *encoded_data, void *encoded_data,
uint32_t *encoded_data_len, uint32_t *encoded_rate, unsigned int *flag) uint32_t *encoded_data_len, uint32_t *encoded_rate, unsigned int *flag)
{ {
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */ /* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */
if (codec && other_codec && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) { if (codec && other_codec && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
memcpy(encoded_data, decoded_data, decoded_data_len); memcpy(encoded_data, decoded_data, decoded_data_len);

24
src/switch_core.c
View File

@ -1057,9 +1057,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
int timeout, int stream_id) int timeout, int stream_id)
{ {
switch_io_event_hook_read_frame_t *ptr; switch_io_event_hook_read_frame_t *ptr;
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status;
int need_codec = 0, perfect = 0; int need_codec, perfect;
top:
status = SWITCH_STATUS_FALSE;
need_codec = perfect = 0;
assert(session != NULL); assert(session != NULL);
*frame = NULL; *frame = NULL;
@ -1180,18 +1184,22 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
session->raw_read_frame.rate = (*frame)->rate; session->raw_read_frame.rate = (*frame)->rate;
} else { } else {
session->raw_read_frame.datalen = (uint32_t)switch_buffer_read(session->raw_read_buffer, session->raw_read_frame.datalen = (uint32_t)switch_buffer_read(session->raw_read_buffer,
session->raw_read_frame.data, session->raw_read_frame.data,
session->read_codec->implementation-> session->read_codec->implementation->bytes_per_frame);
bytes_per_frame);
session->raw_read_frame.rate = session->read_codec->implementation->samples_per_second; session->raw_read_frame.rate = session->read_codec->implementation->samples_per_second;
enc_frame = &session->raw_read_frame; enc_frame = &session->raw_read_frame;
} }
session->enc_read_frame.datalen = session->enc_read_frame.buflen; session->enc_read_frame.datalen = session->enc_read_frame.buflen;
assert(session->read_codec != NULL);
assert(enc_frame != NULL);
assert(enc_frame->data != NULL);
status = switch_core_codec_encode(session->read_codec, status = switch_core_codec_encode(session->read_codec,
enc_frame->codec, enc_frame->codec,
enc_frame->data, enc_frame->data,
enc_frame->datalen, enc_frame->datalen,
enc_frame->codec->implementation->samples_per_second, session->read_codec->implementation->samples_per_second,
session->enc_read_frame.data, session->enc_read_frame.data,
&session->enc_read_frame.datalen, &session->enc_read_frame.datalen,
&session->enc_read_frame.rate, &session->enc_read_frame.rate,
@ -1215,6 +1223,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
status = SWITCH_STATUS_GENERR; status = SWITCH_STATUS_GENERR;
break; break;
} }
} else {
goto top;
} }
} }
} }