report based on the codec we actually set.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8972 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c
index 44d62596c731e54e989a1660919f65d21adf3746..1bdc19bbe16bb53c7818f2de90d7293725358b07 100644 (file)
--- a/src/switch_core_codec.c
+++ b/src/switch_core_codec.c
@@ -76,16 +76,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
 
        if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) {
                switch_channel_event_set_data(session->channel, event);
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", codec->implementation->iananame);
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", codec->implementation->actual_samples_per_second);
-               if (codec->implementation->actual_samples_per_second != codec->implementation->samples_per_second) {
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", codec->implementation->samples_per_second);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", session->read_codec->implementation->iananame);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second);
+               if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) {
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second);
                }
                switch_event_fire(&event);
        }
 
-       switch_channel_set_variable(channel, "read_codec", codec->implementation->iananame);
-       switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second);
+       switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame);
+       switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second);
        switch_channel_set_variable(channel, "read_rate", tmp);
 
 
@@ -140,17 +140,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
 
        if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) {
                switch_channel_event_set_data(session->channel, event);
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", codec->implementation->iananame);
-               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", codec->implementation->actual_samples_per_second);
-               if (codec->implementation->actual_samples_per_second != codec->implementation->samples_per_second) {
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", session->write_codec->implementation->iananame);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_codec->implementation->actual_samples_per_second);
+               if (session->write_codec->implementation->actual_samples_per_second != session->write_codec->implementation->samples_per_second) {
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d",
-                                                                       codec->implementation->actual_samples_per_second);
+                                                                       session->write_codec->implementation->actual_samples_per_second);
                }
                switch_event_fire(&event);
        }
 
-       switch_channel_set_variable(channel, "write_codec", codec->implementation->iananame);
-       switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second);
+       switch_channel_set_variable(channel, "write_codec", session->write_codec->implementation->iananame);
+       switch_snprintf(tmp, sizeof(tmp), "%d", session->write_codec->implementation->actual_samples_per_second);
        switch_channel_set_variable(channel, "write_rate", tmp);
 
        return SWITCH_STATUS_SUCCESS;