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

245 commits

Author SHA1 Message Date
winlin
ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 2015-08-18 14:08:54 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +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
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +08:00
winlin
61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 2015-04-04 15:53:36 +08:00
winlin
02addf61f7 fix #302, remove the thread unsafe code, no static. 2015-03-23 21:21:36 +08:00
winlin
f69fa7273b fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:04 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 2015-01-31 23:20:00 +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
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 2015-01-07 15:37:44 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
5661fc2676 refine dvr and rtmp dump, write the original data. 2015-01-07 15:01:58 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 2014-12-29 14:24:22 +08:00
winlin
92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 2014-12-25 09:52:18 +08:00
winlin
81e70e7bdb for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object. 2014-12-21 11:41:15 +08:00
winlin
f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 2014-12-05 23:03:52 +08:00
winlin
b28dc7364e refine the srs-librtmp, add hijack get the object. 2014-12-02 14:02:28 +08:00
winlin
a94dbecdc4 refine macro of srs-librtmp. 2.0.43 2014-12-02 13:41:41 +08:00
winlin
9387d09f5f refine the macros for windows of srs-librtmp 2014-12-02 13:38:30 +08:00
winlin
15ae4745f4 add macro to disable log. 2014-12-02 13:21:26 +08:00
winlin
07d55010fe remove the free bytes api of srs-librtmp. use system default is ok. 2014-12-02 13:03:25 +08:00
winlin
f6032ffe6b always use system log and context. allow hijack the human print macro. 2014-12-02 12:51:07 +08:00
winlin
3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 2014-12-02 12:19:17 +08:00
winlin
7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 2014-11-28 10:33:36 +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
eb4e7aad69 try to build srs-librtmp on vs2010, failed. 2014-11-27 18:20:13 +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
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
d3c770d252 refine librtmp, add audio video detail. 2014-11-21 17:09:52 +08:00
winlin
d80b580c2f refine librtmp, remove the _get_ for some attribute get. 2014-11-21 16:08:29 +08:00
winlin
2a9bec3d89 adjust the api, move audio and h264 after rtmp 2014-11-21 14:26:47 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
180106ce70 refine librtmp, move the utils and human to end section. 2014-11-21 14:11:53 +08:00
winlin
10bc5399ec refine librtmp api, add prefix utils for utilities. 2014-11-21 14:09:17 +08:00
winlin
b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 2014-11-21 14:03:30 +08:00
winlin
30e7c38a48 refine code, add human readable section 2014-11-21 13:56:09 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
d6072b16c0 support compile srs-librtmp on windows. 2.0.26 2014-11-19 16:16:04 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
b4269c8d67 refine name of srslibrtmp, raw_stream to h264_raw_stream 2014-11-15 16:31:42 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
ecfbcd68d8 refine srslibrtmp, rename flv_bool to srs_flv_bool 2014-11-15 16:07:33 +08:00
winlin
3292136f70 update research, flv ingester, support atc time flv. 2014-11-15 15:27:19 +08:00
winlin
bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 2014-11-15 14:29:25 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
62719c2b12 for bug #200, fix the writev for librtmp, add comments. 2014-11-13 14:38:23 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +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
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
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
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +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
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
073d900674 add consts to kernel 2014-07-20 13:04:48 +08:00
winlin
9860e390a3 refine code, for cubieboard to build ok. 2014-07-14 17:45:27 +08:00
winlin
5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 2014-07-13 20:25:36 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +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
9556790a5e finish utest of protocol stack. 0.9.156 2014-07-11 18:08:34 +08:00
winlin
6a4b177475 refine shared ptr message, rename initialize to create 2014-07-06 18:23:14 +08:00
winlin
5a41b1b538 finish kernel utest. to 0.9.149 2014-07-05 21:22:20 +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
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
1eee4d25cf refine the librtmp, open writer then reader. 2014-06-29 17:12:10 +08:00
winlin
1a7735182f refine the file stream, to file reader and writer. 0.9.142 2014-06-29 17:05:26 +08:00
winlin
ee07210105 fix demo script, start nginx. fix warning of utest on ubuntu14 2014-06-29 10:03:29 +08:00
winlin
10953c9743 support token auth in connect args. 0.9.128 2014-06-21 11:41:00 +08:00
winlin
55b99c90c7 refine detect tool, support atc stream. 2014-06-11 14:16:44 +08:00
winlin
cccc483ab3 add bytes statistic for librtmp 2014-06-10 17:39:12 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
8817823462 add rtmp detecter 2014-06-10 11:34:35 +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
373f92551d refine librtmp, remove the ssl functoins, refine the type2string memory alloc to static 2014-06-07 13:44:46 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
22968c85df supprt inject flv 2014-05-28 19:01:47 +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
93c9c55fb9 remove the complex handshake of librtmp. refine makefile of librtmp tools 2014-05-26 15:54:39 +08:00
winlin
7f48590239 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:29:42 +08:00
winlin
bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 2014-05-22 15:08:25 +08:00
winlin
69eb935505 fix bug of flv parser, librtmp amf0 library 2014-05-22 11:39:10 +08:00
winlin
f37faf7236 update librtmp, add amf0 parse functions 2014-05-21 18:30:58 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
2c059d3a80 fix bug #72, also need stream_id for send_and_free_message. 0.9.101 2014-05-17 17:53:27 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 2014-05-13 14:24:39 +08:00
winlin
9006194cd7 refine framework to calc the kbps 2014-05-12 17:27:50 +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
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
644dfa1a6d fix bug of librtmp 2014-03-26 09:03:57 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +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
40a5edb37f update readme. 2014-03-02 00:15:09 +08:00
winlin
fc9e3fd890 srs-librtmp define interfaces 2014-03-02 00:05:59 +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