Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
b8dc0713
提交
b8dc0713
authored
11月 22, 2013
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-5959 i hate this ticket
上级
ca8f1219
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
22 行增加
和
14 行删除
+22
-14
switch_core_media.c
src/switch_core_media.c
+20
-13
switch_rtp.c
src/switch_rtp.c
+2
-1
没有找到文件。
src/switch_core_media.c
浏览文件 @
b8dc0713
...
@@ -535,6 +535,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
...
@@ -535,6 +535,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
int
exists
=
0
;
int
exists
=
0
;
switch_media_handle_t
*
smh
;
switch_media_handle_t
*
smh
;
switch_rtp_engine_t
*
engine
;
switch_rtp_engine_t
*
engine
;
int
local_pt
=
0
;
switch_assert
(
session
);
switch_assert
(
session
);
...
@@ -549,12 +550,13 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
...
@@ -549,12 +550,13 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
for
(
pmap
=
engine
->
payload_map
;
pmap
&&
pmap
->
allocated
;
pmap
=
pmap
->
next
)
{
for
(
pmap
=
engine
->
payload_map
;
pmap
&&
pmap
->
allocated
;
pmap
=
pmap
->
next
)
{
exists
=
(
!
strcasecmp
(
name
,
pmap
->
iananame
)
&&
(
!
pmap
->
rate
||
rate
==
pmap
->
rate
)
&&
(
!
pmap
->
ptime
||
pmap
->
ptime
==
ptime
));
exists
=
(
!
strcasecmp
(
name
,
pmap
->
iananame
)
&&
(
!
pmap
->
rate
||
rate
==
pmap
->
rate
)
&&
(
!
pmap
->
ptime
||
pmap
->
ptime
==
ptime
));
if
(
exists
)
{
if
(
exists
)
{
if
(
!
zstr
(
fmtp
)
&&
!
zstr
(
pmap
->
rm_fmtp
))
{
if
(
!
zstr
(
fmtp
)
&&
!
zstr
(
pmap
->
rm_fmtp
))
{
if
(
strcmp
(
pmap
->
rm_fmtp
,
fmtp
))
{
if
(
strcmp
(
pmap
->
rm_fmtp
,
fmtp
))
{
exists
=
0
;
exists
=
0
;
local_pt
=
pmap
->
pt
;
continue
;
continue
;
}
}
}
}
...
@@ -589,15 +591,18 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
...
@@ -589,15 +591,18 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
pmap
->
rate
=
rate
;
pmap
->
rate
=
rate
;
}
}
if
(
!
zstr
(
fmtp
)
&&
(
!
pmap
->
rm_fmtp
||
strcmp
(
pmap
->
rm_fmtp
,
fmtp
)))
{
if
(
!
zstr
(
fmtp
)
&&
(
zstr
(
pmap
->
rm_fmtp
)
||
strcmp
(
pmap
->
rm_fmtp
,
fmtp
)))
{
pmap
->
rm_fmtp
=
switch_core_strdup
(
session
->
pool
,
fmtp
);
pmap
->
rm_fmtp
=
switch_core_strdup
(
session
->
pool
,
fmtp
);
}
}
pmap
->
allocated
=
1
;
pmap
->
allocated
=
1
;
pmap
->
recv_pt
=
(
switch_payload_t
)
pt
;
pmap
->
recv_pt
=
(
switch_payload_t
)
pt
;
if
(
sdp_type
==
SDP_TYPE_REQUEST
||
!
exists
)
{
if
(
sdp_type
==
SDP_TYPE_REQUEST
||
!
exists
)
{
pmap
->
pt
=
(
switch_payload_t
)
pt
;
pmap
->
pt
=
(
switch_payload_t
)
(
local_pt
?
local_pt
:
pt
)
;
}
}
if
(
negotiated
)
{
if
(
negotiated
)
{
...
@@ -3290,7 +3295,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3290,7 +3295,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
pmap
->
rm_encoding
=
switch_core_session_strdup
(
session
,
(
char
*
)
mmap
->
rm_encoding
);
pmap
->
rm_encoding
=
switch_core_session_strdup
(
session
,
(
char
*
)
mmap
->
rm_encoding
);
pmap
->
iananame
=
switch_core_session_strdup
(
session
,
(
char
*
)
mimp
->
iananame
);
pmap
->
iananame
=
switch_core_session_strdup
(
session
,
(
char
*
)
mimp
->
iananame
);
pmap
->
pt
=
(
switch_payload_t
)
mmap
->
rm_pt
;
pmap
->
recv_
pt
=
(
switch_payload_t
)
mmap
->
rm_pt
;
pmap
->
rm_rate
=
mimp
->
samples_per_second
;
pmap
->
rm_rate
=
mimp
->
samples_per_second
;
pmap
->
adv_rm_rate
=
mimp
->
samples_per_second
;
pmap
->
adv_rm_rate
=
mimp
->
samples_per_second
;
if
(
strcasecmp
(
mimp
->
iananame
,
"g722"
))
{
if
(
strcasecmp
(
mimp
->
iananame
,
"g722"
))
{
...
@@ -3330,7 +3335,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3330,7 +3335,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
if
(
match
)
{
if
(
match
)
{
char
tmp
[
50
];
char
tmp
[
50
];
const
char
*
mirror
=
switch_channel_get_variable
(
session
->
channel
,
"rtp_mirror_remote_audio_codec_payload"
);
//
const char *mirror = switch_channel_get_variable(session->channel, "rtp_mirror_remote_audio_codec_payload");
switch_snprintf
(
tmp
,
sizeof
(
tmp
),
"%d"
,
a_engine
->
cur_payload_map
->
remote_sdp_port
);
switch_snprintf
(
tmp
,
sizeof
(
tmp
),
"%d"
,
a_engine
->
cur_payload_map
->
remote_sdp_port
);
...
@@ -3338,11 +3343,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3338,11 +3343,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
switch_channel_set_variable
(
session
->
channel
,
SWITCH_REMOTE_MEDIA_PORT_VARIABLE
,
tmp
);
switch_channel_set_variable
(
session
->
channel
,
SWITCH_REMOTE_MEDIA_PORT_VARIABLE
,
tmp
);
#if 0
if (!switch_true(mirror) &&
if (!switch_true(mirror) &&
switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND &&
switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND &&
(!switch_channel_test_flag(session->channel, CF_REINVITE) || switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_REINVITE))) {
(!switch_channel_test_flag(session->channel, CF_REINVITE) || switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_REINVITE))) {
switch_core_media_get_offered_pt(session, matches[0].imp, &a_engine->cur_payload_map->recv_pt);
switch_core_media_get_offered_pt(session, matches[0].imp, &a_engine->cur_payload_map->recv_pt);
}
}
#endif
switch_snprintf
(
tmp
,
sizeof
(
tmp
),
"%d"
,
a_engine
->
cur_payload_map
->
recv_pt
);
switch_snprintf
(
tmp
,
sizeof
(
tmp
),
"%d"
,
a_engine
->
cur_payload_map
->
recv_pt
);
switch_channel_set_variable
(
session
->
channel
,
"rtp_audio_recv_pt"
,
tmp
);
switch_channel_set_variable
(
session
->
channel
,
"rtp_audio_recv_pt"
,
tmp
);
...
@@ -3521,7 +3528,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3521,7 +3528,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
if
(
m_idx
)
{
if
(
m_idx
)
{
char
tmp
[
50
];
char
tmp
[
50
];
const
char
*
mirror
=
switch_channel_get_variable
(
session
->
channel
,
"rtp_mirror_remote_video_codec_payload"
);
//
const char *mirror = switch_channel_get_variable(session->channel, "rtp_mirror_remote_video_codec_payload");
int
j
=
0
;
int
j
=
0
;
if
(
greedy
)
{
/* sort in favor of mine */
if
(
greedy
)
{
/* sort in favor of mine */
...
@@ -3541,7 +3548,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3541,7 +3548,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
matches
[
j
].
imp
->
samples_per_second
,
matches
[
j
].
imp
->
samples_per_second
,
matches
[
j
].
imp
->
microseconds_per_packet
/
1000
,
matches
[
j
].
imp
->
microseconds_per_packet
/
1000
,
SWITCH_TRUE
);
SWITCH_TRUE
);
if
(
j
==
0
)
{
if
(
j
==
0
)
{
v_engine
->
cur_payload_map
=
pmap
;
v_engine
->
cur_payload_map
=
pmap
;
}
}
...
@@ -3550,7 +3556,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3550,7 +3556,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
map
=
matches
[
j
].
map
;
map
=
matches
[
j
].
map
;
pmap
->
rm_encoding
=
switch_core_session_strdup
(
session
,
(
char
*
)
map
->
rm_encoding
);
pmap
->
rm_encoding
=
switch_core_session_strdup
(
session
,
(
char
*
)
map
->
rm_encoding
);
pmap
->
pt
=
(
switch_payload_t
)
map
->
rm_pt
;
pmap
->
recv_
pt
=
(
switch_payload_t
)
map
->
rm_pt
;
pmap
->
rm_rate
=
map
->
rm_rate
;
pmap
->
rm_rate
=
map
->
rm_rate
;
pmap
->
codec_ms
=
mimp
->
microseconds_per_packet
/
1000
;
pmap
->
codec_ms
=
mimp
->
microseconds_per_packet
/
1000
;
...
@@ -3562,11 +3568,12 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
...
@@ -3562,11 +3568,12 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
pmap
->
agreed_pt
=
(
switch_payload_t
)
map
->
rm_pt
;
pmap
->
agreed_pt
=
(
switch_payload_t
)
map
->
rm_pt
;
pmap
->
recv_pt
=
(
switch_payload_t
)
map
->
rm_pt
;
#if 0
if (j == 0 && (!switch_true(mirror) && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) {
if (j == 0 && (!switch_true(mirror) && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) {
switch_core_media_get_offered_pt(session, mimp, &pmap->recv_pt);
switch_core_media_get_offered_pt(session, mimp, &pmap->recv_pt);
}
}
#endif
}
}
...
@@ -5117,7 +5124,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
...
@@ -5117,7 +5124,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
if
(
v_engine
->
pli
)
{
if
(
v_engine
->
pli
)
{
switch_rtp_set_flag
(
v_engine
->
rtp_session
,
SWITCH_RTP_FLAG_PLI
);
switch_rtp_set_flag
(
v_engine
->
rtp_session
,
SWITCH_RTP_FLAG_PLI
);
}
}
switch_rtp_set_payload_map
(
v_engine
->
rtp_session
,
&
v_engine
->
payload_map
);
switch_rtp_set_payload_map
(
v_engine
->
rtp_session
,
&
v_engine
->
payload_map
);
start_video_thread
(
session
);
start_video_thread
(
session
);
...
@@ -7900,7 +7907,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
...
@@ -7900,7 +7907,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
map
->
rm_pt
,
map
->
rm_pt
,
map
->
rm_rate
,
map
->
rm_rate
,
ptime
,
ptime
,
SWITCH_
FALS
E
);
SWITCH_
TRU
E
);
}
}
}
}
}
}
...
@@ -8287,7 +8294,7 @@ SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *s
...
@@ -8287,7 +8294,7 @@ SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *s
}
}
if
((
tmp
=
switch_channel_get_variable
(
session
->
channel
,
"rtp_video_recv_pt"
)))
{
if
((
tmp
=
switch_channel_get_variable
(
session
->
channel
,
"rtp_video_recv_pt"
)))
{
v_engine
->
cur_payload_map
->
recv_pt
=
(
switch_payload_t
)
atoi
(
tmp
);
;
v_engine
->
cur_payload_map
->
recv_pt
=
(
switch_payload_t
)
atoi
(
tmp
);
}
}
v_engine
->
cur_payload_map
->
rm_encoding
=
(
char
*
)
switch_channel_get_variable
(
session
->
channel
,
"rtp_use_video_codec_name"
);
v_engine
->
cur_payload_map
->
rm_encoding
=
(
char
*
)
switch_channel_get_variable
(
session
->
channel
,
"rtp_use_video_codec_name"
);
...
...
src/switch_rtp.c
浏览文件 @
b8dc0713
...
@@ -4121,6 +4121,7 @@ static int check_recv_payload(switch_rtp_t *rtp_session)
...
@@ -4121,6 +4121,7 @@ static int check_recv_payload(switch_rtp_t *rtp_session)
if
(
!
pmap
->
negotiated
)
{
if
(
!
pmap
->
negotiated
)
{
continue
;
continue
;
}
}
if
(
rtp_session
->
recv_msg
.
header
.
pt
==
pmap
->
pt
)
{
if
(
rtp_session
->
recv_msg
.
header
.
pt
==
pmap
->
pt
)
{
ok
=
1
;
ok
=
1
;
}
}
...
@@ -6242,7 +6243,7 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
...
@@ -6242,7 +6243,7 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
switch_mutex_lock
(
rtp_session
->
flag_mutex
);
switch_mutex_lock
(
rtp_session
->
flag_mutex
);
for
(
pmap
=
*
rtp_session
->
pmaps
;
pmap
;
pmap
=
pmap
->
next
)
{
for
(
pmap
=
*
rtp_session
->
pmaps
;
pmap
;
pmap
=
pmap
->
next
)
{
if
(
pmap
->
hash
==
frame
->
pmap
->
hash
&&
!
strcmp
(
pmap
->
iananame
,
frame
->
pmap
->
iananame
)
)
{
if
(
pmap
->
negotiated
&&
pmap
->
hash
==
frame
->
pmap
->
hash
)
{
payload
=
pmap
->
recv_pt
;
payload
=
pmap
->
recv_pt
;
break
;
break
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论