external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

support dvr(record live to flv file for vod), change to 0.9.70

Browse source
This commit is contained in:
winlin 2014-04-17 18:23:49 +08:00
parent ab9a2ddd6c
commit 67ddc9f5ae
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -155,7 +155,7 @@ Supported operating systems and hardware:
1. Support embeded http server for hls(live/vod) 1. Support embeded http server for hls(live/vod)
1. Support stream ingester using ffmpeg. 1. Support stream ingester using ffmpeg.
1. Support ingest RTSP(RTP, SDP) stream to RTMP. 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 file to hls vod stream.
1. [plan] Support system full utest on gtest. 1. [plan] Support system full utest on gtest.
1. [plan] Support RTMP edge server, push/pull stream from any RTMP server 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/> * nginx v1.5.0: 139524 lines <br/>
## History ## 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-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-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. * 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.

3
trunk/src/app/srs_app_dvr.cpp
View file

@ -341,6 +341,9 @@ int SrsDvrPlan::on_publish()
srs_freep(jitter); srs_freep(jitter);
jitter = new SrsRtmpJitter(); jitter = new SrsRtmpJitter();
// always update time cache.
srs_update_system_time_ms();
// new flv file // new flv file
std::stringstream path; std::stringstream path;

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "69" #define VERSION_REVISION "70"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"