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
0f558268
Commit
0f558268
authored
5 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
防止越权访问
parent
67d2beb5
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
4 行增加
和
4 行删除
+4
-4
server/FFmpegSource.cpp
+1
-1
src/MediaFile/MediaReader.cpp
+1
-1
src/MediaFile/MediaRecorder.cpp
+2
-2
没有找到文件。
server/FFmpegSource.cpp
查看文件 @
0f558268
...
@@ -64,7 +64,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
...
@@ -64,7 +64,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
char
cmd
[
1024
]
=
{
0
};
char
cmd
[
1024
]
=
{
0
};
snprintf
(
cmd
,
sizeof
(
cmd
),
ffmpeg_cmd
.
data
(),
ffmpeg_bin
.
data
(),
src_url
.
data
(),
dst_url
.
data
());
snprintf
(
cmd
,
sizeof
(
cmd
),
ffmpeg_cmd
.
data
(),
ffmpeg_bin
.
data
(),
src_url
.
data
(),
dst_url
.
data
());
_process
.
run
(
cmd
,
File
::
absolutePath
(
""
,
tru
e
,
ffmpeg_log
));
_process
.
run
(
cmd
,
File
::
absolutePath
(
""
,
fals
e
,
ffmpeg_log
));
InfoL
<<
cmd
;
InfoL
<<
cmd
;
if
(
_media_info
.
_host
==
"127.0.0.1"
){
if
(
_media_info
.
_host
==
"127.0.0.1"
){
...
...
This diff is collapsed.
Click to expand it.
src/MediaFile/MediaReader.cpp
查看文件 @
0f558268
...
@@ -48,7 +48,7 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
...
@@ -48,7 +48,7 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
}
else
{
}
else
{
strFileName
=
strApp
+
"/"
+
strId
;
strFileName
=
strApp
+
"/"
+
strId
;
}
}
strFileName
=
File
::
absolutePath
(
strFileName
,
tru
e
,
recordPath
);
strFileName
=
File
::
absolutePath
(
strFileName
,
fals
e
,
recordPath
);
}
}
_hMP4File
=
MP4Read
(
strFileName
.
data
());
_hMP4File
=
MP4Read
(
strFileName
.
data
());
...
...
This diff is collapsed.
Click to expand it.
src/MediaFile/MediaRecorder.cpp
查看文件 @
0f558268
...
@@ -63,7 +63,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
...
@@ -63,7 +63,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
}
else
{
}
else
{
m3u8FilePath
=
strApp
+
"/"
+
strId
+
"/hls.m3u8"
;
m3u8FilePath
=
strApp
+
"/"
+
strId
+
"/hls.m3u8"
;
}
}
m3u8FilePath
=
File
::
absolutePath
(
m3u8FilePath
,
tru
e
,
hlsPath
);
m3u8FilePath
=
File
::
absolutePath
(
m3u8FilePath
,
fals
e
,
hlsPath
);
_hlsRecorder
.
reset
(
new
HlsRecorder
(
m3u8FilePath
,
params
,
hlsBufSize
,
hlsDuration
,
hlsNum
));
_hlsRecorder
.
reset
(
new
HlsRecorder
(
m3u8FilePath
,
params
,
hlsBufSize
,
hlsDuration
,
hlsNum
));
}
}
#endif //defined(ENABLE_HLS)
#endif //defined(ENABLE_HLS)
...
@@ -79,7 +79,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
...
@@ -79,7 +79,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
}
else
{
}
else
{
mp4FilePath
=
recordAppName
+
"/"
+
strApp
+
"/"
+
strId
+
"/"
;
mp4FilePath
=
recordAppName
+
"/"
+
strApp
+
"/"
+
strId
+
"/"
;
}
}
mp4FilePath
=
File
::
absolutePath
(
mp4FilePath
,
tru
e
,
recordPath
);
mp4FilePath
=
File
::
absolutePath
(
mp4FilePath
,
fals
e
,
recordPath
);
_mp4Recorder
.
reset
(
new
MP4Recorder
(
mp4FilePath
,
strVhost
,
strApp
,
strId
));
_mp4Recorder
.
reset
(
new
MP4Recorder
(
mp4FilePath
,
strVhost
,
strApp
,
strId
));
}
}
#endif //defined(ENABLE_MP4RECORD)
#endif //defined(ENABLE_MP4RECORD)
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论