codec sql

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

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 405656d1d2e5fee49eed335093a59465decce59e..86f4c02c920674c5a047d10752803265b872dce2 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -558,6 +558,7 @@ typedef enum {
        SWITCH_EVENT_MODULE_LOAD                - Module was loaded
        SWITCH_EVENT_DTMF                               - DTMF was sent
        SWITCH_EVENT_MESSAGE                    - A Basic Message
+       SWITCH_EVENT_CODEC                              - Codec Change
     SWITCH_EVENT_ALL                           - All events at once
 </pre>
 
@@ -586,6 +587,7 @@ typedef enum {
        SWITCH_EVENT_MODULE_LOAD,
        SWITCH_EVENT_DTMF,
        SWITCH_EVENT_MESSAGE,
+       SWITCH_EVENT_CODEC,
        SWITCH_EVENT_ALL
 } switch_event_types_t;
 

diff --git a/src/switch_core.c b/src/switch_core.c
index ad11cb9e27f38637b75889681956cee4cf03e8da..50fa6c8342581fb8a8b8bea416cedb62eb0d0cc7 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -353,8 +353,17 @@ SWITCH_DECLARE(char *) switch_core_session_get_uuid(switch_core_session_t *sessi
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec)
 {
+       switch_event_t *event;
+
        assert(session != NULL);
 
+       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", codec->implementation->iananame);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", codec->implementation->samples_per_second);
+               switch_event_fire(&event);
+       }
+                               
        session->read_codec = codec;
        return SWITCH_STATUS_SUCCESS;
 }
@@ -366,8 +375,16 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec)
 {
+       switch_event_t *event;
        assert(session != NULL);
 
+       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", codec->implementation->iananame);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", codec->implementation->samples_per_second);
+               switch_event_fire(&event);
+       }
+
        session->write_codec = codec;
        return SWITCH_STATUS_SUCCESS;
 }
@@ -2867,14 +2884,18 @@ static void core_event_handler(switch_event_t *event)
                                                                         switch_event_get_header(event, "channel-state")
                                                                         );
                break;
-       case SWITCH_EVENT_CHANNEL_EXECUTE:
-               sql = switch_core_db_mprintf("update channels set application='%q',application_data='%q', read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'",
-                                                                        switch_event_get_header(event, "application"),
-                                                                        switch_event_get_header(event, "application-data"),
+       case SWITCH_EVENT_CODEC:
+               sql = switch_core_db_mprintf("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'",
                                                                         switch_event_get_header(event, "channel-read-codec-name"),
                                                                         switch_event_get_header(event, "channel-read-codec-rate"),
                                                                         switch_event_get_header(event, "channel-write-codec-name"),
                                                                         switch_event_get_header(event, "channel-write-codec-rate"),
+                                                                        switch_event_get_header(event, "unique-id"));
+               break;
+       case SWITCH_EVENT_CHANNEL_EXECUTE:
+               sql = switch_core_db_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'",
+                                                                        switch_event_get_header(event, "application"),
+                                                                        switch_event_get_header(event, "application-data"),
                                                                         switch_event_get_header(event, "unique-id")
                                                                         );
                break;

diff --git a/src/switch_event.c b/src/switch_event.c
index dc09b1ae66a5b70ab72c54221abdb77df31887ea..40e2b829b3605fe125da64c73c718aab27c7f094 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -113,6 +113,7 @@ static char *EVENT_NAMES[] = {
        "MODULE_LOAD",
        "DTMF",
        "MESSAGE",
+       "CODEC",
        "ALL"
 };