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

1656 commits

Author SHA1 Message Date
winlin
36d12dd8ea for bug #194, change server main cycle to 1s. 2014-11-11 14:41:48 +08:00
winlin
8cc9a11b81 for bug #194, set the server main cycle to 1s 2014-11-11 14:38:54 +08:00
winlin
2adf2550dc refine the depends to make st script 2014-11-11 13:42:06 +08:00
winlin
46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 2014-11-11 13:40:09 +08:00
winlin
8ab6b57612 research st, the timeout and coroutine scheduler. 2014-11-11 12:58:25 +08:00
winlin
be46e428ad research st, for bug #193, remove the code with bug, exit when fork. 2014-11-11 11:25:52 +08:00
winlin
f4dfee0e9f research st, add comments for bug #193. 2014-11-11 11:24:19 +08:00
winlin
cd09fcaf55 research st, remove all events except epoll. 2014-11-11 11:15:58 +08:00
winlin
91f6dbe479 research st, add test for setjmp and longjmp. 2014-11-10 16:50:36 +08:00
winlin
4d4e840209 research st, add jmp_flow. 2014-11-10 15:22:30 +08:00
winlin
683b01a6c9 research st, add comments about the thread cycle 2014-11-10 14:54:52 +08:00
winlin
8327a57b7e never use stack variable for setjmp 2014-11-10 14:02:49 +08:00
winlin
2c01f7e943 research st, expand MD_INIT_CONTEXT macro, the thread start. 2014-11-10 13:52:17 +08:00
winlin
8da8c49f39 research st, add comments 2014-11-10 11:49:14 +08:00
winlin
2b70212649 research st, add stack struct comments. 2014-11-10 11:47:24 +08:00
winlin
6bde1e54dc research st, add stack alloc commnets. 2014-11-10 11:10:27 +08:00
winlin
e49a868308 research st, rename variable thread to trd, for thread is a keyword. 2014-11-10 11:06:06 +08:00
winlin
ac1a4ec0a3 research st, always alloc on stack. 2014-11-10 10:21:05 +08:00
winlin
ae8b3e3c00 research st, remove the support of MD_STACK_GROWS_UP 2014-11-09 12:05:59 +08:00
winlin
340464ed56 research st, remove __ia64__ cpu support 2014-11-09 12:04:56 +08:00
winlin
a27c3dca2d research st, add gdb info for setjmp. 2014-11-09 11:56:14 +08:00
winlin
4b24ee9db3 research st, only for linux and arm/mips/i386/x86_64 cpus. 2014-11-09 11:46:32 +08:00
winlin
cc811dfc90 refine script for generate script 2014-11-08 20:14:20 +08:00
winlin
6968aef66a update readme for srs-librtmp 2014-11-08 20:06:31 +08:00
winlin
a827766cd6 for #191, support exported to project or file. 2014-11-08 18:43:58 +08:00
winlin
606fc13a03 rename the confict macro to srs_lib_trace 2014-11-08 18:37:15 +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
e62c3a4e0e for bug #66, clear the sps and pps. 2014-11-08 16:59:42 +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
5554922820 refine librtmp tools, use srs_trace macro instead printf. 2014-11-08 14:06:40 +08:00
winlin
cf5c24af4a refine librtmp, unify all tools format and usage. 2014-11-08 14:00:59 +08:00
winlin
6de83db76e refine srs-librtmp log macro 2014-11-08 13:41:47 +08:00
winlin
f92303c764 refine all research tools, remove the public header, add log to srs_librtmp.h 2014-11-08 13:35:38 +08:00
winlin
7ba07c6f49 refine librtmp, add example to api. 2014-11-08 13:16:56 +08:00
winlin
106bef802f fix #66, srs-librtmp support write h264 raw packet. 2.0.9. 2014-11-08 12:36:00 +08:00
winlin
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
0075779d38 for bug #66, refine the api to send h264 frames. 2014-11-08 10:28:59 +08:00
winlin
cd5c58ba5f for bug #66, refine the api and demo. 2014-11-08 09:21:09 +08:00
winlin
1074c8d9b2 for bug #66, use new api to directly sendout h264 raw data. 2014-11-08 09:12:52 +08:00
winlin
496f4246f4 complete the h264 to rtmp, but the sps and pps should send in a rtmp packet. for bug #66 2014-11-07 23:55:00 +08:00
winlin
6407baffd5 for bug #66, output the h264 frame type. 2014-11-07 23:19:31 +08:00
winlin
72ad6894ca move the annexb decode utility to protocol. 2014-11-07 23:07:31 +08:00
winlin
bd25626f0e refine code for bug #66 2014-11-07 22:36:25 +08:00
winlin
955859ce82 refine librtmp, add pefix to srs_amf0_number and srs_amf0_bool 2014-11-07 22:15:56 +08:00
winlin
1c237a821a add api convert h264 to rtmp packet, for bug #66 2014-11-07 22:06:30 +08:00
winlin
e4af098d06 refine code for bug #66 2014-11-07 21:16:41 +08:00
winlin
b964a6c534 update for bug #66, add the srs-librtmp sample for publish h.264 raw stream. 2014-11-07 21:06:44 +08:00
winlin
1db69b153e update the research of arm 2014-11-07 16:47:49 +08:00
winlin
0f41e0d26f research st: only support linux 2014-11-06 15:45:31 +08:00
winlin
d67454ecc2 research st: only support linux 2014-11-06 15:43:28 +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
8521762cb3 research st: refine sync. 2014-11-06 14:00:27 +08:00
winlin
3377df0bea research st: refine skt. 2014-11-06 13:55:06 +08:00
winlin
22710db911 research st: refine sched. 2014-11-06 13:52:15 +08:00
winlin
f5f8e8946f research st: refine event, io and key. 2014-11-06 13:40:24 +08:00
winlin
c38a545780 reserach st: refine key.c 2014-11-06 13:17:54 +08:00
winlin
fd0c85b324 research st: refine io. 2014-11-06 13:11:34 +08:00
winlin
f8f18fffa7 research st: update test for st. 2014-11-06 12:50:27 +08:00
winlin
0f293802c8 research st: refine the md.h 2014-11-05 17:42:57 +08:00
winlin
856ba07bd3 research st: update public and common. 2014-11-05 17:22:36 +08:00
winlin
315707d726 research st: refine public 2014-11-05 17:16:15 +08:00
winlin
bba2d3dd98 research st: replace the TAB with 4spaces 2014-11-05 17:12:56 +08:00
winlin
55bd1dd95e research st: replace the TAB with 4spaces 2014-11-05 17:10:54 +08:00
winlin
0faa38dc0c research st: remove the osguess.sh 2014-11-05 17:06:18 +08:00
winlin
2dc6b7d1ea add io for st research 2014-11-05 17:01:15 +08:00
winlin
9d7e6b9bb2 update mirror utils 2014-10-27 12:56:04 +08:00
winlin
60ab365660 update mirror, use utils functions. 2014-10-27 12:03:56 +08:00
winlin
2175102ea2 remove the sync script for mirror, which maybe updated. 2014-10-27 11:41:28 +08:00
winlin
e104a18763 update sync script on master 2014-10-27 11:40:59 +08:00
winlin
b8db8b0fa4 add oschina mirror 2014-10-27 11:32:34 +08:00
winlin
511c814ffb refs #182: rename to sync test. 2014-10-26 16:38:00 +08:00
winlin
69fdec411f refs #182: rename to sync test. 2014-10-26 16:35:12 +08:00
winlin
9aba47cbe3 refs #182: research st, add multiple threadds. 2014-10-26 14:04:31 +08:00
winlin
79ab9f05f3 refs #182: update the st, use cond and mutex. 2014-10-26 13:55:37 +08:00
winlin
388305f44c update st research. 2014-10-26 13:43:11 +08:00
winlin
fb906f0afc revert the player for bug #185. 2014-10-25 17:15:33 +08:00
winlin
6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 2014-10-25 17:12:56 +08:00
winlin
05cce97140 for bug #186, read the args when discovery it. 2.0.6 2014-10-24 13:23:52 +08:00
winlin
3c31e6db05 for bug #186, read the args when discovery it. 1.0.4 2014-10-24 13:22:35 +08:00
winlin
e3e18b9915 for bug #186, read the args when discovery it. 1.0.4 2014-10-24 13:17:11 +08:00
winlin
7d70864b33 for bug #186, read the args when discovery it. 2.0.6 2014-10-24 13:16: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
b65dfd718a add comments for the RTMP packet fields, NULL or never NULL. 2.0.5 2014-10-24 10:58:06 +08:00
winlin
1bfc238fec hotfix for bug #186, drop connect args when not object. 2.0.4. 2014-10-24 10:35:40 +08:00
winlin
aa98ca60b9 fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3. 2014-10-24 10:34:00 +08:00
winlin
77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:01:00 +08:00
winlin
a169262099 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:00:23 +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
57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 2014-10-19 19:42:27 +08:00
winlin
bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 2014-10-19 11:33:56 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
d9b12b151c refine the makefile. 2014-10-18 13:16:17 +08:00
winlin
b65df251c3 chmod +x *.sh 2014-10-12 21:50:28 +08:00
winlin
2f388d614f rename st-1.9 to st 2014-10-12 21:31:50 +08:00
winlin
7692373e02 remove the unused files. add upp project file 2014-10-12 21:29:48 +08:00
winlin
7f4c113e57 add st-1.9 to research 2014-10-12 20:57:59 +08:00
winlin
ffabcec191 update csdn mirror, add 1.0release 2014-10-10 09:51:25 +08:00
winlin
d085a5cabc update csdn mirror, add 1.0release 2014-10-10 09:50:18 +08:00
winlin
5f29935623 update master to 2.0, because the 1.0release branch is created. 2.0.0 2014-10-09 17:40:43 +08:00
winlin
2be014e4f5 remove the dead code for bug #180 2014-10-09 14:24:52 +08:00
winlin
fca500fae6 update package for pi, check the lsb_release. 2014-10-09 14:07:20 +08:00
winlin
024611cc08 update package for pi, check the lsb_release. 2014-10-09 14:06:54 +08:00
winlin
dddec3484e update to 1.0beta, 1.0.0 2014-10-09 12:55:25 +08:00
winlin
effcd89f66 refine script. 2014-10-09 12:09:01 +08:00
winlin
6468b9e92b refine script, to disable iptables and selinux. 0.9.225 2014-10-09 12:07:56 +08:00
winlin
5e8f8ad3b9 add add hosts and wiki. 2014-10-09 11:53:59 +08:00
winlin
3fcbb60b1c add add hosts and wiki. 2014-10-09 11:53:21 +08:00
winlin
bea53dca97 refine the run script for centos7 2014-10-09 11:32:12 +08:00
winlin
a9cceee943 refine the run script for centos7 2014-10-09 11:27:49 +08:00
winlin
2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 2014-10-09 10:41:24 +08:00
winlin
9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 2014-10-08 15:15:57 +08:00
winlin
13b092704d refine code for bug #151, refine the source functions, add comments. 2014-10-08 14:28:09 +08:00
winlin
3f9a53de0e refine cmake list, only for clion. 2014-10-08 13:53:04 +08:00
winlin
b830b995e6 fix bug #162, requires epoll. 0.9.222 2014-10-08 13:27:48 +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
2048fbf731 refine code, add bug #160 for big chunk size. 2014-09-30 15:07:24 +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
bc6616bd1f refine code according to inspect of clion. 0.9.219 2014-09-28 11:08:30 +08:00
winlin
e0b1e044de add stub code for bug #180, check complex handshake. 2014-09-27 14:18:02 +08:00
winlin
63c9ad272c fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 0.9.217 2014-09-27 13:15:00 +08:00
winlin
624ab86fa2 fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 2014-09-27 13:14:46 +08:00
winlin
bcd1b3d2d4 refine code, remove unused code of dvr. 2014-09-27 13:02:16 +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
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
winlin
87aac3ddd4 refine log, add features for macro. 0.9.212 2014-09-23 16:53:12 +08:00
winlin
1d454cd5fb add bug for http-mp4. 2014-09-16 15:56:46 +08:00
winlin
9dd0939327 fix the bug for gmc. 0.9.211 2014-09-10 14:59:20 +08:00
winlin
61728118ab donot destroy the source and connections of gmc. 2014-09-10 14:58:19 +08:00
winlin
79938f3214 add comments for gmc. 2014-09-10 10:19:48 +08:00
winlin
922bc3e3a8 refine configure, use console for gmc/gcp/gmp/gprof 2014-09-09 16:56:05 +08:00
zhengfl
c2ac11201b amendment srs_verbose info in the get_peer_ip 2014-08-28 04:18:06 +08:00
winlin
901c9590e4 refine log, log important to file. 1.0.210 2014-08-29 15:07:04 +08:00
winlin
728b749384 fix #167, add openssl includes to utest. 0.9.209. 2014-08-28 13:32:13 +08:00
winlin
53011808fb add sysctl vm.max_map_count for mmap. 2014-08-27 13:47:56 +08:00
winlin
d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 2014-08-27 13:31:39 +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
42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 2014-08-24 22:34:38 +08:00
winlin
9b6187c3d5 fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207. 2014-08-22 13:10:11 +08:00
winlin
cb311d998e fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206. 2014-08-22 12:47:50 +08:00
winlin
01ae8c4787 refine the handshake random data, fill with value in [0x0f, 0xf0], 0.9.205 2014-08-21 09:48:19 +08:00
winlin
cc8dc0fee0 remove the not-supported features, add bug #163, #164. 2014-08-20 09:18:07 +08:00
winlin
4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 2014-08-19 16:32:52 +08:00
winlin
f549f88ed8 for bug #162, add conf and connections limit. 0.9.203 2014-08-19 15:53:13 +08:00
winlin
e656a65b6c for bug #162, add conf and connections limit. 2014-08-19 15:52:59 +08:00
winlin
ab965655aa refine forwarder, add tracable debug info. 0.9.202 2014-08-19 11:54:33 +08:00
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
c24e68dd70 refine the stat, use one ok. 1.0.200 2014-08-18 14:39:42 +08:00
winlin
fc347a1c44 update configure, remove the bwtc, moved to research now. 2014-08-18 14:15:39 +08:00
winlin
f03fde37ea refine configre, add --with-stat to configure summary 2014-08-17 22:19:52 +08:00
winlin
6103b1c3ce refine options, add --with-stat. 0.9.199 2014-08-17 22:11:43 +08:00
winlin
3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 2014-08-17 20:38:51 +08:00
winlin
554a9763db fix linux config openssl bug. 2014-08-17 19:43:53 +08:00
winlin
5e4dad210a build openssl for osx, for bug #155. 2014-08-17 19:12:12 +08:00
winlin
cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 2014-08-16 19:59:14 +08:00
winlin
08bc34e0df refine wiki, cluster to forward. 2014-08-14 16:33:26 +08:00
winlin
b15ee26a48 fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195 2014-08-13 18:09:35 +08:00
winlin
67ab0fb5e0 add comments for openssl key generator assert. 2014-08-13 10:58:53 +08:00
winlin
aefcaa9683 refine code, add install root message 2014-08-12 11:06:00 +08:00
winlin
0cd2b13e2e add rtmfp tsvarea 2014-08-09 07:35:22 +08:00
winlin
b317abbaee refine openssl, add compute_key, for bug #148 2014-08-08 13:34:50 +08:00
winlin
d4c2aa1e8e add __openssl_compute_key to calc the shared key 2014-08-08 11:34:17 +08:00
winlin
7adbe7f456 fix utest build failed, sync with src changed. 2014-08-08 10:47:55 +08:00
winlin
ad2c996bd8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:57:36 +08:00
winlin
12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:54:33 +08:00
winlin
156a9ed2a3 change to 0.9.192. 2014-08-07 14:43:03 +08:00
winlin
1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 2014-08-06 15:45:40 +08:00
winlin
a9d28122f4 refine code, refine the handshake, refine the log of source_id 2014-08-06 13:57:55 +08:00
winlin
5b28355a0b fix #147, support identify the srs edge. 0.9.190. 2014-08-06 09:57:30 +08:00
winlin
3532b61e3d open all utest macro 2014-08-05 09:16:45 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
33bc8755ab refine code, add comments for ossrs.net monitor. 2014-08-04 10:50:28 +08:00
winlin
67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 2014-08-03 21:50:48 +08:00
winlin
ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 2014-08-03 21:22:40 +08:00
winlin
6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 2014-08-03 20:27:57 +08:00
winlin
5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 2014-08-03 13:06:37 +08:00
winlin
d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 2014-08-03 10:42:01 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 2014-08-02 19:24:49 +08:00
winlin
721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 2014-08-02 09:54:21 +08:00
winlin
d5f03200a7 revert tcp stat. need more refine. 0.9.182 2014-08-01 23:08:52 +08:00
winlin
f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181 2014-08-01 22:52:40 +08:00
winlin
15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180 2014-08-01 22:43:12 +08:00
winlin
6539ce69f4 fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 2014-07-31 10:39:39 +08:00
winlin
f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 2014-07-31 10:37:34 +08:00
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
792a6f944f refine utility of cpu, add comment for cpu percent 2014-07-28 13:51:54 +08:00
winlin
c16d3585a5 refine utility of cpu, add comment for cpu percent 2014-07-28 13:41:27 +08:00
winlin
e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 2014-07-27 21:56:44 +08:00
winlin
b198d17ab9 Merge pull request #135 from T-bagwell/master 
Support porting srs on MacOS OSX system Platform
 2014-07-27 21:07:37 +08:00
Steven Liu
b50ecd6dbe Support porting srs on MacOS OSX system Platform 
Add the OSX platform cross complie options into srs
 2014-07-27 19:32:12 +08:00