From 67ddc9f5aedfa8c844ac6c5e542d1befceed8c6d Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 17 Apr 2014 18:23:49 +0800 Subject: [PATCH] support dvr(record live to flv file for vod), change to 0.9.70 --- README.md | 3 ++- trunk/src/app/srs_app_dvr.cpp | 3 +++ trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23fd0551e..ca69d9f13 100755 --- a/README.md +++ b/README.md @@ -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
## 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. diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp index caec7ae2d..214aa995d 100644 --- a/trunk/src/app/srs_app_dvr.cpp +++ b/trunk/src/app/srs_app_dvr.cpp @@ -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; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index f69cb0ea6..b4482028f 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -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"