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
4610 commits 13 branches 107 tags 375 MiB
Commit graph

245 commits

Author SHA1 Message Date
winlin
d3bb8b6a86 for #742, refine the io interfaces. 2017-01-30 19:59:59 +08:00
winlin
bb5bd0ee1c include for uintxx_t 2017-01-30 17:38:30 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
011ac4f6a9 for #738, add mp4 demuxer to librtmp 2017-01-30 17:19:07 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +08:00
winlin
8acb99f96c refine comments for librtmp 2017-01-18 16:59:19 +08:00
winlin
0e6f7e66f0 add srs_rtmp_free_packet for srs-librtmp 2017-01-18 16:31:41 +08:00
winlin
7acc3aca16 refine hijack io for srslibrtmp 2017-01-18 16:23:59 +08:00
winlin
e8c48ac8f8 merge srs2, use specific error code for dns resolve 2017-01-18 16:05:33 +08:00
winlin
60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 2017-01-18 16:03:57 +08:00
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
77bca7cc05 Merge branch '2.0release' into develop 2016-09-13 18:08:19 +08:00
winlin
53d2eb5e02 fix librtmp get bytes bug. 2016-09-13 18:08:12 +08:00
winlin
8a4e241eec merge from srs2 2016-09-09 14:29:33 +08:00
winlin
49b880d4ce refine comments 2016-09-09 14:18:50 +08:00
winlin
eb915413ad Merge branch '2.0release' into develop 2016-09-09 14:14:22 +08:00
winlin
0015b303a6 librtmp: refine comment for NALU process. 2016-09-09 14:14:12 +08:00
winlin
17df61724d Merge branch '2.0release' into develop 2016-09-08 19:56:17 +08:00
winlin
7aaa74b9e0 TODO: FIXME: for librtmp, must group NALUs to frame. 2016-09-08 19:56:06 +08:00
winlin
5d5fa7204d Merge branch '2.0release' into develop 2016-08-18 12:22:30 +08:00
winlin
d919668b61 don't ignore aud 2016-08-18 12:22:04 +08:00
winlin
bf22acd689 Merge branch '2.0release' into develop 2016-08-18 11:29:22 +08:00
winlin
a4bb03b9d6 ignore other 264 frame except sps,pps,idr,nonidr 2016-08-18 11:27:11 +08:00
winlin
31a1b7bed2 Merge branch '2.0release' into develop 2016-08-10 22:30:05 +08:00
winlin
304ff02aef default to 30s timeout for librtmp 2016-08-10 22:29:56 +08:00
winlin
d68a459198 Merge branch '2.0release' into develop 2016-08-10 22:13:30 +08:00
winlin
02fb0779be fix the microsec calc bug for librtmp 2016-08-10 22:13:24 +08:00
winlin
14760003ba merge from 2.0 2016-08-10 22:05:21 +08:00
winlin
e00928557e fix the timeout for librtmp 2016-08-10 22:04:01 +08:00
winlin
f8358da316 refine ingester log. 2016-01-13 16:20:05 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
d9f991ed2f use system utility for string finds 2015-10-23 14:42:02 +08:00
winlin
d8f18aee37 use the right int type for port. 2015-09-24 18:33:07 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07: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
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
a242aa35dc add pid to srs rtmp dump 2015-08-24 16:00:11 +08:00
winlin
575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 2015-08-20 14:20:49 +08:00
winlin
ec87dd9cd6 refine code for srs rtmp dump 2015-08-19 19:02:33 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
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