Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-23 22:06:18 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fcab17741c6f4b47e99e91b0bcd46ec3d97674a2
fcab1774
1 parent
02addf61
fix #222, the dvr path rule changed.
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
7 行增加
和
7 行删除
trunk/conf/dvr.segment.conf
trunk/conf/dvr.session.conf
trunk/conf/full.conf
trunk/src/app/srs_app_config.hpp
trunk/conf/dvr.segment.conf
查看文件 @
fcab177
# the config for srs to dvr in segment mode
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v
1
_CN_DVR
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v
2
_CN_DVR
# @see full.conf for detail config.
listen
1935
;
...
...
@@ -7,7 +7,7 @@ max_connections 1000;
vhost
__
defaultVhost__
{
dvr
{
enabled
on
;
dvr_path
./
objs
/
nginx
/
html
;
dvr_path
./
objs
/
nginx
/
html
/[
app
]/[
stream
].[
timestamp
].
flv
;
dvr_plan
segment
;
dvr_duration
30
;
dvr_wait_keyframe
on
;
...
...
trunk/conf/dvr.session.conf
查看文件 @
fcab177
# the config for srs to dvr in session mode
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v
1
_CN_DVR
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v
2
_CN_DVR
# @see full.conf for detail config.
listen
1935
;
...
...
@@ -7,7 +7,7 @@ max_connections 1000;
vhost
__
defaultVhost__
{
dvr
{
enabled
on
;
dvr_path
./
objs
/
nginx
/
html
;
dvr_path
dvr_path
./
objs
/
nginx
/
html
/[
app
]/[
stream
].[
timestamp
].
flv
;
dvr_plan
session
;
}
}
...
...
trunk/conf/full.conf
查看文件 @
fcab177
...
...
@@ -326,8 +326,8 @@ vhost dvr.srs.com {
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DVR#custom-path
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_DVR#custom-path
# segment,session apply it.
# default: ./objs/nginx/html
dvr_path
./
objs
/
nginx
/
html
;
# default: ./objs/nginx/html/[app]/[stream].[timestamp].flv
dvr_path
./
objs
/
nginx
/
html
/[
app
]/[
stream
].[
timestamp
].
flv
;
# the duration for dvr file, reap if exeed, in seconds.
# segment apply it.
# session,append ignore.
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
fcab177
...
...
@@ -58,7 +58,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_CONF_DEFAULT_HLS_MOUNT "[vhost]/[app]/[stream].m3u8"
#define SRS_CONF_DEFAULT_HLS_ACODEC "aac"
#define SRS_CONF_DEFAULT_HLS_VCODEC "h264"
#define SRS_CONF_DEFAULT_DVR_PATH "./objs/nginx/html"
#define SRS_CONF_DEFAULT_DVR_PATH "./objs/nginx/html
/[app]/[stream].[timestamp].flv
"
#define SRS_CONF_DEFAULT_DVR_PLAN_SESSION "session"
#define SRS_CONF_DEFAULT_DVR_PLAN_SEGMENT "segment"
#define SRS_CONF_DEFAULT_DVR_PLAN_APPEND "append"
...
...
请
注册
或
登录
后发表评论