From b3b3b9af4b4eb4182e6194e2370dc41dab2bf8c9 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 13 Jun 2007 21:51:18 +0000 Subject: [PATCH] tweak git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5350 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core_codec.c | 3 +++ src/switch_core_io.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c index 605e500f2a..770e11ff3a 100644 --- a/src/switch_core_codec.c +++ b/src/switch_core_codec.c @@ -48,6 +48,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s } session->read_codec = codec; + session->raw_read_frame.codec = session->read_codec; + session->raw_write_frame.codec = session->read_codec; + return SWITCH_STATUS_SUCCESS; } diff --git a/src/switch_core_io.c b/src/switch_core_io.c index 0eb56fa349..fc827bb4d5 100644 --- a/src/switch_core_io.c +++ b/src/switch_core_io.c @@ -300,6 +300,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi enc_frame = &session->raw_read_frame; } session->enc_read_frame.datalen = session->enc_read_frame.buflen; + assert(session->read_codec != NULL); assert(enc_frame != NULL); assert(enc_frame->data != NULL); @@ -316,7 +317,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi case SWITCH_STATUS_RESAMPLE: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 1\n"); case SWITCH_STATUS_SUCCESS: - session->enc_read_frame.codec = session->read_codec; session->enc_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); session->enc_read_frame.timestamp = read_frame->timestamp; session->enc_read_frame.rate = read_frame->rate; @@ -327,7 +327,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi *frame = &session->enc_read_frame; break; case SWITCH_STATUS_NOOP: - session->raw_read_frame.codec = session->read_codec; session->raw_read_frame.samples = enc_frame->codec->implementation->samples_per_frame; session->raw_read_frame.timestamp = read_frame->timestamp; session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode;