]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
increase memory for buffers to hold new decoded stereo codecs
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Jul 2014 21:55:21 +0000 (02:55 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Jul 2014 21:55:21 +0000 (02:55 +0500)
src/include/switch_loadable_module.h
src/include/switch_types.h

index 53b8b5db2c0b32de2f39628a6bec347dfc535086..1dd8fb7b55286f0ecd53dc130cd9c9c9bb7117bd 100644 (file)
@@ -499,8 +499,8 @@ static inline void switch_core_codec_add_implementation(switch_memory_pool_t *po
 {
 
        if (decoded_bytes_per_packet > SWITCH_RECOMMENDED_BUFFER_SIZE) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %d not enough buffer space %u > %d\n",
-                                                 iananame, actual_samples_per_second, microseconds_per_packet / 1000, decoded_bytes_per_packet, SWITCH_RECOMMENDED_BUFFER_SIZE);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %d channels %d not enough buffer space %u > %d\n",
+                                                 iananame, actual_samples_per_second, microseconds_per_packet / 1000, number_of_channels, decoded_bytes_per_packet, SWITCH_RECOMMENDED_BUFFER_SIZE);
        } else if (codec_type == SWITCH_CODEC_TYPE_VIDEO || switch_check_interval(actual_samples_per_second, microseconds_per_packet / 1000)) {
                switch_codec_implementation_t *impl = (switch_codec_implementation_t *) switch_core_alloc(pool, sizeof(*impl));
                impl->codec_type = codec_type;
@@ -525,8 +525,8 @@ static inline void switch_core_codec_add_implementation(switch_memory_pool_t *po
                impl->impl_id = switch_core_codec_next_id();
                codec_interface->implementations = impl;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %d\n",
-                                                 iananame, actual_samples_per_second, microseconds_per_packet / 1000);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %d channels: %d\n",
+                                                 iananame, actual_samples_per_second, microseconds_per_packet / 1000, number_of_channels);
        }
 }
 
index 55aa80f061fcb6b1699640b860ff9285f700ddf2..96a484e6a0fa8e4119df14f93e19fe9df0400ddd 100644 (file)
@@ -533,7 +533,7 @@ SWITCH_DECLARE_DATA extern switch_filenames SWITCH_GLOBAL_filenames;
 #define SWITCH_INTERVAL_PAD 10 /* A little extra buffer space to be safe */
 #define SWITCH_MAX_SAMPLE_LEN 48
 #define SWITCH_BYTES_PER_SAMPLE 2      /* slin is 2 bytes per sample */
-#define SWITCH_RECOMMENDED_BUFFER_SIZE 4096    /* worst case of 32khz @60ms we only do 48khz @10ms which is 960 */
+#define SWITCH_RECOMMENDED_BUFFER_SIZE 8192
 #define SWITCH_MAX_CODECS 50
 #define SWITCH_MAX_STATE_HANDLERS 30
 #define SWITCH_CORE_QUEUE_LEN 100000