提交 129a20f2 authored 作者: Anthony Minessale's avatar Anthony Minessale

MODENDP-205 revert

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12700 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 90209ba2
...@@ -396,8 +396,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32 ...@@ -396,8 +396,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt)
{ {
const char *abs, *codec_string, *uuid; const char *abs, *codec_string = NULL;
switch_core_session_t *b_session = NULL;
const char *ocodec = NULL; const char *ocodec = NULL;
if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) {
...@@ -410,17 +409,7 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) ...@@ -410,17 +409,7 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt)
switch_assert(tech_pvt->session != NULL); switch_assert(tech_pvt->session != NULL);
if ((abs = switch_channel_get_variable(tech_pvt->channel, "inherit_codec")) && (switch_true(abs)) && (uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) != NULL && (b_session = switch_core_session_locate(uuid)) != NULL) { if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) {
switch_codec_implementation_t impl = {0};
switch_core_session_get_read_impl(b_session, &impl);
if (impl.iananame == NULL || !(abs = switch_core_session_sprintf(tech_pvt->session, "%s@%uh", impl.iananame, impl.actual_samples_per_second))) {
abs = NULL;
}
} else {
abs = NULL;
}
if (abs || (abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) {
codec_string = abs; codec_string = abs;
} else { } else {
if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论