Commit Graph

2485 Commits (b21f92f97a99dc4ca9bcc24b6eb142547f799178)

Author SHA1 Message Date
winlin 7fd221ef63 Always enable DVR 8 years ago
winlin 8e5d4dc73d always enable http and hls 8 years ago
winlin 477414106a add dash files. 8 years ago
winlin 5fec59ace2 merge from srs2, fix #503 8 years ago
winlin 99bffea328 fix #503, disable utilities when reload a source. 2.0.233 8 years ago
winlin afbc3443f3 fix #738, support DVR general mp4. 3.0.17 8 years ago
winlin 3209ad29e0 for #738, refine code for DVR mp4. 8 years ago
winlin 0a054cd6bd for #738, remove the dvr plan append for it's no use 8 years ago
winlin 8c01f52372 for #738, refine the dvr segmenter. 8 years ago
winlin 31191f2650 for #738, support srs ingest mp4 8 years ago
winlin 4fe79a1025 for #738, fix the audio sample offset error. 8 years ago
winlin 733252dc21 for #738, remove test code 8 years ago
winlin 733ba73d54 for #738, write mp4 samples. 8 years ago
winlin e24674e9cf for #738, refine build mp4 samples from moov. 8 years ago
winlin 3025aebf42 for #738, mp4 build samples from moov. 8 years ago
winlin 253ac40312 for #738, parse avcc/sps/pps/asc from mp4. 8 years ago
winlin 9d21a8bb33 for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov). 8 years ago
winlin bbee16e4db for #738, parse moov, get the h.264/avcC and aac/asc 8 years ago
winlin e8eb050bf2 update readme 8 years ago
winlin ac7ee10b60 fix #751,#756, refine code 8 years ago
Chengdong Zhang 80540e4dc1 change TAB space
change TAB space for line 794
8 years ago
eagle-zhang 7b02e3543f Clients Api support start and count
Clients Api support start and count
line 794~810 && line 830
8 years ago
winlin 7ee1df33d1 for #738, parse mp4 udta(user data) box. 8 years ago
winlin ffe0a4426d for #738, parse mp4 moov boxes. 8 years ago
winlin 96f2e18d3a for #738, demux the aac mp4a and esds 8 years ago
winlin 128a1fd3db for #738, decode mp4 video track boxes. 8 years ago
winlin 5a84b6ca94 for #738, complete all mp4 boxes codec. 8 years ago
winlin 2ad265bd5a for #738, implements boxes codec 8 years ago
winlin 858951da49 for #738, add srs ingest mp4 8 years ago
winlin 34a8eb6113 for #738, add srs ingest mp4 tool 8 years ago
winlin 33ba6cdee2 change utest when demuxer use io interface. 8 years ago
winlin 01d401c270 for #738, refine flv codec to use io interface. 8 years ago
winlin d3bb8b6a86 for #742, refine the io interfaces. 8 years ago
winlin eaa222f034 for #742, refine the file reader and writer interface. 8 years ago
winlin bb5bd0ee1c include for uintxx_t 8 years ago
winlin b16ab038ce for #742, refine the u_intxx_t to uintxx_t 8 years ago
winlin 011ac4f6a9 for #738, add mp4 demuxer to librtmp 8 years ago
winlin 3f3e98e9db for #738, major boxes from isom 8 years ago
winlin b09183010b for #738, add isom boxes. 8 years ago
winlin ca02aaa7b3 for #738, add doc, moov box. 8 years ago
winlin 6b6ac9a054 for #738, add box and fullbox. 8 years ago
winlin 91a3989372 for #738, add mp4 demuxer files to kernel. 8 years ago
winlin 136a7ef488 for #299, refine docs. 8 years ago
winlin 38a683fe14 disable glibc memory check 8 years ago
winlin 7057bb1ef5 for #742, always enable http utilities. 8 years ago
winlin a1fcf66f32 for #742, always enable http utilities. 8 years ago
winlin 79def81792 for #742, refine the rtmp conn, use info as data cluster. 8 years ago
winlin 39aee2b318 for #742, fix publish recv thread bug. 8 years ago
winlin 954bb186c1 identify the flash and fmle for recv thread. 8 years ago
winlin 4583a63789 for #742, refine code for recv thread. 8 years ago
winlin a07986f4ee for #742, refine code 8 years ago
winlin 5c959fc781 merge from srs2, for kbps free io 8 years ago
winlin 6706bda42c for #752, release the io then free it for kbps. 2.0.232 8 years ago
winlin a3ea83f504 directly free the transport, not need to close for maybe NULL 8 years ago
winlin 99c13fb1c1 convert ms to us for st 8 years ago
winlin 7bfb648bd8 refine the meta cache name 8 years ago
winlin 4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 8 years ago
winlin 8acb99f96c refine comments for librtmp 8 years ago
winlin 0e6f7e66f0 add srs_rtmp_free_packet for srs-librtmp 8 years ago
winlin 7acc3aca16 refine hijack io for srslibrtmp 8 years ago
winlin e8c48ac8f8 merge srs2, use specific error code for dns resolve 8 years ago
winlin 60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 8 years ago
winlin 310032d8d8 merge srs2, timestamp overflow for ATC. 8 years ago
winlin d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 8 years ago
winlin 2ef1ef06e9 increase the nb_samples because some large video may overflow. 8 years ago
cenxinwei 762d7a8884 fix publish_normal_timeout 配置读取错误 8 years ago
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin dca9749f37 for #742, refine the object live cycle. 3.0.15 8 years ago
winlin f4c0af8bfc refine code remove dup api for #742 8 years ago
winlin 1ed5118246 refine the spaces, no TABS 8 years ago
winlin 750f4413c8 merge srs2 for #536 8 years ago
winlin 142a9733b2 refine encoder code for #536. 8 years ago
winlin ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 8 years ago
winlin e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 8 years ago
winlin f92db0f87e merge srs2 for kbps 8 years ago
winlin 6a8c232c5b fix #588, kbps interface error. 2.0.228 8 years ago
winlin c58dbe4d14 fix #588, kbps interface error. 2.0.228 8 years ago
winlin 7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 8 years ago
winlin 7bbb3bae42 merge srs2 8 years ago
winlin e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 8 years ago
Himer afa704bca5 Update srs_app_source.cpp
enabled 为true才进行转发实例创建
8 years ago
winlin df983cc9ec fix typo 8 years ago
winlin a1ae48f4ac Merge branch '2.0release' into develop 8 years ago
winlin 6fbda2ae3f for #635, refine hls open/close gop. 8 years ago
winlin 07871a442e fix typo 8 years ago
winlin ae1920e91a Merge branch '2.0release' into develop 8 years ago
winlin 4104f25069 for #635, support IDR and NonIDR(open-gop). 8 years ago
winlin 1dd877c0d6 merge srs2 8 years ago
winlin c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 8 years ago
winlin d49f195bbf fix #734, log format error. 8 years ago
winlin c46e925be5 add utest for avc uev 8 years ago
winlin 517812dbe2 remove test code for #730 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin bbbc40f9c2 Merge branch '2.0release' into develop 8 years ago
winlin aa2b7afb44 refine code, print protocol level info. 8 years ago
winlin e434c09dc0 for #730, merge srs2 8 years ago
winlin c67036d52e for #730, reset ack follow flash player rules. 2.0.225 8 years ago
winlin dc1f227aeb for #730, refine code to decode the acknowledge message 8 years ago
winlin 4709d0214c for #711, support prefile for transcode. 3.0.12 8 years ago
winlin f9a159cd21 patch ST for valgrind and ARM. 3.0.11 8 years ago
winlin 8bdf50b14d update feature list 8 years ago
winlin f2efa96015 for #324, always enable hstrs. 3.0.10 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 8 years ago
winlin f6661989af fix typo for #513, #691 8 years ago
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin f30b3073a2 refine the cros of api for flv 8 years ago
winlin 3df8f11884 refine thread stop 8 years ago
winlin 8935fe8897 merge srs2. 8 years ago
winlin aca8a79d95 fix #713, disable the source cleanup. 2.0.223 8 years ago
winlin 9ba4bed648 merge srs2 8 years ago
winlin cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 8 years ago
winlin 439c67018d remove unused macros. 8 years ago
winlin 2955b1fd2d support log rotate signal SIGUSR1. 3.0.8 8 years ago
winlin 9e9cad1826 refine messages 8 years ago
winlin dd1c769f65 refine main 8 years ago
winlin 83c251fc1c fix bug 8 years ago
winlin 2d387035cd refine the global variables. 8 years ago
winlin b06203e777 dispose kafka 8 years ago
winlin 9a3674c624 refine kafka 8 years ago
winlin 28517849ed refine typo 8 years ago
winlin f6c8e02cca Merge branch '2.0release' into develop 8 years ago
ME_Kun_Han ec4d1b3b4f fix bug: run srs at startup failed. (#454) 8 years ago
winlin 6dfb44b7b5 Merge branch '2.0release' into develop 8 years ago
winlin 85a7cb884f fix bug: fix the way calculating PCR for ts(#678) (#430) 8 years ago
hankun e0ab8b080d fix bug: fix the way calculating PCR for ts(#678) 8 years ago
winlin 0a8d40925f merge from 2.0 8 years ago
winlin d8599a56ca fix #654, crash when source cleanup for edge. 2.0.221 8 years ago
ME_Kun_Han f107f404ea fix bug for issues #654 (#426) 8 years ago
winlin 2f5f7d4a7b merge srs2 8 years ago
winlin 8b00e56a84 fix #666, crash when source cleanup for http-flv. 2.0.220 8 years ago
winlin 5796e4bf89 merge from srs2 8 years ago
hankun 4f09bcce9f fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666) 9 years ago
winlin 112d98ffdb merge srs2. 9 years ago
winlin d6fc289c6a fix #661, close fd after thread stopped. 2.0.219 9 years ago
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs (#386) 9 years ago
winlin 9cc528cd33 merge srs2 9 years ago
winlin 3659eec9d1 update the cwd 9 years ago
winlin 0e308b0fa1 merge srs2, support oryx 9 years ago
winlin 07fe35f11d support asprocess for oryx. 2.0.218 9 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 9 years ago
winlin 2a01540433 support change work_dir for oryx. 9 years ago
winlin b5d466f3d2 update utest 9 years ago
winlin 0fb71281a9 add circleci 9 years ago
winlin cbffe74494 add circleci 9 years ago
winlin e15e07c4d1 merge srs2 9 years ago
winlin ff3f8272a9 fix #640, typo for rtmp type. 2.0.217 9 years ago
winlin 77bca7cc05 Merge branch '2.0release' into develop 9 years ago
winlin 53d2eb5e02 fix librtmp get bytes bug. 9 years ago