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

4023 commits

Author SHA1 Message Date
winlin
33ba6cdee2 change utest when demuxer use io interface. 2017-01-30 20:58:32 +08:00
winlin
01d401c270 for #738, refine flv codec to use io interface. 2017-01-30 20:12:36 +08:00
winlin
d3bb8b6a86 for #742, refine the io interfaces. 2017-01-30 19:59:59 +08:00
winlin
eaa222f034 for #742, refine the file reader and writer interface. 2017-01-30 19:35:04 +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
3f3e98e9db for #738, major boxes from isom 2017-01-29 17:16:20 +08:00
winlin
8588a10775 Merge branch '2.0release' into develop 2017-01-29 17:15:43 +08:00
winlin
a37a14377a fix the example dvr config file error 2017-01-29 17:15:17 +08:00
winlin
b09183010b for #738, add isom boxes. 2017-01-29 15:45:27 +08:00
winlin
ca02aaa7b3 for #738, add doc, moov box. 2017-01-28 19:32:43 +08:00
winlin
6b6ac9a054 for #738, add box and fullbox. 2017-01-27 20:54:05 +08:00
winlin
91a3989372 for #738, add mp4 demuxer files to kernel. 2017-01-27 11:27:02 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +08:00
winlin
e8353cba3b for #299, add mp4 and dash doc. 2017-01-26 16:53:30 +08:00
winlin
38a683fe14 disable glibc memory check 2017-01-23 18:06:30 +08:00
winlin
7057bb1ef5 for #742, always enable http utilities. 2017-01-23 17:55:52 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
79def81792 for #742, refine the rtmp conn, use info as data cluster. 2017-01-23 17:12:04 +08:00
winlin
39aee2b318 for #742, fix publish recv thread bug. 2017-01-23 16:44:42 +08:00
winlin
954bb186c1 identify the flash and fmle for recv thread. 2017-01-23 16:43:43 +08:00
winlin
4583a63789 for #742, refine code for recv thread. 2017-01-23 16:38:23 +08:00
winlin
a07986f4ee for #742, refine code 2017-01-22 17:07:55 +08:00
winlin
5c959fc781 merge from srs2, for kbps free io 2017-01-22 13:16:05 +08:00
winlin
6706bda42c for #752, release the io then free it for kbps. 2.0.232 2017-01-22 13:12:56 +08:00
winlin
a3ea83f504 directly free the transport, not need to close for maybe NULL 2017-01-20 12:11:52 +08:00
winlin
99c13fb1c1 convert ms to us for st 2017-01-19 15:51:55 +08:00
winlin
7bfb648bd8 refine the meta cache name 2017-01-19 15:51:34 +08:00
winlin
4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 2017-01-19 12:38:55 +08:00
winlin
6209945a07 Merge branch '2.0release' into develop 2017-01-18 19:34:00 +08:00
winlin
80dfe601b1 add link for #750 2017-01-18 19:33:54 +08:00
winlin
8acb99f96c refine comments for librtmp 2017-01-18 16:59:19 +08:00
winlin
c5fcc15989 update the date info 2017-01-18 16:41:47 +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
2656c97ccd merge srs2. release r2.0b4 2017-01-18 12:18:59 +08:00
winlin
727652c56a release r2.0b4, 2.0.230 2017-01-18 12:13:49 +08:00
winlin
310032d8d8 merge srs2, timestamp overflow for ATC. 2017-01-18 11:48:31 +08:00
winlin
d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 2017-01-18 11:47:43 +08:00
winlin
9c846b3325 Merge pull request #748 from censhanhe/2.0release-bugfix
2.0release bugfix publish_normal_timeout 配置读取错误
2017-01-18 11:14:11 +08:00
winlin
2ef1ef06e9 increase the nb_samples because some large video may overflow. 2017-01-18 11:11:36 +08:00
cenxinwei
7fe885a6db Merge commit '762d7a8884af46d642c09dc682f5a8fa8f65975b' into 2.0release-bugfix 2017-01-18 10:24:07 +08:00
cenxinwei
762d7a8884 fix publish_normal_timeout 配置读取错误 2017-01-17 15:11:40 +08:00
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
dca9749f37 for #742, refine the object live cycle. 3.0.15 2017-01-17 10:44:13 +08:00
winlin
f4c0af8bfc refine code remove dup api for #742 2017-01-16 16:20:34 +08:00
winlin
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00