提交 2990ef8c authored 作者: Anthony Minessale's avatar Anthony Minessale

fix codec issue

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10390 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 e7a37e58
...@@ -633,8 +633,8 @@ struct switch_api_interface { ...@@ -633,8 +633,8 @@ struct switch_api_interface {
struct switch_api_interface *next; struct switch_api_interface *next;
}; };
#define PROTECT_INTERFACE(_it) if (!_it->refs) {switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock); _it->refs++; _it->parent->refs++;} #define PROTECT_INTERFACE(_it) if (_it && !_it->refs) {switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock); _it->refs++; _it->parent->refs++;} //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "+++++++++++LOCK\n");
#define UNPROTECT_INTERFACE(_it) if (_it->refs) {switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it->refs--; _it->parent->refs--; _it = NULL;} #define UNPROTECT_INTERFACE(_it) if (_it && _it->refs) {switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it->refs--; _it->parent->refs--; _it = NULL;} //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "-----------UNLOCK\n");
SWITCH_END_EXTERN_C SWITCH_END_EXTERN_C
#endif #endif
......
...@@ -373,6 +373,17 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session) ...@@ -373,6 +373,17 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
switch_safe_free(stream.data); switch_safe_free(stream.data);
} }
if (tech_pvt->read_codec.implementation) {
switch_core_codec_destroy(&tech_pvt->read_codec);
}
if (tech_pvt->write_codec.implementation) {
switch_core_codec_destroy(&tech_pvt->write_codec);
}
switch_core_session_unset_read_codec(session);
switch_core_session_unset_write_codec(session);
switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_mutex_lock(tech_pvt->profile->flag_mutex);
switch_clear_flag(tech_pvt, TFLAG_IO); switch_clear_flag(tech_pvt, TFLAG_IO);
tech_pvt->profile->inuse--; tech_pvt->profile->inuse--;
......
...@@ -1479,9 +1479,12 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_ ...@@ -1479,9 +1479,12 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
found: found:
UNPROTECT_INTERFACE(codec_interface);
if (i > arraylen) { if (i > arraylen) {
break; break;
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论