external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
6927 commits 13 branches 107 tags 375 MiB
Commit graph

289 commits

Author SHA1 Message Date
winlin
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
4763f205a2 add kbps for vhost and stream 2015-08-22 09:49:38 +08:00
winlin
baa892a762 merge srs_app_st_socket to srs_app_st. 2015-06-14 08:43:38 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
7996b3b789 add warning for gmp, use gmc to detect memory leak. 2015-06-09 10:52:32 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +08:00
winlin
e5461d2df9 refine code 2015-05-28 07:03:38 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
c1b9541b5c support disable all 2015-05-27 07:22:44 +08:00
winlin
6bfb743aa0 remove the unused app http file 2015-05-22 22:38:15 +08:00
winlin
f0ae66a081 merge the app http to conn. 2015-05-22 22:34:03 +08:00
winlin
ce1bb6c605 refine code, extrat the ISrsHttpMessage. 2015-05-22 22:24:05 +08:00
winlin
44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 2015-05-19 18:06:20 +08:00
winlin
77ee2400df fix the unicode to ascii 2015-05-09 23:12:12 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
7b157b0678 refine hls ingester, quit when error. 2015-04-22 09:04:18 +08:00
winlin
aabe84046c refine hls ingester, quit when error. 2015-04-22 09:01:38 +08:00
winlin
1d973e2178 refine the overflow algorithm, prevent smaller piece. 2015-04-21 16:18:37 +08:00
winlin
d19dfa528e abs overflow also plus the deviation, for pure audio hls. 2015-04-21 14:35:28 +08:00
winlin
c514a4ceeb use atc for ingest hls aac time. 2015-04-21 12:58:54 +08:00
winlin
a28eec89b0 support ingest hls with m3u8 in m3u8. 2015-04-21 12:53:45 +08:00
winlin
ba6736839b support hls ingest, fix the bugs. 2015-04-20 18:31:45 +08:00
winlin
2239e9f1fd support ingest hls live stream to RTMP. 2015-04-20 16:25:48 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
fbbe46d272 refine the config, support directly parse file. 2015-03-07 22:25:43 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
4325809daf refine http 2015-03-05 21:45:01 +08:00
winlin
3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 2015-03-04 16:52:43 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
e71bc0cbc5 for bug #277, refine the http server. 2015-01-17 23:44:21 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 2014-12-10 09:15:38 +08:00
winlin
d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 2014-12-06 20:10:05 +08:00
winlin
32d537b96b for bug #251, refine code before mic. 2014-12-06 19:56:06 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
14fca601f9 merge from 1.0 hotfix. 3.0.35 2014-11-27 18:50:54 +08:00
winlin
9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 2014-11-27 18:48:01 +08:00
winlin
904a06cadf Merge branch '1.0release' 2014-11-27 17:47:23 +08:00
winlin
575e50b6e2 hotfix to add comments on 1.0release 2014-11-27 17:47:13 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
5fd308c64e update code, warning when compile dev branch. 2014-11-06 15:18:10 +08:00
winlin
f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 2014-11-06 14:28:03 +08:00
winlin
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:55:58 +08:00
winlin
2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 2014-10-09 10:41:24 +08:00
winlin
967de9d2e7 for bug #159: postpone the http server bug to 2.0+ 2014-09-30 16:34:46 +08:00
winlin
67188dcee7 remove the test code of main. 2014-09-30 16:28:59 +08:00
winlin
f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 2014-09-30 11:21:46 +08:00
winlin
20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 2014-09-26 17:47:43 +08:00
winlin
002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 2014-09-26 16:34:13 +08:00
winlin
4a323e64c4 add openssl for cmake. 2014-09-26 14:03:29 +08:00
winlin
2d7f5ddcbf add cmakelists.txt for cmake for clion of jetbrains. 0.9.214 2014-09-26 11:05:45 +08:00
winlin
87aac3ddd4 refine log, add features for macro. 0.9.212 2014-09-23 16:53:12 +08:00
winlin
901c9590e4 refine log, log important to file. 1.0.210 2014-08-29 15:07:04 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
fd1e8aa882 remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159 2014-07-13 19:42:06 +08:00
winlin
88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 2014-07-12 08:47:47 +08:00
winlin
cbc1486688 refine message, add license 2014-06-14 14:19:19 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
1e9561150a add mips 2014-05-04 18:38:08 +08:00
winlin
b53f83acf1 rename __srs_rtmp_expect_message to srs_rtmp_expect_message 2014-05-02 12:45:42 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
be4c182d11 refine RTMP protocol stack. 2014-04-29 14:18:10 +08:00
winlin
88094af97a refine log, add user original configure 2014-04-16 15:04:38 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
eda1ddc03d support reload log level/logfile/tank 2014-04-12 21:35:26 +08:00
winlin
0a016e58bf add comments for main 2014-04-12 20:37:16 +08:00
winlin
b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 2014-04-12 20:35:40 +08:00
winlin
8295169e0e refine code, unify the coding style 2014-04-10 14:22:09 +08:00
winlin
ccba9ba9ba move log level parse to app utility 2014-04-10 14:20:02 +08:00
winlin
f2f30dcc52 add utility, change log to trace 2014-04-10 14:12:22 +08:00
winlin
92281548b6 add ingest config 2014-04-07 13:13:57 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
7b3bc8f741 fix bug of bwtc 2014-03-26 10:05:07 +08:00
winlin
a9d11df3a3 update arm tool chain 2014-03-25 14:36:30 +08:00
winlin
a6d9da5e43 fix bug of script, support both abs and relative path 2014-03-25 11:04:36 +08:00
winlin
c3e750e90f add version to log 2014-03-24 18:07:32 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 2014-03-22 20:53:29 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
d89d16ca1e print the system info when startup main 2014-03-19 10:51:33 +08:00
winlin
2eeb289c2f assert system is little-endian 2014-03-19 10:38:02 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
6e0bebdacf full support gperf gmc/gmp/gcp 2014-03-07 15:40:55 +08:00
winlin
741d6f97f6 support gperf memory check(gmc). 2014-03-07 12:24:47 +08:00
winlin
dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally 2014-03-06 18:12:19 +08:00
winlin
880f4f5dc2 final the modularity, rename the app module. 2014-03-02 21:49:09 +08:00
winlin
d5a02a55ee unify code style 2014-03-01 18:27:55 +08:00
winlin
7d570fb4f3 use fast log 2014-03-01 18:06:20 +08:00
winlin
382fd127e4 rename config and pithy-print to app module. 2014-03-01 16:02:59 +08:00
winlin
2074b50d87 move handshake and rtmp to protocol module 2014-03-01 14:03:02 +08:00
winlin
4e3f7843fe rename protocol dir to pro. move rtmp stack to protocol module 2014-03-01 13:39:27 +08:00
winlin
7dfc902b87 extract protocol io interface to prepare to extract the protocol from underlayer socket. 2014-03-01 12:43:04 +08:00
winlin
85cd1e1a41 extract protocol module, move amf0 to protocol module 2014-03-01 11:24:40 +08:00
winlin
8fea433450 move stream to kernel module 2014-03-01 10:58:13 +08:00
winlin
cb99de4462 move config to kernel module 2014-03-01 10:55:43 +08:00
winlin
39d3425691 extract log context, move log to kernel module. 2014-03-01 10:42:55 +08:00
winlin
dea66a322d extract kernel module, depends on core and provides kernel service(no stream) 2014-03-01 10:30:16 +08:00
winlin
bb3c88fef7 change copyright from 2013 to 2013-2014. 2014-01-01 10:37:12 +08:00
winlin
20d1732ced merge from wenjie, the bandwidth test feature. 2013-12-27 17:03:12 +08:00
winlin
b9440df745 add encoder/hls pithy print 2013-12-05 23:34:26 +08:00
winlin
e3e0db9bb1 fix the format to unix without x 2013-11-23 18:20:02 +08:00
winlin
2c4c91d821 convert format to unix 2013-11-23 11:36:07 +08:00
winlin
d1e20dc866 fix the global static instance error, use function to get server 2013-11-20 10:08:52 +08:00
winlin
68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1). 2013-11-09 22:41:44 +08:00
winlin
c0b6982e0d support listen multiple ports. 2013-11-02 19:32:52 +08:00
winlin
2aa15a1134 support nginx-style config file 2013-11-02 17:55:59 +08:00
winlin
5d1d0ff8bb update help 2013-10-23 12:20:03 +08:00
winlin
57dd58d557 send set peer bandwidth packet. 2013-10-20 15:59:26 +08:00
winlin
d4b6178f0f get peer ip and add rtmp class 2013-10-18 20:15:05 +08:00
winlin
973bea1e14 extract the rtmp connection 2013-10-18 16:57:21 +08:00
winlin
d8a64603c0 support listen and accept framework 2013-10-18 16:23:06 +08:00
winlin
5b02f9c78b init st, add error code 2013-10-18 10:39:37 +08:00
winlin
eb3b824e6c rename upp project 2013-10-18 09:19:19 +08:00
winlin
a4c5f94b15 add copyright info 2013-10-17 22:27:47 +08:00
winlin
67d96fcab4 add log 2013-10-17 22:09:10 +08:00
winlin
7268dd15a1 add build framework 2013-10-17 20:58:04 +08:00