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
2014-04-17 18:23:49 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
67ddc9f5aedfa8c844ac6c5e542d1befceed8c6d
67ddc9f5
1 parent
ab9a2ddd
support dvr(record live to flv file for vod), change to 0.9.70
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
6 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_dvr.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
67ddc9f
...
...
@@ -155,7 +155,7 @@ Supported operating systems and hardware:
1.
Support embeded http server for hls(live/vod)
1.
Support stream ingester using ffmpeg.
1.
Support ingest RTSP(RTP, SDP) stream to RTMP.
1.
[
dev
]
Support dvr(record live to flv file for vod)
1.
Support dvr(record live to flv file for vod)
1.
[
plan
]
Support file to hls vod stream.
1.
[
plan
]
Support system full utest on gtest.
1.
[
plan
]
Support RTMP edge server, push/pull stream from any RTMP server
...
...
@@ -222,6 +222,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
*
nginx v1.5.0: 139524 lines
<br/>
## History
*
v1.0, 2014-04-17, support dvr(record live to flv file for vod)
*
v1.0, 2014-04-11, add speex1.2 to transcode flash encoder stream. change to 0.9.58
*
v1.0, 2014-04-10, support reload ingesters(add/remov/update). change to 0.9.57.
*
v1.0, 2014-04-07,
[
1.0 mainline(0.9.55)
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline
)
released. 30000 lines.
...
...
trunk/src/app/srs_app_dvr.cpp
查看文件 @
67ddc9f
...
...
@@ -341,6 +341,9 @@ int SrsDvrPlan::on_publish()
srs_freep
(
jitter
);
jitter
=
new
SrsRtmpJitter
();
// always update time cache.
srs_update_system_time_ms
();
// new flv file
std
::
stringstream
path
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
67ddc9f
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "
69
"
#define VERSION_REVISION "
70
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论