Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
863189fe
提交
863189fe
authored
4月 16, 2019
作者:
Dragos Oancea
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11958: [core] add switch_core_media functions that deal with bw and bitrate
上级
60c72356
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
71 行增加
和
1 行删除
+71
-1
switch_core_media.h
src/include/switch_core_media.h
+3
-0
switch_core_media.c
src/switch_core_media.c
+68
-1
没有找到文件。
src/include/switch_core_media.h
浏览文件 @
863189fe
...
@@ -365,6 +365,9 @@ SWITCH_DECLARE(switch_file_handle_t *) switch_core_media_get_video_file(switch_c
...
@@ -365,6 +365,9 @@ SWITCH_DECLARE(switch_file_handle_t *) switch_core_media_get_video_file(switch_c
SWITCH_DECLARE
(
switch_bool_t
)
switch_core_session_in_video_thread
(
switch_core_session_t
*
session
);
SWITCH_DECLARE
(
switch_bool_t
)
switch_core_session_in_video_thread
(
switch_core_session_t
*
session
);
SWITCH_DECLARE
(
switch_bool_t
)
switch_core_media_check_dtls
(
switch_core_session_t
*
session
,
switch_media_type_t
type
);
SWITCH_DECLARE
(
switch_bool_t
)
switch_core_media_check_dtls
(
switch_core_session_t
*
session
,
switch_media_type_t
type
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_set_outgoing_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
,
uint32_t
bitrate
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_set_outgoing_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
,
uint32_t
bitrate
);
SWITCH_DECLARE
(
uint32_t
)
switch_core_media_get_orig_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
);
SWITCH_DECLARE
(
void
)
switch_core_media_set_media_bw_mult
(
switch_core_session_t
*
session
,
float
mult
);
SWITCH_DECLARE
(
float
)
switch_core_media_get_media_bw_mult
(
switch_core_session_t
*
session
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_reset_jb
(
switch_core_session_t
*
session
,
switch_media_type_t
type
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_reset_jb
(
switch_core_session_t
*
session
,
switch_media_type_t
type
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_session_wait_for_video_input_params
(
switch_core_session_t
*
session
,
uint32_t
timeout_ms
);
SWITCH_DECLARE
(
switch_status_t
)
switch_core_session_wait_for_video_input_params
(
switch_core_session_t
*
session
,
uint32_t
timeout_ms
);
...
...
src/switch_core_media.c
浏览文件 @
863189fe
...
@@ -196,6 +196,8 @@ typedef struct switch_rtp_engine_s {
...
@@ -196,6 +196,8 @@ typedef struct switch_rtp_engine_s {
uint8_t
new_ice
;
uint8_t
new_ice
;
uint8_t
new_dtls
;
uint8_t
new_dtls
;
uint32_t
sdp_bw
;
uint32_t
sdp_bw
;
uint32_t
orig_bitrate
;
float
bw_mult
;
uint8_t
reject_avp
;
uint8_t
reject_avp
;
int
t140_pt
;
int
t140_pt
;
int
red_pt
;
int
red_pt
;
...
@@ -12434,12 +12436,34 @@ SWITCH_DECLARE(switch_bool_t) switch_core_media_check_dtls(switch_core_session_t
...
@@ -12434,12 +12436,34 @@ SWITCH_DECLARE(switch_bool_t) switch_core_media_check_dtls(switch_core_session_t
return
SWITCH_FALSE
;
return
SWITCH_FALSE
;
}
}
SWITCH_DECLARE
(
uint32_t
)
switch_core_media_get_orig_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
)
{
switch_media_handle_t
*
smh
;
switch_rtp_engine_t
*
engine
;
if
(
!
(
smh
=
session
->
media_handle
))
{
return
0
;
}
if
(
switch_channel_down
(
session
->
channel
))
{
return
0
;
}
engine
=
&
smh
->
engines
[
type
];
if
(
engine
)
{
return
engine
->
orig_bitrate
;
}
else
{
return
0
;
}
}
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_set_outgoing_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
,
uint32_t
bitrate
)
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_set_outgoing_bitrate
(
switch_core_session_t
*
session
,
switch_media_type_t
type
,
uint32_t
bitrate
)
{
{
switch_media_handle_t
*
smh
;
switch_media_handle_t
*
smh
;
switch_rtp_engine_t
*
engine
;
switch_rtp_engine_t
*
engine
;
switch_status_t
status
=
SWITCH_STATUS_FALSE
;
switch_status_t
status
=
SWITCH_STATUS_FALSE
;
uint32_t
new_bitrate
;
if
(
!
(
smh
=
session
->
media_handle
))
{
if
(
!
(
smh
=
session
->
media_handle
))
{
return
SWITCH_STATUS_FALSE
;
return
SWITCH_STATUS_FALSE
;
...
@@ -12451,14 +12475,57 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_set_outgoing_bitrate(switch_co
...
@@ -12451,14 +12475,57 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_set_outgoing_bitrate(switch_co
engine
=
&
smh
->
engines
[
type
];
engine
=
&
smh
->
engines
[
type
];
new_bitrate
=
bitrate
-
bitrate
*
engine
->
bw_mult
;
if
(
switch_core_codec_ready
(
&
engine
->
write_codec
))
{
if
(
switch_core_codec_ready
(
&
engine
->
write_codec
))
{
status
=
switch_core_codec_control
(
&
engine
->
write_codec
,
SCC_VIDEO_BANDWIDTH
,
status
=
switch_core_codec_control
(
&
engine
->
write_codec
,
SCC_VIDEO_BANDWIDTH
,
SCCT_INT, &bitrate, SCCT_NONE, NULL, NULL, NULL);
SCCT_INT
,
&
new_
bitrate
,
SCCT_NONE
,
NULL
,
NULL
,
NULL
);
}
}
engine
->
orig_bitrate
=
bitrate
;
return
status
;
return
status
;
}
}
SWITCH_DECLARE
(
float
)
switch_core_media_get_media_bw_mult
(
switch_core_session_t
*
session
)
{
switch_media_handle_t
*
smh
;
switch_rtp_engine_t
*
engine
;
if
(
!
(
smh
=
session
->
media_handle
))
{
return
0
;
}
if
(
switch_channel_down
(
session
->
channel
))
{
return
0
;
}
engine
=
&
smh
->
engines
[
SWITCH_MEDIA_TYPE_VIDEO
];
if
(
engine
)
{
return
engine
->
bw_mult
;
}
return
0
;
}
SWITCH_DECLARE
(
void
)
switch_core_media_set_media_bw_mult
(
switch_core_session_t
*
session
,
float
mult
)
{
switch_media_handle_t
*
smh
;
switch_rtp_engine_t
*
engine
;
if
(
!
(
smh
=
session
->
media_handle
))
{
return
;
}
if
(
switch_channel_down
(
session
->
channel
))
{
return
;
}
engine
=
&
smh
->
engines
[
SWITCH_MEDIA_TYPE_VIDEO
];
if
(
engine
)
{
engine
->
bw_mult
=
mult
;
}
}
//?
//?
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_reset_jb
(
switch_core_session_t
*
session
,
switch_media_type_t
type
)
SWITCH_DECLARE
(
switch_status_t
)
switch_core_media_reset_jb
(
switch_core_session_t
*
session
,
switch_media_type_t
type
)
{
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论