1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Commit graph

296 commits

Author SHA1 Message Date
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
1de2bb0801 add kafka protocol files. 2015-09-21 17:12:28 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
66a26bdce8 move json from app to protocol 2015-08-21 16:20:19 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
3b8daafc03 use local openssl header files to avoid warnings on osx. 2015-07-06 10:32:28 +08:00
winlin
f8f6e438cc extract http static and http stream from http conn. 2015-06-14 14:06:39 +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
8b3bd5b4b9 add srs memory watcher. 2015-06-07 15:13:41 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
cf9ee04611 fix the utest build failed bug. 2015-05-24 18:56:52 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
af172d9593 refine script, use PROTOCOL as RTMP. 2015-05-23 09:59:24 +08:00
winlin
68d835021e refine code, move the kbps to protocol 2015-05-23 09:58:00 +08:00
winlin
6bfb743aa0 remove the unused app http file 2015-05-22 22:38:15 +08:00
winlin
e2955da78f refine code, extract the http protocol sdk to module. 2015-05-22 20:47:27 +08:00
winlin
f0c24eeacc add stream caster for post flv over http. 2015-05-03 10:56:20 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +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
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
1cb2992808 refine build for modules, add defines. 2015-03-23 17:49:45 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
da56e4fbb9 for #328, fix hds compile error on mac. 2015-03-12 07:26:30 +08:00
winlin
b3aed2cb59 fix the bug of configure. 2015-03-10 18:18:47 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
0ff49fd299 for #155, debug srs on xcode. 2015-03-10 13:13:31 +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
05d238f860 support modules. 2015-03-07 16:39:05 +08:00
winlin
688890cd7a refine configure, generate objs/makefile first. 2015-03-07 16:37:29 +08:00
winlin
a29b8a7a5b refine configure, move auto headers to script. 2015-03-07 16:33:06 +08:00
winlin
4325809daf refine http 2015-03-05 21:45:01 +08:00
winlin
40fbfd8560 for #133, rtsp extract tcp/udp listener. 2015-02-17 16:28:28 +08:00
winlin
c0e50265bd for #133, create rtsp framework. 2015-02-16 14:05:01 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
4246be92c9 for #250, merge avc to codec. use queue to dequeue. 2015-01-31 21:16:42 +08:00
winlin
70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 2015-01-31 19:46:55 +08:00
winlin
6463d22a14 for #250, add mpegts over udp stream caster class. 2015-01-24 16:27:30 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
dfe385d0c9 for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
winlin
913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 2015-01-22 17:08:38 +08:00
winlin
99bf397487 for bug #293, add mp3 id3 spec 2015-01-19 09:25:07 +08:00
winlin
c0233542bf for #293, add aac encoder for http aac stream. 2015-01-18 22:51:07 +08:00
winlin
67adc8dc61 merge with security bug fix. 2015-01-05 12:09:15 +08:00
qiang.li
a4a93613d0 add statistic for stream 2015-01-04 22:47:12 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
60bc9c2aa0 add performance header to control options for performance. 2.0.50 2014-12-04 13:43:55 +08:00
winlin
ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 2014-12-03 18:56:09 +08:00
winlin
03f72fb1a6 for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 2014-11-27 18:39:02 +08:00
winlin
18c308248e refine code by winlin, for merged from allspace. 2014-11-27 15:22:39 +08:00
winlin
1855c9429c merge from allspace, to srs-librtmp, for vs2010 2014-11-27 14:46:05 +08:00
winlin
58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 2014-11-22 17:58:02 +08:00
winlin
0c39a704c2 update build srs librtmp single 2014-11-16 11:29:50 +08:00
winlin
a6f3478a74 for bug #194, remove the poll, it's no-use 2014-11-12 10:26:48 +08:00
winlin
133cc62b51 for bug #194, use play fd poll, create the singleton poll 2014-11-11 17:54:02 +08:00
winlin
e87eacd499 Revert "add srs pipe for bug #194"
This reverts commit f9756ea14c.
2014-11-11 17:05:25 +08:00
winlin
f9756ea14c add srs pipe for bug #194 2014-11-11 16:09:44 +08:00
winlin
6968aef66a update readme for srs-librtmp 2014-11-08 20:06:31 +08:00
winlin
3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 2014-11-08 18:33:15 +08:00
winlin
926650840e fix #191, configure --export-librtmp. 2.0.10. 2014-11-08 16:45:50 +08:00
winlin
eb88ebfb39 use relative objs dir for makefile. for bug #191 2014-11-08 16:07:31 +08:00
winlin
d4d3d46317 implements export srslibrtmp. for bug #191 2014-11-08 15:31:21 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
922bc3e3a8 refine configure, use console for gmc/gcp/gmp/gprof 2014-09-09 16:56:05 +08:00
winlin
728b749384 fix #167, add openssl includes to utest. 0.9.209. 2014-08-28 13:32:13 +08:00
winlin
839101a036 reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro. 2014-08-27 12:28:05 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp 2014-07-26 20:07:12 +08:00
winlin
073d900674 add consts to kernel 2014-07-20 13:04:48 +08:00
winlin
24a041266c refine config 2014-07-20 12:22:24 +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
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
e53655ee83 refine the build script 2014-07-13 13:31:24 +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
ad920915a2 merge handshake to protocol 2014-07-05 17:56:18 +08:00
winlin
b13fd5112b merge buffer to kernel utest 2014-07-05 17:50:36 +08:00
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
winlin
ed3f9f0a40 add core utest 2014-06-29 16:04:28 +08:00
winlin
f5f54e6008 add utest for kernel codec 2014-06-29 15:43:32 +08:00
winlin
051c9e6268 refine the protocol utility, add utest, 0.9.140 2014-06-29 11:45:31 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
6286759eaa refine codec, extract avc aac codec to app. 2014-06-08 22:36:17 +08:00
winlin
94cf0c1069 refine kernel buffer. complete the utest for buffer. 2014-06-07 22:23:17 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112 2014-05-23 13:56:40 +08:00
winlin
cb95b5909c add http heartbeat framework 2014-05-19 15:45:04 +08:00
winlin
9006194cd7 refine framework to calc the kbps 2014-05-12 17:27:50 +08:00
winlin
1a1527a857 fix bug #64: install_dir=DESTDIR+PREFIX 2014-05-12 12:56:58 +08:00
winlin
e5290725ab fix bug of mips 2014-05-04 19:13:21 +08:00
winlin
97f4d81193 fix bug of mips 2014-05-04 18:52:32 +08:00
winlin
a88e95d558 add mips 2014-05-04 18:38:42 +08:00
winlin
1e9561150a add mips 2014-05-04 18:38:08 +08:00
winlin
a63a3812e3 add srs app edge 2014-04-25 16:35:03 +08:00
winlin
e0e033d847 fix bug for arm cross build 2014-04-19 11:54:14 +08:00