Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
cfd5957c
Commit
cfd5957c
authored
Oct 16, 2021
by
ziyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
webrtc echo test不检查app/stream参数
parent
488026c0
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
6 行增加
和
3 行删除
+6
-3
server/WebApi.cpp
+6
-3
没有找到文件。
server/WebApi.cpp
查看文件 @
cfd5957c
...
@@ -1187,11 +1187,8 @@ void installWebApi() {
...
@@ -1187,11 +1187,8 @@ void installWebApi() {
#ifdef ENABLE_WEBRTC
#ifdef ENABLE_WEBRTC
api_regist
(
"/index/api/webrtc"
,[](
API_ARGS_STRING_ASYNC
){
api_regist
(
"/index/api/webrtc"
,[](
API_ARGS_STRING_ASYNC
){
CHECK_ARGS
(
"app"
,
"stream"
);
auto
offer_sdp
=
allArgs
.
getArgs
();
auto
offer_sdp
=
allArgs
.
getArgs
();
auto
type
=
allArgs
[
"type"
];
auto
type
=
allArgs
[
"type"
];
MediaInfo
info
(
StrPrinter
<<
"rtc://"
<<
allArgs
[
"Host"
]
<<
"/"
<<
allArgs
[
"app"
]
<<
"/"
<<
allArgs
[
"stream"
]
<<
"?"
<<
allArgs
.
getParser
().
Params
());
//设置返回类型
//设置返回类型
headerOut
[
"Content-Type"
]
=
HttpFileManager
::
getContentType
(
".json"
);
headerOut
[
"Content-Type"
]
=
HttpFileManager
::
getContentType
(
".json"
);
...
@@ -1199,6 +1196,9 @@ void installWebApi() {
...
@@ -1199,6 +1196,9 @@ void installWebApi() {
headerOut
[
"Access-Control-Allow-Origin"
]
=
"*"
;
headerOut
[
"Access-Control-Allow-Origin"
]
=
"*"
;
if
(
type
.
empty
()
||
!
strcasecmp
(
type
.
data
(),
"play"
))
{
if
(
type
.
empty
()
||
!
strcasecmp
(
type
.
data
(),
"play"
))
{
CHECK_ARGS
(
"app"
,
"stream"
);
MediaInfo
info
(
StrPrinter
<<
"rtc://"
<<
allArgs
[
"Host"
]
<<
"/"
<<
allArgs
[
"app"
]
<<
"/"
<<
allArgs
[
"stream"
]
<<
"?"
<<
allArgs
.
getParser
().
Params
());
auto
session
=
static_cast
<
TcpSession
*>
(
&
sender
);
auto
session
=
static_cast
<
TcpSession
*>
(
&
sender
);
auto
session_ptr
=
session
->
shared_from_this
();
auto
session_ptr
=
session
->
shared_from_this
();
Broadcast
::
AuthInvoker
authInvoker
=
[
invoker
,
offer_sdp
,
val
,
info
,
headerOut
,
session_ptr
](
const
string
&
err
)
mutable
{
Broadcast
::
AuthInvoker
authInvoker
=
[
invoker
,
offer_sdp
,
val
,
info
,
headerOut
,
session_ptr
](
const
string
&
err
)
mutable
{
...
@@ -1238,6 +1238,9 @@ void installWebApi() {
...
@@ -1238,6 +1238,9 @@ void installWebApi() {
}
}
if
(
!
strcasecmp
(
type
.
data
(),
"push"
))
{
if
(
!
strcasecmp
(
type
.
data
(),
"push"
))
{
CHECK_ARGS
(
"app"
,
"stream"
);
MediaInfo
info
(
StrPrinter
<<
"rtc://"
<<
allArgs
[
"Host"
]
<<
"/"
<<
allArgs
[
"app"
]
<<
"/"
<<
allArgs
[
"stream"
]
<<
"?"
<<
allArgs
.
getParser
().
Params
());
Broadcast
::
PublishAuthInvoker
authInvoker
=
[
invoker
,
offer_sdp
,
val
,
info
,
headerOut
](
const
string
&
err
,
bool
enableHls
,
bool
enableMP4
)
mutable
{
Broadcast
::
PublishAuthInvoker
authInvoker
=
[
invoker
,
offer_sdp
,
val
,
info
,
headerOut
](
const
string
&
err
,
bool
enableHls
,
bool
enableMP4
)
mutable
{
try
{
try
{
auto
src
=
dynamic_pointer_cast
<
RtspMediaSource
>
(
MediaSource
::
find
(
RTSP_SCHEMA
,
info
.
_vhost
,
info
.
_app
,
info
.
_streamid
));
auto
src
=
dynamic_pointer_cast
<
RtspMediaSource
>
(
MediaSource
::
find
(
RTSP_SCHEMA
,
info
.
_vhost
,
info
.
_app
,
info
.
_streamid
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论