Commit Graph

876 Commits (ea9a5f26d910fd9aec65845603cf62d19dc854de)

Author SHA1 Message Date
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151. 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin f69fa7273b fix #302, remove the thread unsafe code, no static. 10 years ago
winlin 33cca3e027 for #155, add todo for osx. 2.0.146 10 years ago
winlin e45c62003a Merge branch '2.0release' into develop 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin 45d9018051 Merge branch '2.0release' into develop 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145 10 years ago
winlin f36e4a443d refine the fast buffer. 2.0.144 10 years ago
winlin 6a98758435 revert the changes for SRS2. 10 years ago
winlin df2644c850 merge from 2.0release 10 years ago
winlin 9f81a8b73e for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin 9e407d32fe change verstion to 3.0.0 10 years ago
winlin 2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 10 years ago
winlin a21243ea12 merge from 2.0 10 years ago
winlin d349a3dbda update stable version check 10 years ago
winlin 519c25a064 fork srs2 and start srs3. 3.0.0 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 2e9f2753c9 for #316, add stream codec info. 2.0.135 10 years ago
winlin 8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 10 years ago
winlin f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin 3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 10 years ago
winlin 983ab8fb89 pass all utest for 2.0 10 years ago
winlin a47dbf7a92 for #320, refine code. 10 years ago
winlin 34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin d650118988 fix #179, dvr support api to start or stop. 2.0.123 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin e81e090239 for #133, add rtsp listener and handler. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117 10 years ago
winlin 25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 10 years ago
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0 10 years ago
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 10 years ago
winlin e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 10 years ago
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 10 years ago
winlin d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 10 years ago
winlin 4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 10 years ago
winlin 16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 10 years ago
winlin 70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 10 years ago
winlin 66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 10 years ago
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 10 years ago
winlin 9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 10 years ago
winlin b0daf1482d update version to 1.0.24 10 years ago
winlin 711b6ca277 for #250, basic stream caster framework. 2.0.104 10 years ago
winlin 4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 10 years ago
winlin 73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin 2167a8385c update version to 3.0.101 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin 53d9faf395 for #293, update readme. 10 years ago
winlin e71bc0cbc5 for bug #277, refine the http server. 10 years ago
winlin cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 10 years ago
winlin 4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 10 years ago
winlin 63309a0538 refine for bug #288, drop info frame without error. 10 years ago
winlin b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 10 years ago
winlin b466756931 merge from feilong for bug #281. 10 years ago
winlin 27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 10 years ago
winlin 6c833902f9 merge http api from tufang. 2.0.92 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 10 years ago
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 10 years ago
winlin e590537dca fix #207, trim the last 0 of log. 1.0.18 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 10 years ago
winlin ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 10 years ago
winlin c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 10 years ago
winlin bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 10 years ago
winlin c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 10 years ago
winlin d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 10 years ago
winlin e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 10 years ago
winlin 513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 10 years ago
winlin 9a66d22f3b hotfix 1.0release, 1.0.13 10 years ago
winlin b8de3bd3b4 convert the core to unix format. 10 years ago
winlin 92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 10 years ago
winlin 28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 10 years ago
winlin 2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 10 years ago
winlin eef8034632 merge from 1.0release for bug #264. 2.0.74 10 years ago
winlin 1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 10 years ago
winlin db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 10 years ago
winlin 0d6b91039d fix #257, refine latency, send when got one+ msgs, 2.0.72 10 years ago
winlin cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 10 years ago
winlin 595bf24a51 for bug #257, default to off the realtime(min-latency). 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin 6bdd0af728 for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69 10 years ago
winlin 7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 10 years ago
winlin a3de1c71fc reset the mw_latency to 350. 10 years ago
winlin 1311b6fe65 fix #251, support 10k clients. 2.0.67 10 years ago
winlin 55d98fceed for bug #251, add min msgs for queue cond wait. 10 years ago
winlin 5a2b8afead for bug #251, add queue fast vector. 2.0.66 10 years ago
winlin 8f72f79504 for bug #251, add queue fast cache. 2.0.65 10 years ago
winlin bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 10 years ago
winlin 330819fb74 for bug #251, refine the mic algorithm. 2.0.63 10 years ago
winlin d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 10 years ago
winlin d827928eeb for bug #251, merge the performance refines. 10 years ago
winlin 9892b92258 Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61"
It hurt performance, should never use it.

This reverts commit d073adde58.
10 years ago
winlin d073adde58 for bug #251, somhc(session-oriented message-header cache). 2.0.61 10 years ago
winlin f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 10 years ago
winlin e80c8603d4 fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59 10 years ago
winlin 92ecdf088b for bug #251, use macro to define the fast cache and cond wait. 2.0.58 10 years ago
winlin cd317859db add mw sleep time and msgs/iovs table. 10 years ago
winlin 9ee138746f for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57 10 years ago
winlin dde05c6315 for bug #251, refine the send use cond wait. 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 10 years ago
winlin 279b4ff4c9 refine macros 10 years ago
winlin b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 10 years ago
winlin f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin 57f844b636 for bug #249, simplify the macro, 0 to disable chunk stream cache. 10 years ago
winlin a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 10 years ago
winlin 4b09531e2f for bug #241, simplify the merged read config macros. 10 years ago
winlin f57801eb46 fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51 10 years ago
winlin 90992b31a3 for bug #194, add the send macro to performance. 10 years ago
winlin 60bc9c2aa0 add performance header to control options for performance. 2.0.50 10 years ago
winlin 29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 10 years ago
winlin f35ec2155b for bug #241, support merged read. 2.0.48 10 years ago
winlin 463e1fbc41 for bug #237, refine the thread loop for publish thread. 2.0.47 10 years ago
winlin e9712cc627 refine recv thread, donot set auto response for publish recv thread. 2.0.46 10 years ago
winlin 5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45. 10 years ago
winlin 304208f822 fix #239, traverse the token before response connect. 1.0.10. 10 years ago
winlin 757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 10 years ago
winlin a94dbecdc4 refine macro of srs-librtmp. 2.0.43 10 years ago
winlin 3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 10 years ago
winlin 472b1742a2 for bug #237, use isolate thread to recv message. 2.0.41 10 years ago
winlin 1847c5fef7 ignore the actual length of share key. 2.0.40 10 years ago
winlin 47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 10 years ago
winlin efb73c5487 fix #235, refine handshake, replace union with template method. 2.0.38. 10 years ago
winlin ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 10 years ago
winlin 7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 10 years ago
winlin 14fca601f9 merge from 1.0 hotfix. 3.0.35 10 years ago
winlin 9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 10 years ago
winlin 03f72fb1a6 for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 10 years ago
winlin eb4e7aad69 try to build srs-librtmp on vs2010, failed. 10 years ago
winlin 4c0c3a9ada refine merged code for allspace. 10 years ago
winlin 468941833c change srs version to 2.0.33 10 years ago
winlin 18c308248e refine code by winlin, for merged from allspace. 10 years ago
winlin 1855c9429c merge from allspace, to srs-librtmp, for vs2010 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 10 years ago
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 10 years ago
winlin d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 10 years ago
winlin a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 10 years ago
winlin d6072b16c0 support compile srs-librtmp on windows. 2.0.26 10 years ago
winlin 5f48d4f566 refine comments for SrsMessageArray. 2.0.25 10 years ago
winlin df35f75df1 refine response call, 2.0.24 10 years ago
winlin c1e9aed0ac all wiki translated to English. 1.0.7 10 years ago
winlin fbcb63f775 v2.0, 2014-11-18, all wiki translated to English. 2.0.23. 10 years ago
winlin 2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 10 years ago
winlin 278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 10 years ago
winlin bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 10 years ago
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 10 years ago
winlin 47ed9e33dd refine code for bug #194, use send messages for all msg array. 10 years ago
winlin f2f02b06d5 for bug #194, refine code, to 2.0.17 10 years ago
winlin eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 10 years ago
winlin 0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 10 years ago
winlin cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 10 years ago
winlin 8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 10 years ago
winlin 46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 10 years ago
winlin 606fc13a03 rename the confict macro to srs_lib_trace 10 years ago
winlin 3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 10 years ago
winlin 926650840e fix #191, configure --export-librtmp. 2.0.10. 10 years ago
winlin 106bef802f fix #66, srs-librtmp support write h264 raw packet. 2.0.9. 10 years ago
winlin f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 10 years ago
winlin fa53250202 refine the macro, use int as version type. 2.0.8 10 years ago
winlin 6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 11 years ago
winlin e3e18b9915 for bug #186, read the args when discovery it. 1.0.4 11 years ago
winlin 7d70864b33 for bug #186, read the args when discovery it. 2.0.6 11 years ago
winlin b65dfd718a add comments for the RTMP packet fields, NULL or never NULL. 2.0.5 11 years ago