fix isac 32khz

diff --git a/src/mod/codecs/mod_isac/mod_isac.c b/src/mod/codecs/mod_isac/mod_isac.c
index 7cea0ae5f85304f64eebbb16402dc057fa2dd384..0059b9af9f7001e08a5dc52db322a1b1ffdf8037 100644 (file)
--- a/src/mod/codecs/mod_isac/mod_isac.c
+++ b/src/mod/codecs/mod_isac/mod_isac.c
@@ -78,20 +78,25 @@ static switch_status_t switch_isac_init(switch_codec_t *codec, switch_codec_flag
        }
 
        if (codec->implementation->actual_samples_per_second == 16000) {
-               if (WebRtcIsac_ControlBwe(context->ISAC_main_inst, 0, codec->implementation->microseconds_per_packet / 1000, 0) < 0) {
+               if (WebRtcIsac_ControlBwe(context->ISAC_main_inst, 32000, codec->implementation->microseconds_per_packet / 1000, 1) < 0) {
                        return SWITCH_STATUS_FALSE;
                }
+
+               if (WebRtcIsac_SetMaxPayloadSize(context->ISAC_main_inst, 400) < 0) {
+                       return SWITCH_STATUS_FALSE;
+               }
+
        } else {
+               if (WebRtcIsac_Control(context->ISAC_main_inst, 32000, codec->implementation->microseconds_per_packet / 1000) < 0) {
+                       return SWITCH_STATUS_FALSE;
+               }
 
-               if (WebRtcIsac_Control(context->ISAC_main_inst, codec->implementation->bits_per_second, codec->implementation->microseconds_per_packet / 1000) < 0) {
-                                                          
+               if (WebRtcIsac_SetMaxPayloadSize(context->ISAC_main_inst, 600) < 0) {
                        return SWITCH_STATUS_FALSE;
                }
        }
        
-       if (WebRtcIsac_SetMaxPayloadSize(context->ISAC_main_inst, codec->implementation->decoded_bytes_per_packet) < 0) {
-               return SWITCH_STATUS_FALSE;
-       }
+
        
        if (WebRtcIsac_SetMaxRate(context->ISAC_main_inst, codec->implementation->bits_per_second) < 0) {
                return SWITCH_STATUS_FALSE;
@@ -182,7 +187,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_isac_codec_load)
                                                                                 SWITCH_CODEC_TYPE_AUDIO,
                                                                                 99,    
                                                                                 "isac",
-                                                                                NULL,  
+                                                                                "ibitrate=32000;maxbitrate=53400",     
                                                                                 16000, 
                                                                                 16000, 
                                                                                 53400, 
@@ -203,7 +208,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_isac_codec_load)
                                                                                 SWITCH_CODEC_TYPE_AUDIO,
                                                                                 99,    
                                                                                 "isac",
-                                                                                NULL,  
+                                                                                "ibitrate=32000;maxbitrate=53400",     
                                                                                 16000, 
                                                                                 16000, 
                                                                                 53400, 
@@ -225,13 +230,33 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_isac_codec_load)
                                                                                 SWITCH_CODEC_TYPE_AUDIO,
                                                                                 99,    
                                                                                 "isac",
-                                                                                "ibitrate=20000;maxbitrate=45000",     
+                                                                                "ibitrate=32000;maxbitrate=160000",    
                                                                                 32000, 
                                                                                 32000, 
                                                                                 160000,        
                                                                                 30000, 
+                                                                                960,   
+                                                                                1920,  
+                                                                                0,     
+                                                                                1,     
+                                                                                6,     
+                                                                                switch_isac_init,      
+                                                                                switch_isac_encode,
+                                                                                switch_isac_decode,
+                                                                                switch_isac_destroy);
+
+
+       switch_core_codec_add_implementation(pool, codec_interface,     
+                                                                                SWITCH_CODEC_TYPE_AUDIO,
+                                                                                99,    
+                                                                                "isac",
+                                                                                "ibitrate=32000;maxbitrate=160000",    
+                                                                                32000, 
+                                                                                32000, 
+                                                                                160000,        
+                                                                                60000, 
+                                                                                1920,  
                                                                                 3840,  
-                                                                                7680,  
                                                                                 0,     
                                                                                 1,     
                                                                                 6,