正在显示
2 个修改的文件
包含
34 行增加
和
30 行删除
| @@ -309,37 +309,40 @@ Remark: | @@ -309,37 +309,40 @@ Remark: | ||
| 309 | 309 | ||
| 310 | ## Releases | 310 | ## Releases |
| 311 | 311 | ||
| 312 | -* 2015-12-23, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines.<br/> | ||
| 313 | -* 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/> | ||
| 314 | -* 2015-10-08, [Release v2.0-a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/> | ||
| 315 | -* 2015-09-14, [Release v2.0-a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/> | ||
| 316 | -* 2015-08-23, [Release v2.0-a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/> | ||
| 317 | -* 2015-05-23, [Release v1.0-r4][r1.0r4], bug fixed, 1.0.32, 59509 lines.<br/> | ||
| 318 | -* 2015-03-19, [Release v1.0-r3][r1.0r3], bug fixed, 1.0.30, 59511 lines.<br/> | ||
| 319 | -* 2015-02-12, [Release v1.0-r2][r1.0r2], bug fixed, 1.0.27, 59507 lines.<br/> | ||
| 320 | -* 2015-01-15, [Release v1.0-r1][r1.0r1], bug fixed, 1.0.21, 59472 lines.<br/> | ||
| 321 | -* 2014-12-05, [Release v1.0-r0][r1.0r0], all bug fixed, 1.0.10, 59391 lines.<br/> | ||
| 322 | -* 2014-10-09, [Release v0.9.8][r1.0b0], all bug fixed, 1.0.0, 59316 lines.<br/> | ||
| 323 | -* 2014-08-03, [Release v0.9.7][r1.0a7], config utest, all bug fixed. 57432 lines.<br/> | ||
| 324 | -* 2014-07-13, [Release v0.9.6][r1.0a6], core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.<br/> | ||
| 325 | -* 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.<br/> | ||
| 326 | -* 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.<br/> | ||
| 327 | -* 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines.<br/> | ||
| 328 | -* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines.<br/> | ||
| 329 | -* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines.<br/> | ||
| 330 | -* 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines.<br/> | ||
| 331 | -* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines.<br/> | ||
| 332 | -* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines.<br/> | ||
| 333 | -* 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines.<br/> | ||
| 334 | -* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines.<br/> | ||
| 335 | -* 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines.<br/> | ||
| 336 | -* 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines.<br/> | ||
| 337 | -* 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines.<br/> | ||
| 338 | -* 2013-10-23, [Release v0.1.0][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines.<br/> | ||
| 339 | -* 2013-10-17, Created.<br/> | 312 | +* 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines. |
| 313 | +* 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines. | ||
| 314 | +* 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines. | ||
| 315 | +* 2015-10-08, [Release v2.0-a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines. | ||
| 316 | +* 2015-09-14, [Release v2.0-a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines. | ||
| 317 | +* 2015-08-23, [Release v2.0-a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines. | ||
| 318 | +* 2015-05-23, [Release v1.0-r4][r1.0r4], bug fixed, 1.0.32, 59509 lines. | ||
| 319 | +* 2015-03-19, [Release v1.0-r3][r1.0r3], bug fixed, 1.0.30, 59511 lines. | ||
| 320 | +* 2015-02-12, [Release v1.0-r2][r1.0r2], bug fixed, 1.0.27, 59507 lines. | ||
| 321 | +* 2015-01-15, [Release v1.0-r1][r1.0r1], bug fixed, 1.0.21, 59472 lines. | ||
| 322 | +* 2014-12-05, [Release v1.0-r0][r1.0r0], all bug fixed, 1.0.10, 59391 lines. | ||
| 323 | +* 2014-10-09, [Release v0.9.8][r1.0b0], all bug fixed, 1.0.0, 59316 lines. | ||
| 324 | +* 2014-08-03, [Release v0.9.7][r1.0a7], config utest, all bug fixed. 57432 lines. | ||
| 325 | +* 2014-07-13, [Release v0.9.6][r1.0a6], core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines. | ||
| 326 | +* 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines. | ||
| 327 | +* 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines. | ||
| 328 | +* 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines. | ||
| 329 | +* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines. | ||
| 330 | +* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines. | ||
| 331 | +* 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines. | ||
| 332 | +* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines. | ||
| 333 | +* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines. | ||
| 334 | +* 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines. | ||
| 335 | +* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines. | ||
| 336 | +* 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines. | ||
| 337 | +* 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines. | ||
| 338 | +* 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines. | ||
| 339 | +* 2013-10-23, [Release v0.1.0][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines. | ||
| 340 | +* 2013-10-17, Created. | ||
| 340 | 341 | ||
| 341 | ## History | 342 | ## History |
| 342 | 343 | ||
| 344 | +* <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong> | ||
| 345 | +* v2.0, 2016-09-09, refine librtmp comments about NALUs. 2.0.215 | ||
| 343 | * v2.0, 2016-09-05, fix memory leak at source. 2.0.214 | 346 | * v2.0, 2016-09-05, fix memory leak at source. 2.0.214 |
| 344 | * v2.0, 2016-09-05, fix memory leak at handshake. 2.0.213 | 347 | * v2.0, 2016-09-05, fix memory leak at handshake. 2.0.213 |
| 345 | * v2.0, 2016-09-04, support valgrind for [patched st](https://github.com/ossrs/state-threads/issues/2). | 348 | * v2.0, 2016-09-04, support valgrind for [patched st](https://github.com/ossrs/state-threads/issues/2). |
| @@ -351,7 +354,7 @@ Remark: | @@ -351,7 +354,7 @@ Remark: | ||
| 351 | * v2.0, 2016-08-08, fix the crash by srs_info log. | 354 | * v2.0, 2016-08-08, fix the crash by srs_info log. |
| 352 | * <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong> | 355 | * <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong> |
| 353 | * v2.0, 2016-05-17, fix the sps pps parse bug. | 356 | * v2.0, 2016-05-17, fix the sps pps parse bug. |
| 354 | -* v2.0, 2016-01-13, fix http reader bug, support infinite chunkted. 2.0.209 | 357 | +* v2.0, 2016-01-13, fix http reader bug, support infinite chunked. 2.0.209 |
| 355 | * v2.0, 2016-01-09, merge [#559][pr #559] fix memory leak bug. 2.0.208 | 358 | * v2.0, 2016-01-09, merge [#559][pr #559] fix memory leak bug. 2.0.208 |
| 356 | * v2.0, 2016-01-09, merge [#558][pr #558] add tcUrl for on_publish. | 359 | * v2.0, 2016-01-09, merge [#558][pr #558] add tcUrl for on_publish. |
| 357 | * v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207 | 360 | * v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207 |
| @@ -1241,6 +1244,7 @@ Winlin | @@ -1241,6 +1244,7 @@ Winlin | ||
| 1241 | 1244 | ||
| 1242 | [exo #828]: https://github.com/google/ExoPlayer/pull/828 | 1245 | [exo #828]: https://github.com/google/ExoPlayer/pull/828 |
| 1243 | 1246 | ||
| 1247 | +[r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1 | ||
| 1244 | [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 | 1248 | [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 |
| 1245 | [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 | 1249 | [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 |
| 1246 | [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 | 1250 | [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 214 | 34 | +#define VERSION_REVISION 215 |
| 35 | 35 | ||
| 36 | // generated by configure, only macros. | 36 | // generated by configure, only macros. |
| 37 | #include <srs_auto_headers.hpp> | 37 | #include <srs_auto_headers.hpp> |
-
请 注册 或 登录 后发表评论