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

780 commits

Author SHA1 Message Date
winlin
6374fa1383 simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof 2014-03-20 13:30:06 +08:00
winlin
c63ad48893 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 09:41:13 +08:00
winlin
822143b500 fix bug of build script 2014-03-20 09:26:48 +08:00
winlin
a2c5075002 update comments for handshake. 2014-03-19 23:40:49 +08:00
winlin
a470330383 finish utest for handshake. 2014-03-19 23:34:50 +08:00
winlin
6b84a5e14c change to 0.9.22 2014-03-19 22:51:04 +08:00
winlin
b7d40b5aba support vn/an to disable video/audio, for radio streaming 2014-03-19 22:45:58 +08:00
winlin
747bbd988e change to 0.9.21, refine complex handshake, client/server support complex handshake. 2014-03-19 17:15:52 +08:00
winlin
da93b6fe99 add complex handshake utest 2014-03-19 17:14:42 +08:00
winlin
491ea4b630 support client complex handshake with server 2014-03-19 16:30:43 +08:00
winlin
841f0f8899 change to 0.9.19, verify the s1/s2/c2, refine the handshake. 2014-03-19 14:58:29 +08:00
winlin
152d3539d8 add s1 validation for client/server 2014-03-19 13:10:25 +08:00
winlin
12445174e7 add option --static, to static link for arm 2014-03-19 12:39:09 +08:00
winlin
efa22074be always use static link, for manually build arm, and x86/64 use static link is ok. 2014-03-19 12:18:48 +08:00
winlin
e0e451b680 add utest support for arm 2014-03-19 11:24:25 +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
b58ab508f9 add rtmp handshake utest, for arm to finger out the bug 2014-03-19 00:47:10 +08:00
winlin
1c055e7424 add log for ssl disabled. 2014-03-18 17:44:43 +08:00
winlin
1ffbdbc098 refine log, donot show error when client gracefully close it 2014-03-18 16:17:52 +08:00
winlin
b52a051d80 refine readme, confs 2014-03-18 15:38:34 +08:00
winlin
a0b747621e update srs.conf, add comments to see full.conf 2014-03-18 15:29:27 +08:00
winlin
b36338853a refine the conf files, rename srs.conf to demo.conf 2014-03-18 15:13:25 +08:00
winlin
d67edf631b update readme, add ubuntu12 to test list 2014-03-18 13:04:06 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
e5770b10b1 refine the colorful log for srs. remove the log when client close. 2014-03-18 11:28:22 +08:00
winlin
8029b7464a Merge pull request #28 from wenjiegit/master 
merge from wenjie.zhao for colorful log.
 2014-03-18 11:00:00 +08:00
winlin
618f6f52ae fix bug of librtmp sample on x86/x64 platform 2014-03-17 12:06:58 +08:00
winlin
1a3142d23b fix bug of librtmp sample build for arm, use static link 2014-03-17 12:00:21 +08:00
winlin
618579e484 refine srs build for arm, support librtmp sample 2014-03-17 11:52:23 +08:00
winlin
a29bd05c0f refine build script 2014-03-17 11:32:16 +08:00
winlin
71adff776b fix build script, remove unused build tool defines 2014-03-17 11:10:57 +08:00
winlin
77e652fcbe refine buils nginx script 2014-03-17 10:52:49 +08:00
winlin
421fbd4c3e fix bug of arm build script__SRS_BUILD_NGINX=NO 2014-03-17 10:48:44 +08:00
winlin
3721e72e99 arm: change to 0.9.18 2014-03-16 20:59:56 +08:00
winlin
5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp. 2014-03-16 20:58:04 +08:00
winlin
ad05eec7a2 arm support librtmp 2014-03-16 20:20:29 +08:00
winlin
a9da5903f6 arm support ssl/hls, change to 0.9.17 2014-03-16 20:16:42 +08:00
winlin
75340e3ac0 add refer for arm research code 2014-03-16 18:06:30 +08:00
winlin
7744053d28 add arm research files, change to 0.9.16 2014-03-16 18:05:07 +08:00
winlin
a90cb9dd84 fix ubuntu build warning, the config unused setter 2014-03-15 19:50:40 +08:00
winlin
010b5c0d7a fix ubuntu build warning, the config unused setter 2014-03-15 19:48:11 +08:00
winlin
04cc29f4e1 support ubuntu make colorful display 2014-03-15 19:44:06 +08:00
wenjie.zhao
109ce07c1b color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:55:30 +08:00
wenjie.zhao
e0e3504e1d color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:53:46 +08:00
winlin
98c9002b41 remove the patch for st for arm 2014-03-12 16:01:50 +08:00
winlin
24be5fb386 add http 1.0 and 1.1 specification 2014-03-12 15:42:30 +08:00
winlin
7112c6ac73 add http 1.0 and 1.1 specification 2014-03-12 15:42:03 +08:00
winlin
b9613fd0d1 update readme, add wiki sample:transcode2hls 2014-03-12 12:07:16 +08:00
winlin
e6e32f963c add wiki Usage: Forward and Realtime 2014-03-11 00:01:24 +08:00
winlin
3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK 2014-03-10 23:13:09 +08:00
winlin
c1149607c9 simplify usage 2014-03-10 19:44:04 +08:00
winlin
4a8ee0f6e9 fix bug of stop script 2014-03-10 19:26:44 +08:00
winlin
2fa0d60186 simplify usage 2014-03-10 19:13:18 +08:00
winlin
13d9b44c73 simplify usage 2014-03-10 18:59:11 +08:00
winlin
431b0fb31d add FMLE snapshot 2014-03-10 16:09:19 +08:00
winlin
91c1a2cd28 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:33:13 +08:00
winlin
f6126c5ad2 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:09:45 +08:00
winlin
387be8fa3b change to 0.9.15, finish amf0 utest 2014-03-09 20:37:20 +08:00
winlin
9521fbfaaa change version to 0.9.14, finish amf0 basic utest 2014-03-08 23:10:54 +08:00
winlin
95c2e7fd63 amf0 utest: finish basic utest for amf0 2014-03-08 23:09:24 +08:00
winlin
044138c39e refine summary for amf0 hpp 2014-03-08 23:02:27 +08:00
winlin
9fd48d84c1 refine amf0 object size to total_size, elem count to count 2014-03-08 22:59:30 +08:00
winlin
59db1dd260 utest for amf0 object, refine the count of elem 2014-03-08 22:51:13 +08:00
winlin
8ed9ae6242 amf0 utest: remove the object read/write function, directly use object to read or write. 2014-03-08 22:25:56 +08:00
winlin
a3ae871360 refine code, array to ecma_array. 2014-03-08 22:07:40 +08:00
winlin
3129c738cb amf0 utest: refine interface of amf0, only export required objects 2014-03-08 21:56:14 +08:00
winlin
b55efef2ee amf0 utest: finish amf0 any read/write utest 2014-03-08 21:12:13 +08:00
winlin
609114a5fe amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself. 2014-03-08 21:06:20 +08:00
winlin
3691c106fa amf0 utest: add usage for amf0 2014-03-08 17:18:44 +08:00
winlin
34f94a1be3 amf0 utest: add object and ecma array create function. 2014-03-08 17:04:21 +08:00
winlin
f4aa2f30c1 amf0 utest: change version to 0.9.13 2014-03-08 16:57:13 +08:00
winlin
4306db099d amf0 utest: elem read/write refined 2014-03-08 16:56:35 +08:00
winlin
bfe771bbba amf0 utest: null,undefined,object-eof to any 2014-03-08 14:38:19 +08:00
winlin
e40be6e89d amf0 utest: boolean to any 2014-03-08 14:13:31 +08:00
winlin
4a0023ae63 amf0 utest: finish utest for string to any 2014-03-08 14:05:45 +08:00
winlin
cae8228b09 amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead 2014-03-08 13:57:08 +08:00
winlin
57ce04ae12 amf0 utest: remove struct use class instead, move class together 2014-03-08 13:41:15 +08:00
winlin
404207db4f amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:22 +08:00
winlin
db7a113441 amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:04 +08:00
winlin
3083759273 amf0 utest, refine amf0 size and object/array read/write 2014-03-08 13:11:26 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
1892245db6 add option bwtc, to enable or disable the bandwidth test tool 2014-03-07 19:07:38 +08:00
winlin
0a2b8b797d support disable the librtmp 2014-03-07 18:55:15 +08:00
winlin
179e2a2bba use zip format 2014-03-07 17:50:21 +08:00
winlin
59a2d5e7e0 add --with-gprof support 2014-03-07 17:18:31 +08:00
winlin
42ad264182 add gprof files and dot files 2014-03-07 16:09:35 +08:00
winlin
6e0bebdacf full support gperf gmc/gmp/gcp 2014-03-07 15:40:55 +08:00
winlin
8cd1c11add change forward schema 2014-03-07 14:27:32 +08:00
winlin
bef7e20ed9 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:35:03 +08:00
winlin
c89aea8af7 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:34:23 +08:00
winlin
741d6f97f6 support gperf memory check(gmc). 2014-03-07 12:24:47 +08:00
winlin
489a492e47 add url for gperftools 2014-03-07 09:52:59 +08:00
winlin
10852acb25 refine gperf build script 2014-03-06 18:14:46 +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
03a14e2e1a add gperftools for mem leak detect, mem/cpu profile. 2014-03-06 16:52:51 +08:00
winlin
ee7fafe465 add gperftools demo: heap check and profile, cpu profile 2014-03-06 16:48:39 +08:00
winlin
9896842b05 add cpu profile 2014-03-06 16:46:59 +08:00
winlin
4061f0db58 refine the profiler 2014-03-06 16:31:40 +08:00
winlin
7239963780 add heap checker and profiler demo 2014-03-06 16:23:35 +08:00
winlin
0b17b2a481 build gperftools 2014-03-06 14:10:45 +08:00
winlin
34e913c58f add gperftools for mem leak detect, mem/cpu profile. 2014-03-06 12:50:23 +08:00
winlin
9d08b42c82 change version to 0.9.11 2014-03-05 10:41:23 +08:00
winlin
8bdf98afa5 refine the multiple processes architecture, remove the isolate bandwidth test process 2014-03-05 10:34:17 +08:00
winlin
a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish. 2014-03-05 10:21:31 +08:00
winlin
1ccddf4cfc add gest framework for utest, build success. 2014-03-04 18:46:00 +08:00
winlin
338e129a29 add utest build project, no testcase. 2014-03-04 16:13:12 +08:00
winlin
fe5811304b add utest script to generate the utest Makefile 2014-03-04 14:01:43 +08:00
winlin
02326cd844 support build with jobs 2014-03-04 13:03:20 +08:00
winlin
52b6ab3f2f support build with jobs 2014-03-04 12:45:41 +08:00
winlin
128783ded3 add build summary colorful display for each feature. 2014-03-04 11:09:41 +08:00
winlin
47aee8dce0 add utest framework gtest 2014-03-03 18:28:50 +08:00
winlin
722e79003b merge from xiangcheng.liu, memory leak in amf0 2014-03-03 09:49:59 +08:00
winlin
d622da3b44 update readme, finish modularity and wiki, change to 0.9.10 2014-03-02 21:57:36 +08:00
winlin
880f4f5dc2 final the modularity, rename the app module. 2014-03-02 21:49:09 +08:00
winlin
c1086f8a9d srs-librtmp: finish the simple publish and play sample. 2014-03-02 18:33:32 +08:00
winlin
efa09102cf srs-librtmp: implements the read packet. 2014-03-02 17:47:53 +08:00
winlin
c338eb3666 srs-librtmp: implements the publish and play. 2014-03-02 14:51:19 +08:00
winlin
fce26d6690 srs-librtmp: implements play stream. 2014-03-02 14:07:48 +08:00
winlin
6b213b73eb refine code, rename SrsRtmp to SrsRtmpServer. 2014-03-02 14:07:10 +08:00
winlin
8aedc51a2f refine code, rename SrsRtmp to SrsRtmpServer. 2014-03-02 13:54:40 +08:00
winlin
4f91cae377 srs-librtmp: add complex handshake. 2014-03-02 13:07:32 +08:00
winlin
76f37baafe srs-librtmp: implements the simple socket stream. 2014-03-02 13:06:21 +08:00
winlin
86267f854c srs-librtmp: implements handshake. 2014-03-02 12:35:15 +08:00
winlin
f24f27deb9 srs-librtmp: add make ssl/nossl support for sample 2014-03-02 11:31:31 +08:00
winlin
b7a62ba131 use goto to free resource 2014-03-02 09:48:30 +08:00
winlin
feaf0c5e89 librtmp: create socket 2014-03-02 09:28:44 +08:00
winlin
f8335e2c1f extract simple socket to lib 2014-03-02 09:22:09 +08:00
winlin
5e4b7d3ae9 add colorful display for make. 2014-03-02 09:02:53 +08:00
winlin
e14d3bb5df add colorful display for make. 2014-03-02 09:00:49 +08:00
winlin
40a5edb37f update readme. 2014-03-02 00:15:09 +08:00
winlin
db22af07a0 change to 0.9.9 2014-03-02 00:06:24 +08:00
winlin
fc9e3fd890 srs-librtmp define interfaces 2014-03-02 00:05:59 +08:00
winlin
44375b9e6b add srs publish/play demo use srs-librtmp 2014-03-01 23:31:52 +08:00
winlin
713b05541b add librtmp demo srs_publish 2014-03-01 23:24:53 +08:00
winlin
aa5d28ed85 add library 2014-03-01 19:15:36 +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
b407021d45 move config to app, for its application level features 2014-03-01 15:59:55 +08:00
winlin
517d346a52 change macro for all rtmp protocol files. 2014-03-01 14:09:22 +08:00
winlin
4c498b67da rename pro to rtmp protocol. 2014-03-01 14:05:58 +08:00
winlin
8d5806154b add todo, to rename to the right name SrsRtmpServer 2014-03-01 14:03:41 +08:00
winlin
2074b50d87 move handshake and rtmp to protocol module 2014-03-01 14:03:02 +08:00
winlin
0296c8eff4 change to 0.9.6 2014-03-01 13:39:52 +08:00
winlin
4e3f7843fe rename protocol dir to pro. move rtmp stack to protocol module 2014-03-01 13:39:27 +08:00
winlin
4a8bc3b277 change version to 0.9.5 2014-03-01 12:46:05 +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
a73dec4c41 refine code, rename ISrsReader to ISrsBufferReader 2014-03-01 11:27:06 +08:00
winlin
85cd1e1a41 extract protocol module, move amf0 to protocol module 2014-03-01 11:24:40 +08:00
winlin
7e14e7fa57 move pithy print to kernel 2014-03-01 11:11:02 +08:00
winlin
fddd60b962 change to 0.9.4, extract kernel module 2014-03-01 11:06:01 +08:00
winlin
c0dbee0854 move buffer to kernel. extract ISrsReader for buffer 2014-03-01 11:04:03 +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
5e14aa9c13 fix the macro bug 2014-03-01 10:53:28 +08:00
winlin
b0d20f57e1 move reload to kernel module 2014-03-01 10:51:45 +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
bcbea86202 extract auto_free to core module 2014-03-01 10:19:11 +08:00
winlin
4e91a3d5aa extract core and app module. 2014-03-01 10:14:25 +08:00
winlin
62fbe9e760 refine modules, extract core module 2014-03-01 10:05:14 +08:00
winlin
c2ccb83912 rename core to app 2014-03-01 09:56:48 +08:00
winlin
6616dfecfc refine configure. 2014-03-01 09:52:41 +08:00
winlin
91d57ae7f9 refine build script, add comments for app.sh. change version to 0.9.3 2014-03-01 09:35:41 +08:00
winlin
ac3be10435 patch st and srs for arm build, allow user to specifies the gcc/g++ 2014-03-01 00:17:41 +08:00
winlin
7fa031e7fb fix bug of openssl, use objs/openssl/include 2014-02-28 22:50:18 +08:00
winlin
a6f4815994 use local openssl and link libssl.a 2014-02-28 22:42:25 +08:00
winlin
bcb719bf18 create log dir 2014-02-28 21:07:46 +08:00
winlin
985034860c add comments for depends 2014-02-28 20:52:26 +08:00
winlin
7e0cf2b9fc add comments for configure 2014-02-28 15:42:35 +08:00
winlin
979ee7d39c update config, remove the script to create logs dir. 2014-02-28 15:10:28 +08:00
winlin
72d477f466 support use other g++ when configure. 2014-02-28 14:38:27 +08:00
winlin
cd7e6cc321 refine the configure, add comments 2014-02-28 13:17:31 +08:00
winlin
b730fda176 add rtsp protocol 2014-02-28 09:26:17 +08:00
winlin
4aeed8df1d fix bug of SrsFMLEStartPacket command name, set_recv_timeout(SRS_PAUSED_RECV_TIMEOUT_US) 2014-02-24 09:12:57 +08:00
winlin
797d548766 fix bug of comment, change version to 0.9.2 2014-02-19 15:31:29 +08:00
winlin
980b53dfbe change version to 0.9.1 2014-02-19 15:15:32 +08:00
winlin
745797365e change version to 0.9.1 2014-02-19 15:14:46 +08:00
winlin
39f15ba3da refine the comments, fix bug of parse message 2014-02-19 14:54:04 +08:00
winlin
73b298cab5 fix bug of connect app response data 2014-02-19 09:38:49 +08:00
winlin
11c5b2cf14 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:23:23 +08:00
winlin
7a91826732 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:22:52 +08:00
winlin
8697adacd9 fix compile warning on 64bit centos 2014-02-11 13:54:05 +08:00
liuxc0116
490033f601 forget delete memset 
at last modify,forget delete memset(payload, 0, size);
 2014-01-27 11:34:50 +08:00
liuxc0116
81e085dd1b memory will leaks 
the payload pointor assigned two memory,will lead to memory leaks
 2014-01-23 18:05:55 +08:00
winlin
527abe2157 update readme 2014-01-19 11:37:55 +08:00
winlin
1d3621dc23 fix warning on 32bits centos6. 2014-01-19 10:49:40 +08:00
winlin
5a9a15f796 Update srs.conf 2014-01-12 15:58:15 +08:00
winlin
574536d9ed merge wenjie. fix jw/flower player pause bug, which send closeStream actually. 2014-01-11 19:55:55 +08:00
winlin
29a97152fa fix bug of compile ts_info on old gcc, add LL to large number. 2014-01-05 16:54:50 +08:00
winlin
b54aefe897 update script 2014-01-05 16:48:10 +08:00
winlin
47dfdd3ae2 update readme 2014-01-05 15:58:17 +08:00
winlin
63388e8ac3 merge from wenjie, fix the flower player play bug, play(reset=amf0-number) 2014-01-02 19:09:25 +08:00
wenjiegit
a91ffb1e11 update master 2014-01-02 18:23:27 +08:00
wenjiegit
6d2e1c95da update master 2014-01-02 18:21:29 +08:00
wenjiegit
8d808d8868 update master 2014-01-02 18:19:36 +08:00
wenjiegit
54bd613cf5 update master 2014-01-02 18:17:39 +08:00
wenjiegit
d05f69b247 update master 2014-01-02 18:04:35 +08:00
wenjiegit
f387b2b569 update master 2014-01-02 18:03:49 +08:00