Commit Graph

889 Commits (a95fd6d1400ddf900b8c55e4988e0896b20b09a7)

Author SHA1 Message Date
winlin 7f02bfa3a4 for #250, the mpegts over udp stream caster framework. 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin f9d1e1111a merge from feilong, consumer directly sleep when paused. 10 years ago
winlin 8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 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 e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 10 years ago
winlin a4ba40952a for #250, rename rtmp to protocol dir. 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin dfe385d0c9 for #293, move the simple buffer to kernel. 10 years ago
winlin 0f59073400 refine code, rename the pts to dts although both ok for audio. 10 years ago
winlin 913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 10 years ago
winlin dc6299171f refine http stream code. 10 years ago
winlin 7d86c6d9e9 for bug #293, refine for fast cache of http stream. 10 years ago
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 10 years ago
panda1986 797c1b0762 support all acodec. not forced to aac. 10 years ago
panda1986 e7d54c2ca9 Update srs_app_ffmpeg.cpp
srs develop 新增支持mp3转码后,需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
10 years ago
winlin 5f194bc87c merge from feilong, the crash for cosumer wait. 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin 29a8932b49 for bug #293, use http stream cache for android weixin to happy. 10 years ago
winlin f9f2fcbb9c for #293, add http stream cache for audio mp3/aac stream. 10 years ago
winlin d364a81d8f for #293, support http mp3 streaming 10 years ago
winlin 99bf397487 for bug #293, add mp3 id3 spec 10 years ago
winlin b04888a35d for #293, #277, support http chunked encoding 10 years ago
winlin 3244c083c7 for bug #293, support http aac stream 10 years ago
winlin 7674524c31 for #239, empty the aac encoder 10 years ago
winlin c0233542bf for #293, add aac encoder for http aac stream. 10 years ago
winlin c0a7752718 for #293, add aac mime audio/x-aac 10 years ago
winlin d546827b1c for #293, refine the mime of content type. 10 years ago
winlin 3b853a6dbd fix #293, support rtmp remux to http flv live stream. 10 years ago
winlin eea31ef4f3 for #293, support rtmp remux to http flv live stream. 10 years ago
winlin faaa9187f2 for #293, mount http flv stream when publish. 10 years ago
winlin 2698e6dbae for bug #293, http live streaming framework. 10 years ago
winlin eff2d81016 for #293, add http flv stream 10 years ago
winlin c4302b9b61 for bug #277, the http server subscribe the reload. 10 years ago
winlin f1393ee43f for bug #277, use http not found when no file. 10 years ago
winlin 398b212bfa for bug #277, refine code, support default http vhost. 10 years ago
winlin 2742c0d3c2 for #277, support http vhost mount. 10 years ago
winlin 4513486266 refine http server, support mount dir for vhost. 10 years ago
winlin bfff8413b6 refine code for #277, the copy first param is the dest. 10 years ago
winlin c695a8fcbd refine code for #277, extract the flv vod stream. 10 years ago
winlin e71bc0cbc5 for bug #277, refine the http server. 10 years ago
winlin bbe96a4b31 for bug #277, support flv stream. 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 29be14dd37 merge from feilong, fix memory leak. 10 years ago
winlin a4b61081cc merge from feilong, fix memory leak. 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 964668dc73 merge from feilong, print format error. 10 years ago
winlin b3225100e7 Merge pull request #282 from tufang14/develop
add client num in statistic with traverse every client for #227
10 years ago
qiang.li 310e49e7f3 add client num in statistic with traverse every client 10 years ago
winlin 982e9555bd merge from feilong, fix hls msg memory leak bug. 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 ac584a4db2 Merge pull request #279 from tufang14/develop
add client num for stream in statistic for #227
10 years ago
qiang.li 46d716612c add client num for stream in statistic 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 5661fc2676 refine dvr and rtmp dump, write the original data. 10 years ago
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread. 10 years ago
qiang.li 08e9f6ef42 add play client num in statistic 10 years ago
winlin f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream. 10 years ago
winlin ae63af6a4a refine code, implements the stat.: 10 years ago
winlin 97bea51499 refine the api, response the error code and data. 10 years ago
winlin cc796a433a refine the statistic arch. 10 years ago
winlin 40ed2249e8 refine code to use the one coding style. 10 years ago
winlin 4bb17f0c81 replace the TAB with 4spaces 10 years ago
winlin 344ff24f66 add srs_app_statistic to upp project. 10 years ago
winlin 67adc8dc61 merge with security bug fix. 10 years ago
qiang.li a4a93613d0 add statistic for stream 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
qiang.li 8d534d3470 get stream info use http api #227 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin f89941254a refine code of security deny check 10 years ago
winlin 18b15b9099 refine comments of security deny check 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 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 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 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 7737042795 fix #264, remove the test code. 1.0.11 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 61a648f1d2 refine for #259, chmod -x files. 10 years ago
winlin 24815e4efe refine code for bug #239 10 years ago
tufang14 3d0d43c5dc token bug
多级origin-edge模式,edge上功能不生效
10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 10 years ago
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 11 years ago
winlin 2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 11 years ago
winlin 9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 11 years ago
winlin 13b092704d refine code for bug #151, refine the source functions, add comments. 11 years ago
winlin b830b995e6 fix bug #162, requires epoll. 0.9.222 11 years ago
zhengfl 2317f0e767 refine 11 years ago
zhengfl bafdd83122 last 11 years ago
zhengfl 1e34d2a5cd client connection no disconnect 11 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 5529813fcb for bug #257, support NULL msg in msgs to send. 10 years ago
winlin dac9f9c45c refine the log level. 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin 68ade0a267 add log info for rtmp conn. change the mw_latency to 100 for realtime. 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 438ee30ac1 for bug #251, refine the queue fast vector. 2.0.66 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 d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 10 years ago
winlin 32d537b96b for bug #251, refine code before mic. 10 years ago
winlin d827928eeb for bug #251, merge the performance refines. 10 years ago
winlin de993b6465 for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer. 10 years ago
winlin f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 10 years ago
winlin 528ae1e9b1 refine source and queue dump msgs. 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 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 4c1d5c0d1e refine the log for mw and mr. 2.0.55 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 10 years ago
winlin 98647d6e67 limit the user-space buffer size to 128KB, 128MB for 1k publishers. 10 years ago
winlin 76af04c55d refine the recv buffer for mr. 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 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 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 0ea8cd9e84 for bug #248, use simple buffer for http. 10 years ago
winlin 2cb8b7dd52 for bug #248, use simple buffer for hls. 10 years ago
winlin 315f981821 refine for bug #241, increase the small bytes for merged read. 10 years ago
winlin 5791ed59fd for bug #241, refine the socket max buffer. 10 years ago
winlin 4785f882d4 for bug #241, refine the max buffer and kbps. 10 years ago
winlin 850946bb13 for bug #241, calc the small and sleep for merged read. 10 years ago
winlin aee00877df for bug #241, change buffer size when chunk size changed. 10 years ago
winlin f35ec2155b for bug #241, support merged read. 2.0.48 10 years ago
winlin adf95d239e refine code, move the ISrsBufferReader to srs_protocol_io 10 years ago
winlin ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 10 years ago
winlin 6cbf732e1a for bug #237, thread donot sleep when timeout is 0. 10 years ago
winlin c457364321 for bug #237, add name for thread. 2.0.47 10 years ago
winlin 787ab674e3 fix #244, conn thread use cond to wait for recv thread error. 2.0.47. 10 years ago
winlin 565f29ed6c Revert "for bug #241, merge big chunks for publish, no use."
This reverts commit 6b57597718.
10 years ago
winlin 6b57597718 for bug #241, merge big chunks for publish, no use. 10 years ago
winlin 463e1fbc41 for bug #237, refine the thread loop for publish thread. 2.0.47 10 years ago
winlin 24a6a723ee for bug #237, never sleep when thread interval is 0. 10 years ago
winlin 6f963b50f3 refine code, publish recv thread sleep 697ms 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 757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 10 years ago
winlin 29c6014192 refs #1670: fix the bug for bug #237, use us and ms timeout. 10 years ago
winlin 472b1742a2 for bug #237, use isolate thread to recv message. 2.0.41 10 years ago
winlin 0e7836868c for bug #235, refine the queue recv thread. 10 years ago
winlin 0b631ee80d for bug #235, pass timeout to recv thread. 10 years ago
winlin 31eb9bf1c1 for bug #237, extract a queue recv thread. 10 years ago
winlin 22524f390a rename the recv thread to queue recv thread for bug #237. 10 years ago
winlin d171a26758 disable gop cache when not h.264. fix some warning. 10 years ago
winlin b4057916b6 add qt project file. fix cmake file for clion. 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 3d97048c3a fix bug #217, add reuse conn to play different player. 10 years ago
winlin 3e81e6e0f1 refine code for bug #217, use recv thread to set the timeout. 10 years ago
winlin 58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 10 years ago
winlin 622218c4dd for bug #217, use isolate thread to improve 17% performance. 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 749fac414b refine code, donot response call when transaction id is zero. 10 years ago
winlin 9f60a6738a add comments for listen 10 years ago
winlin 47ed9e33dd refine code for bug #194, use send messages for all msg array. 10 years ago
winlin f11272e3ce add comments for bug #194, #196 10 years ago
winlin 8845bb7caf for bug #194, refine code, remove the old duplicated code. 10 years ago
winlin 62719c2b12 for bug #200, fix the writev for librtmp, add comments. 10 years ago
winlin 0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 10 years ago
winlin 77cf885d8c add comments for #161 10 years ago
winlin 4af2e78c59 refine code for bug #194, add comments to macros. 10 years ago
winlin cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 10 years ago
winlin d257360e96 add comments about bug #196 10 years ago
winlin 8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 10 years ago
winlin a6f3478a74 for bug #194, remove the poll, it's no-use 10 years ago
winlin bc1b5f4bbf for bug #194, disable the srs fd poll. 10 years ago
winlin 4f21e92ae0 fix the message of config for max_connections. 10 years ago
winlin 21f16f3a83 for bug #194, use play fd poll to improve performance, it works. 10 years ago
winlin 164f632b62 for bug #194, add fds poll, just sleep to send without recv. 10 years ago
winlin 133cc62b51 for bug #194, use play fd poll, create the singleton poll 10 years ago
winlin efc85ed6df refine config, check the connections more precise 10 years ago
winlin de5e2d0a40 Revert "Revert "for bug #194, refine the config""
This reverts commit b4c1d55311.
10 years ago
winlin b4c1d55311 Revert "for bug #194, refine the config"
This reverts commit 2a55ae4317.
10 years ago
winlin e87eacd499 Revert "add srs pipe for bug #194"
This reverts commit f9756ea14c.
10 years ago
winlin 73abb1a31d Revert "for bug #194, add pipe to consumer."
This reverts commit 1e601a6efc.
10 years ago
winlin 306f75b267 Revert "for bug#194, open pipe for each connection."
This reverts commit ade81bb244.
10 years ago
winlin ade81bb244 for bug#194, open pipe for each connection. 10 years ago
winlin 1e601a6efc for bug #194, add pipe to consumer. 10 years ago
winlin f9756ea14c add srs pipe for bug #194 10 years ago
winlin 2a55ae4317 for bug #194, refine the config 10 years ago
winlin 36d12dd8ea for bug #194, change server main cycle to 1s. 10 years ago
winlin 8cc9a11b81 for bug #194, set the server main cycle to 1s 10 years ago
winlin 46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 10 years ago
winlin 3358570be6 refine for bug#66, implements the usage. 10 years ago
winlin 72ad6894ca move the annexb decode utility to protocol. 10 years ago
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin 57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 11 years ago
winlin d24e2fd0cc remove supports for OSX. 2.0.1. 11 years ago
winlin f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 11 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin bcd1b3d2d4 refine code, remove unused code of dvr. 11 years ago
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
winlin 83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 11 years ago
winlin 1d454cd5fb add bug for http-mp4. 11 years ago
winlin 9dd0939327 fix the bug for gmc. 0.9.211 11 years ago
winlin 61728118ab donot destroy the source and connections of gmc. 11 years ago
winlin 79938f3214 add comments for gmc. 11 years ago
zhengfl c2ac11201b amendment srs_verbose info in the get_peer_ip 11 years ago
winlin 901c9590e4 refine log, log important to file. 1.0.210 11 years ago
winlin 728b749384 fix #167, add openssl includes to utest. 0.9.209. 11 years ago
winlin 53011808fb add sysctl vm.max_map_count for mmap. 11 years ago
winlin d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 11 years ago
winlin 839101a036 reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro. 11 years ago
winlin 42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 11 years ago
winlin 4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 11 years ago
winlin e656a65b6c for bug #162, add conf and connections limit. 11 years ago
winlin ab965655aa refine forwarder, add tracable debug info. 0.9.202 11 years ago
winlin e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 11 years ago
winlin c24e68dd70 refine the stat, use one ok. 1.0.200 11 years ago
winlin 6103b1c3ce refine options, add --with-stat. 0.9.199 11 years ago
winlin 3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 11 years ago
winlin cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 11 years ago
winlin 08bc34e0df refine wiki, cluster to forward. 11 years ago
winlin a9d28122f4 refine code, refine the handshake, refine the log of source_id 11 years ago
winlin 5b28355a0b fix #147, support identify the srs edge. 0.9.190. 11 years ago
winlin 33bc8755ab refine code, add comments for ossrs.net monitor. 11 years ago
winlin 67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 11 years ago