github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,862 Commits
13 Branches
107 Tags
371 MiB
develop
5.0release
6.0release
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '84f6f3d051'
${ noResults }
Commit Graph

3761 Commits (84f6f3d0511645db434aaff266563b368a96228b)

Author SHA1 Message Date
winlin dd1cca45cc Remove non-exists conf file. 8 years ago
winlin eaccbd0f85 Support print MP4 box. 8 years ago
winlin fe43a31d06 Parse all mp4 boxes 8 years ago
winlin 366d6bcb82 Refine code 8 years ago
xialixin 92c8c0505d Fix the timebase bug, change from us to ms. (#876) 
* fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL)

* fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)

* fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)
 8 years ago
HungMingWu e8ea27088a Refine Refine kernel/ts code (#881) 8 years ago
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874) 
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
 8 years ago
winlin a58874178b Fix merge build failed. 8 years ago
winlin f97260be1d Merge SRS2 8 years ago
winlin a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 8 years ago
walkermi 79e4f9f3a0 fixed compile error when add --log-info (#860) 
* Update srs_app_server.cpp

fixed compile error when add --log-info

* Update srs_app_mpegts_udp.cpp

fixed compile error when add --log-info
 8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
HungMingWu 98d4b6ae11 Refine srs_kernel_codec audio & video config code (#854) 8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin 9a2a6ab95f Merge SRS2 8 years ago
winlin 5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 8 years ago
winlin bcd24126c5 Update comments for HLS 8 years ago
winlin a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 8 years ago
winlin 6ee85aea83 Refine mp4, extract mp4 box reader. 8 years ago
winlin c9bed5a8bf Refine mp4 codec for mdat. 8 years ago
winlin 18d9f6c8f1 Fix build failed. 8 years ago
winlin 1054b0a90f Merge SRS2 8 years ago
winlin 33a0abdeff Fix #844, support Haivision encoder. 2.0.238 8 years ago
winlin d6e28bde69 Merge from SRS2. 8 years ago
HungMingWu 14acc59a19 Refine kernel/mp4 code (#823) 8 years ago
winlin 1c139d8fd8 Merge #846, fix fd leak for FLV stream caster. 2.0.237 8 years ago
haofz 52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 8 years ago
winlin 8d35585c13 Merge #841, avoid the duplicated sps/pps in ts. 2.0.236 8 years ago
ME_Kun_Han bd2a1f9d3c fixed bug: video rendering in hls stream generates only vertical parttern (#841) 8 years ago
winlin 33375db401 Merge from SRS2, for #834 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin 8b7566a007 Refine code 8 years ago
winlin 032107dbf0 Refine hls ingester 8 years ago
winlin 609605a50b Fix #820, extract service for modules. 3.0.21 8 years ago
winlin b75a3fad4e For #820, fix ubuntu build failed. 8 years ago
winlin 362b5788cd For #820, fix warnings 8 years ago
winlin 7d618fed43 For #820, fix utest failed. 8 years ago
winlin e3526c0cf6 For #820, modules use service only. 8 years ago
winlin ff822b55cd For #820, extract service module. 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 62b7204514 Refine code, add mp4 parser module 8 years ago
winlin c648fd27bf Refine code 8 years ago
winlin 2980e7d3ef For #813, refine code. 8 years ago
Chengdong Zhang 8ad934a8a4 srs_info use not available variable (#813) 
srs_info use not available variable.
Variable has been removed or changed.
 8 years ago
winlin 9ab5e6a916 For #299, fix bug of fragment url 8 years ago
winlin c71e8fa947 For #299, fragment reap workflow 8 years ago
winlin 721a8457c2 For #299, Refine init mp4, use fragment 8 years ago
winlin 8d679a6f9a For #299, use fragment for dvr FLV/MP4 8 years ago
winlin da4c390d69 For #299, extract fragment and fragment window for hls 8 years ago
winlin 6da6e0511d For #803, should refine code. 8 years ago
Chengdong Zhang a6eebacc99 Streams API is not correct. (#800) 
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
 8 years ago
“winlin” 1b26536253 Add SIP RFC 8 years ago
“winlin” a48fdd9f03 Add ICE RFC 8 years ago
winlin ce034c3556 Refine docs, add TURN/STUN rfc. 8 years ago
winlin 3ec9df6578 For #299, A/V init mp4 are fine. 8 years ago
winlin 886930c22a For #299, refine the comments. 8 years ago
winlin 14765c2ba5 For #790, play or publish is not neccessary for bandwidth test. 8 years ago
ME_Kun_Han 3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790) 8 years ago
winlin 8ab43b3e78 Fix #794, refine the comments. 8 years ago
winlin 308c6fee18 Fix #786, simply don't reuse object. 3.0.20 8 years ago
winlin 7680ac04ad Refine srs-librtmp 8 years ago
winlin 1743899a23 Refine code 8 years ago
winlin 16cde27a1e Remove MacOS compile option, for it's on use. It's caused by paralell make 8 years ago
winlin 121a2e5886 For #110, refine thread object. 3.0.19 8 years ago
winlin 44014683e1 Refine thread. 8 years ago
winlin 5bec6a4fdd Refine srs-librtmp 8 years ago
winlin 011b693235 Update srs-librtmp, set errno to ret when failed. 8 years ago
winlin 72c4ae4a8c Refine srs-librtmp API, change print to format 8 years ago
winlin ad87bd7cf2 Refine configure 8 years ago
winlin 68a5407b3a Remove using of connect_app2. 8 years ago
winlin 26c20db2b3 Fix parse srs version bug 8 years ago
winlin c849010fe2 Refine api for srs-librtmp 8 years ago
winlin af73e8ee65 Add log functions for srs-librtmp 8 years ago
winlin ca43bfe6d9 Fix build failed, for srs librtmp API changed. 8 years ago
winlin cdfded6a74 Support disable valgrind 8 years ago
winlin 89a5fa69d1 Refine srs-librtmp, set the schema, rather that connect app3 8 years ago
winlin 4e96c443d8 Change the bool to int for C 8 years ago
winlin 747d6f2f52 For #299, write legal MPD, fix CORS. 8 years ago
winlin 8ab727f3c5 For #299, write MPD file. 8 years ago
winlin 3903d2a8e3 For #730, remove the test code. 2.0.234 8 years ago
HungMingWu a6582c6208 Disable openssl thread support to prevent ubuntu linking pthread error 8 years ago
winlin 764cf245e9 For #774, build librtmp exmaples failed for -lpthread 8 years ago
winlin ac0e27b936 For #774, refine code style 8 years ago
HungMingWu 01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 8 years ago
winlin 695ceeab48 Refine code for #777 8 years ago
Chengdong Zhang a3df4e3bfb Fix #744 http callback set a wrong default port (#777) 
* Add port verify

Code is more robust

* Verify port

Verify port

* Change hard code to defined.

Change hard code to defined.
 8 years ago
winlin d786d61685 Merge branch '2.0release' into develop 8 years ago
winlin 0059b1cf7a For #783, use directly free to replace auto free 8 years ago
ljx0305 b0d16840b5 fix Repeated release (#783) 
fix  Repeated release
 8 years ago
winlin cee9d736a4 for #299, refine code. 8 years ago
winlin ede1c34a25 for #299, refine the signature of api for hls/dash 8 years ago
HungMingWu 33d6274217 Replace ffmpeg version from 2.1.1 to 3.2.4 8 years ago
winlin 2fcd3972c1 for #299, refine the encoder object name 8 years ago
winlin 2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 8 years ago
winlin d612a21bad for #299, refine audio codec object name 8 years ago
winlin caf69f193d for #299, refine the codec object name 8 years ago
winlin d7458c4e72 For #299, refine the codec to format-frame-sample chain. 8 years ago
winlin c4a510b834 For #299, refine the codec info structure. 8 years ago
winlin 5e419c66f8 For #299, add dash files. 8 years ago
winlin 7fd221ef63 Always enable DVR 8 years ago
winlin b0789c54e4 Update HLS wiki to v3 8 years ago
winlin 8e5d4dc73d always enable http and hls 8 years ago
winlin 11e8fe5bc0 refine options, remove rtmp-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 15570d93ce change conf to console without daemon. 8 years ago
winlin 90ff579a83 add gitignore. 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 b6bb3f2446 fix c99 build failed. 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 8588a10775 Merge branch '2.0release' into develop 8 years ago
winlin a37a14377a fix the example dvr config file error 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 e8353cba3b for #299, add mp4 and dash doc. 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 c5fcc15989 update the date info 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 db231f6d37 refine hls html5 video template. 8 years ago
winlin 087a596a63 refine hls html5 video template. 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 b7dd764920 update gitignore 8 years ago
winlin 10a0c6c10c update for srs3 8 years ago
winlin 1b1ae00910 fix #727, install valgrind-devel 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 d29416a5f0 add conf sample for ingest rtsp 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) 8 years ago
winlin 112d98ffdb merge srs2. 8 years ago
winlin d6fc289c6a fix #661, close fd after thread stopped. 2.0.219 8 years ago
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs (#386) 8 years ago
winlin 78aa518ecc merge srs2 8 years ago
winlin b19702f669 update srs player 8 years ago
winlin 9cc528cd33 merge srs2 8 years ago
winlin 3659eec9d1 update the cwd 8 years ago
winlin 0e308b0fa1 merge srs2, support oryx 8 years ago
winlin 07fe35f11d support asprocess for oryx. 2.0.218 8 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 8 years ago
winlin 2a01540433 support change work_dir for oryx. 8 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 0596550a72 Merge branch '2.0release' into develop 9 years ago
winlin 99d87f9f9c fix sys-ssl librtmp build bug. 9 years ago
winlin 4bcd90d747 fix sys-ssl librtmp build bug. 9 years ago
winlin 92fb81003c link crypto when use sys-ssl 9 years ago
winlin 77bca7cc05 Merge branch '2.0release' into develop 9 years ago
winlin 53d2eb5e02 fix librtmp get bytes bug. 9 years ago
winlin 6b8fe92afa Merge branch '2.0release' into develop 9 years ago
winlin 588de3e7b4 check lsb_realease for install 9 years ago
winlin 504352d17a merge srs2. 9 years ago
winlin c2cb666995 fix fast stream error bug. 2.0.216 9 years ago
winlin c231f45fe8 Merge branch '2.0release' into develop 9 years ago
winlin bd652e4607 fix build failed for stdc++ 9 years ago
winlin 8a4e241eec merge from srs2 9 years ago
winlin 6c4c68ccb6 2.0 beta1(2.0.215) released. 9 years ago
winlin 49b880d4ce refine comments 9 years ago
winlin eb915413ad Merge branch '2.0release' into develop 9 years ago
winlin 0015b303a6 librtmp: refine comment for NALU process. 9 years ago
winlin 93eb961b4c Merge branch '2.0release' into develop 9 years ago
winlin 4c6c2c28b8 refine h264 raw publish with fps 9 years ago
winlin 09895fcfc2 Merge branch '2.0release' into develop 9 years ago
Star Brilliant a164c90e28 Flush the stdout buffer after logging to console 
Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n.
However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half).
By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.
 9 years ago
winlin 17df61724d Merge branch '2.0release' into develop 9 years ago
winlin 7aaa74b9e0 TODO: FIXME: for librtmp, must group NALUs to frame. 9 years ago
winlin 2cf077abe9 Merge branch '2.0release' into develop 9 years ago
winlin 80a98cf836 refine annexb parse 9 years ago
winlin b24d1de377 Merge branch '2.0release' into develop 9 years ago
winlin 590e951739 fix memory leak of source. 9 years ago
winlin 0e9318e5d8 merge from 2.0 9 years ago
winlin c7b97aa1c3 fix memory leak at source. 2.0.214 9 years ago
winlin 815f2491a4 merge from 2.0 9 years ago
winlin 6ec60b0a21 fix memory leak at handshake. 2.0.213 9 years ago
winlin 39a46f7b97 Merge branch '2.0release' into develop 9 years ago
winlin 1214af643e refine comments for arm 9 years ago
winlin c0498c82ee merge 2.0 9 years ago
winlin e775eb3ff2 support all arm for patched st. 2.0.212 9 years ago
winlin 8ad7da1cb6 merge from 2.0 9 years ago
xubin 49853d2b8a 修复forward崩溃 9 years ago
winlin 7d96a33207 Merge branch '2.0release' into develop 9 years ago
winlin e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 9 years ago
winlin b49cb3d379 Merge branch '2.0release' into develop 9 years ago
winlin a0890fe06a comment the pcr 9 years ago
winlin 5d5fa7204d Merge branch '2.0release' into develop 9 years ago
winlin d919668b61 don't ignore aud 9 years ago
winlin bf22acd689 Merge branch '2.0release' into develop 9 years ago
winlin a4bb03b9d6 ignore other 264 frame except sps,pps,idr,nonidr 9 years ago
winlin 31a1b7bed2 Merge branch '2.0release' into develop 9 years ago
winlin 304ff02aef default to 30s timeout for librtmp 9 years ago
winlin d68a459198 Merge branch '2.0release' into develop 9 years ago
winlin 02fb0779be fix the microsec calc bug for librtmp 9 years ago
winlin 14760003ba merge from 2.0 9 years ago
winlin e00928557e fix the timeout for librtmp 9 years ago
winlin 516f33888c refine config 9 years ago
winlin 36eb0981ec merge from 2.0release 9 years ago
intliang 3fbe9d2442 fixed crash by improper srs_info use. 9 years ago
winlin f87646d489 fix typo of config. 9 years ago
winlin abeb4f46a9 merge 2.0 9 years ago
winlin ec6e77992e 2.0.210 9 years ago
winlin 499fc07db1 refine the hls m3u8 refresh interval. 9 years ago
winlin 5fa500646e update srs player version 9 years ago
winlin ec57e2170d refine hls m3u8 refresh interval and buffer time 9 years ago
winlin b463e4a2f4 Merge branch '2.0release' into develop 9 years ago
weiyabo 8df7135dee for bug #5064, success parse 264 sps 9 years ago
winlin c746753c6a update player, add pst(player startup time) 9 years ago
winlin 892591f9a6 merge from @mbeacom 9 years ago
winlin 2e75c9f45f add more buffer 9 years ago
winlin 9312d77c20 default not to preview the stream for publisher. 9 years ago
winlin 6b5c880ff9 refine player to support status change. 9 years ago
winlin 4841435b14 fix default http port bug. 9 years ago
winlin a2d235f015 refresh js cache. 9 years ago
winlin d7a28059ed remove jwplayer and osmf 9 years ago
winlin d9f1ced732 change srs player to 1.28 9 years ago
winlin 77167f3331 refine srs player for hls, extract a HlsNetStream. 9 years ago
winlin 2492562d25 use xpsid X-Playback-Session-Id to more useful. 9 years ago
winlin b2bd63e833 refine srs player to play hls. 9 years ago
winlin 46a31f4884 support play hls 9 years ago
winlin 69ec66ee36 refine js for player. 9 years ago
winlin 0a2e00f8c5 dump logs 9 years ago
winlin 9ab5039b36 extract iplayer for srs-player. 9 years ago
winlin 10ce961a00 update version for bwtc 9 years ago
winlin b3c13f2550 refine the bwtc, to compatible with bms4. 9 years ago
winlin eed4626c35 use larger limit 9 years ago
winlin a3038b1274 fix the rtmp url parse bug. 9 years ago
winlin 82aa9d120c for #5114, display metadata. 9 years ago
winlin a8ee3162d4 Merge branch '2.0release' into develop 9 years ago
winlin d72b93e58b fix the sed bug, to compatible with osx 9 years ago
winlin 00c60db7c3 Merge branch '2.0release' into develop 9 years ago
winlin f7d9ed5ae4 update api 9 years ago
winlin 8db25a0bf5 fix the log for mmap. 9 years ago
winlin 214eda745d open null dev, not close stdout or stderr. 9 years ago
winlin 03469fc37d refine code for process fork. 9 years ago
winlin ce8f3b4478 refine the dup2 of stdout and stderr. 9 years ago
winlin ae8bd4c2aa should never close the fd 3+, for it myabe used. 9 years ago
winlin a6dc17a67d support redirect stdout by > 9 years ago
winlin 0cd15068de set default buffer time to 0.5 for srs player. 9 years ago
winlin f8358da316 refine ingester log. 9 years ago
winlin dfe5306327 fix process bug. 9 years ago
winlin 61c0c168b9 merge from srs2. 9 years ago
winlin 266397acee merge from srs2 9 years ago
winlin 28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 9 years ago
winlin f971538cf3 refine http, support no host. 9 years ago
winlin 2941328ee8 rtmp edge support 302 redirect. 9 years ago
winlin e2e6e76f92 for #558 and #559, 2.0.208 9 years ago
winlin d81b2cb140 support hls mount to vhost and reload 9 years ago
winlin 041040b846 ignore ingester when vhost disabled. 9 years ago
winlin eac5440559 merge from srs2 #558 #559 9 years ago
winlin da722b5b5d Merge pull request #559 from tufang14/2.0release 
srs reusable thread need join
 9 years ago
tufang14 56bffb6646 Update srs_app_thread.cpp 9 years ago
flowerwrong d42a58faf4 Keep blank of line 9 years ago
tufang14 233ff11172 srs reusable thread need join 9 years ago
winlin d24aef50ba for #369, support RTMP 302 api at protocol level. 9 years ago
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 5338f21439 merge from srs2 9 years ago
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 9 years ago
winlin dc38ae1687 show first message when not show version. 9 years ago
winlin 9d22d09646 show signature of server. 9 years ago
winlin 973194c663 merge from srs2. 9 years ago
winlin 26211abf2e refine code. 9 years ago
winlin f516636448 refine code for hooks and http core. 9 years ago
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr. 9 years ago
winlin 96a4428bdb refine the http request parse. edge retry timeout. 9 years ago
winlin 190db75835 refine code for nx_json modify the data when loads. 9 years ago
winlin 86a7db0adb refine edge ingester, use upstream adapter. 9 years ago
winlin 7ae2c6bf50 merge from srs2. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin 11e11005ac specifies the try default vhost 9 years ago
winlin d267b8fa19 fix bug for create connection with ip. 9 years ago
winlin a7bf4bfda5 refine code, ignore client when no ip. 9 years ago
winlin 49308dddfb update 2015 to 2016 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 714c13d88d merge from srs2 9 years ago
winlin 5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 9 years ago
winlin 65b81a4e68 merge from srs2 9 years ago
winlin 8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 9 years ago
winlin 8d378cda2e for #418, when simple handshake, copy s1 to c2. 9 years ago
winlin b881166f9a merge from srs2 9 years ago
winlin c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 9 years ago
winlin 5f915aa959 merge from srs2 9 years ago
winlin cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 9 years ago
winlin e124aeb614 Merge branch '2.0release' into develop 9 years ago
winlin 69d191e53f refine the hls error log. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin f6ff116505 refine code, persistence use isolate method. 9 years ago
winlin b486f6fe6b refine /api/v1/summaries, with code and server id. 9 years ago
winlin 26d328e7f2 fix bug for api, level should be string. 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 5660e24953 fast stop server. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 9 years ago
winlin 1e4c8f8bf3 fast stop server. 9 years ago
winlin 3ab5892863 refine comments. 9 years ago
winlin 5ac8177ce6 fix bugs 9 years ago
winlin fabcc91a0e refine codes. 9 years ago
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack. 9 years ago
winlin fba1122835 private the srs_vhost_resolve 9 years ago
winlin 17bb31cab1 fix the config bug. 9 years ago
winlin eec2c34b5c refine publisher. 9 years ago
winlin cfe230438a revert test code 9 years ago
winlin 6191e0af90 s1 compute key. 9 years ago
winlin 18eb8c81b3 merge from srs2 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 9 years ago
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 9 years ago
winlin c77cefb6fa refine the position of log script 9 years ago
winlin 44b26271bf Merge branch '2.0release' into develop 9 years ago
winlin c4c63f7825 fix build failed bug for osx. 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 6c7a51d310 Merge branch '2.0release' into develop 9 years ago
winlin 1d8318d2fc change simple-rtmp-server org to ossrs 9 years ago
winlin d2ccc4f661 Merge branch '2.0release' into develop 9 years ago
winlin 8c04b17d08 use /usr/local/bin for osx. 9 years ago
winlin 7db7d43aea Merge branch '2.0release' into develop 9 years ago
winlin 18b50d961f support query server by id. 9 years ago
winlin aca9fe805c Merge branch '2.0release' into develop 9 years ago
winlin d916c53702 refine the api server. 9 years ago
winlin a89ed68aa3 update readme for #511. 9 years ago
winlin 75be18133d fix build failed for utest. 9 years ago
winlin 6df4d1f05a merge from srs2. 9 years ago
winlin 98e25def6c fix utest build failed for osx. 9 years ago
winlin 97f5bb8b99 merge from srs2 9 years ago
zhengfl 38b81ce312 允许操作SrsStream中的函数时，长度为0. 9 years ago
zhengfl 1dae8fc987 fix #511, fix the bug of thread stop invalid. 9 years ago
winlin 49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 9 years ago
winlin 4b5eb5ea2d fix the parse rtmp url bug for ingest. 9 years ago
winlin ec225b2108 quit child process when fork failed. 9 years ago
winlin 9d7826c681 quit child process when fork failed. 9 years ago
winlin f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 9 years ago
winlin f4f76cd196 for #515, use SrsAutoFreeA to free the array. 9 years ago
winlin 604486b0a3 for #515, use srs_freepa to free array. 9 years ago
winlin 8cec06e898 merge srs2, use srs_freepa for array 9 years ago
winlin 2af7749771 for #515, use srs_freepa to free the array. 9 years ago
winlin cef1ae5a8e fix the config bug. 9 years ago
winlin 9ebb77d711 fix the warnings 9 years ago
winlin e9e202dbf1 merge srs2 9 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 9 years ago
winlin 8c96472cea merge srs2 9 years ago
winlin 50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 9 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 9 years ago
winlin 3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 9 years ago
winlin 390f58e186 fix compile failed. 9 years ago
winlin a416e891b4 fix compile failed. 9 years ago
winlin 1d57e53910 merge from 2.0release 9 years ago
winlin d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 9 years ago
winlin 3683f06e4d for #512, write audio frame by frame for video+audio hls. 9 years ago
winlin fe27e76492 support schema 9 years ago
winlin a501f5bd7a update htbt script 9 years ago
winlin dd2945add1 update htbt script 9 years ago
winlin 6f6d495a19 update htbt script 9 years ago
winlin 3933819686 add htbt script 9 years ago
winlin 0a8cb8a391 add heartbeat script 9 years ago
winlin 11979229e6 Merge branch '2.0release' into develop 9 years ago
winlin e08beba89e fix the sed command for arm 9 years ago
winlin 45385241bb fix the sed command for arm 9 years ago
winlin b8f2ba4f0d complete kafka 9 years ago
winlin cbe4252b4d refine code. 9 years ago
winlin d2ca51ac50 notify kafka when client close 9 years ago
winlin 71451878c9 refine kafka, simplify code. 9 years ago
winlin 9a47390253 fix #467, support write log to kafka. 3.0.6 9 years ago
winlin 76cd3f8749 kafka convert json to producer message. 9 years ago
winlin 8e344f1c26 add producer api messages. 9 years ago
winlin 7a0aaf5900 kafka refine code 9 years ago
winlin f9f5b56951 kakfa erase messages when wrote. 9 years ago
winlin 22fa9a0f1f kafka use temp transport to fetch metadata. 9 years ago
winlin 531b658f8e retry when metadata empty 9 years ago
winlin 61486a82aa kafka use topic and partition cache 9 years ago
winlin 7013993c7a kafka send the accept message. 9 years ago
winlin de41c1c9d2 kafka refine comments. 9 years ago
winlin 31a77a83ed convert metadata to partitions 9 years ago
winlin f0e39cc330 support show the summary of kafka metadata. 9 years ago
winlin d013374871 rename ISrsCodec size to nb_bytes. 9 years ago
winlin 33a015329d add function to convert kafka array to vector 9 years ago
winlin 84b3981d47 refs #1670: support decode the metadata response. 9 years ago
winlin 7106934c3a kafka producer use async interface to request metadata. 9 years ago
winlin a108fa8d01 kafka recv and decode message. 9 years ago
winlin 493d282255 kafka refine array, to decode and create object. 9 years ago
winlin c4862878d1 kafka rename message set to raw message set. 9 years ago
winlin 6e5ed11a00 for kafka, support correlation id cache. 9 years ago
winlin 2e67eb8786 refine comments for kafka messages. 9 years ago
winlin 3c64e4b957 kafka encode and send packet. 9 years ago
winlin 9117e1e918 extract ISrsCodec for code and decode object. 9 years ago
winlin 45755fd1e7 refine code for kakfa request/response, string/bytes. 9 years ago
winlin 8a4ec49064 add graph comments for size of request and response. 9 years ago
winlin 8974fe298b connect to kafka and send metadata request. 9 years ago
winlin a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 9 years ago
winlin a08d8f83d6 refine mpegts code, use simple rtmp client 9 years ago
winlin ad9b377d96 refine forwarder code, use simple rtmp client. 9 years ago
winlin 0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 9 years ago
winlin 12e013142d refine code, use simple rtmp client. 9 years ago
winlin bc27481886 refine code, use simple rtmp client. 9 years ago
winlin e4c852945f refine code, support override vhost 9 years ago
winlin a9ad7b211b refine simple rtmp client for post flv stream. 9 years ago
winlin adb8f243bf use simple rtmp client for raw connect app 9 years ago
winlin 24b3899972 use SrsTcpClient instead raw socket. 9 years ago
winlin a9bb6061c3 use tcp client for raw connect. 9 years ago
winlin 20fcfb3eee fix bug, use system utility 9 years ago
winlin 69cc01b696 use system utilities 9 years ago
winlin 908365a61a use string for const char* 9 years ago
winlin d9f991ed2f use system utility for string finds 9 years ago
winlin ca73534d7e refine comments for api key 9 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 9 years ago
winlin 2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 9 years ago
winlin 1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 9 years ago
winlin 33a282e576 support snapshot by http hooks for #152. 9 years ago
winlin 9eebb89432 Merge branch '2.0release' into develop 9 years ago
winlin 91e9fc7e5b fix typo of INVLIAD to INVALID 9 years ago
winlin 57a3b11b86 merge from srs2 9 years ago
winlin 5de65d41f4 Merge pull request #499 from synote/2.0release 
fix bug for build failure when configure with --log-info
 9 years ago
winlin b5ba1043e8 Merge branch '2.0release' into develop 9 years ago
winlin 9c2eafc244 refine the git command 9 years ago
winlin ed80d9d281 merge from srs2 9 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 9 years ago
winlin 6587c5b2f1 merge from srs2 9 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 9 years ago
winlin 8862ec1988 merge from srs2 9 years ago
winlin a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 9 years ago
winlin 070ada1d6e Merge branch '2.0release' into develop 9 years ago
winlin 65e4bf2e77 fix compile failed bug. 9 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 1c7d5f1852 Merge branch '2.0release' into develop 10 years ago
winlin 353e3260b8 remove duplicated code 10 years ago
winlin 9ead08725d use kernel utility int2str and float2str 10 years ago
winlin 6efd2dd27e add load balance round robin for brokers. 10 years ago
winlin 2a4ab8a923 add brokers to config 10 years ago
winlin f187a7deef refine the startup logs. 10 years ago
winlin 3ab0ccaa27 Merge branch '2.0release' into develop 10 years ago
winlin 7cdcf41d26 refine the api server 10 years ago
winlin afd6428366 refine code of server. 10 years ago
winlin 8b6c78b862 Merge branch '2.0release' into develop 10 years ago
winlin d1de097f5e fix make clean bug, donot rm when no dir 10 years ago
winlin 396bb43672 Merge branch '2.0release' into develop 10 years ago
winlin 8b1198562a show cpu info. 10 years ago
winlin 4e88262512 merge from srs2 to check cpus. 10 years ago
winlin cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 10 years ago
winlin f6e655396c for #485, support cross build for arm 10 years ago
winlin d94a88a797 merge from srs2 for pi and cubie. 10 years ago
winlin 16730ea031 refine code for cross build 10 years ago
winlin 6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 10 years ago
winlin f75058413d Merge branch '2.0release' into develop 10 years ago
winlin 7dcdb18588 support build on pi and cubie 10 years ago
winlin a8829e0a8b support build on pi or cubie. 10 years ago
winlin 9a9483e7d5 support without kafka 10 years ago
winlin abb5c5ad31 add kafka producer 10 years ago
winlin b5ccc35340 add kafka config 10 years ago
winlin ab1e62a886 create the metadata request message 10 years ago
winlin ca3b89aa7d add kafka array, use c++ template. 10 years ago
winlin 8a6edac4e8 add --x86-64 alias for --x86-x64. 10 years ago
winlin edead21a25 refine the options 10 years ago
winlin e415824576 refine the options 10 years ago
winlin 2d5cc7a3e4 add structures for kafka 10 years ago
winlin 83f40697e2 refine the hpp macro defines. 10 years ago
winlin df6ac8842c rename rtmp utility to protocol utility 10 years ago
winlin 82ff05c1d4 rename rtmp io to protocol io 10 years ago
winlin 168625dce2 rename rtmp amf0 to protocol amf0. 10 years ago
winlin 1310c0f577 rename srs_protocol_buffer to srs_protocol_stream 10 years ago
winlin d32632ee8a rename SrsFastBuffer to SrsFastStream 10 years ago
winlin 4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 10 years ago
winlin dadfe101b4 rename SrsBitStream to SrsBitBuffer 10 years ago
winlin 0e52fc6d5b rename SrsStream to SrsBuffer 10 years ago
winlin ca3577e11b rename temp to stream 10 years ago
winlin f33d736442 rename kernel stream to buffer 10 years ago
winlin a4f51564db rename kernel stream to buffer 10 years ago
winlin 495f575ac3 rename kernel buffer to temp 10 years ago
winlin ac2b03a3ed rename srs_kernel_buffer to temp 10 years ago
winlin faf6d15878 add replace script. 10 years ago
winlin 1de2bb0801 add kafka protocol files. 10 years ago
winlin b5996567e8 refine the role of srs, to cluster. 10 years ago
winlin e4e36a0166 merge from srs2, fix openssl build 10 years ago
winlin d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 10 years ago
winlin b471c6e61c refine code, use json integter rather than number. 10 years ago
winlin c5cd58761c move the srs thread to st. 10 years ago
winlin 3042115385 refine json to_str to dumps. 10 years ago
winlin b59d9ba6a1 support amf0 and json to convert with each other. 10 years ago
winlin 3f7e69b617 json objects support dumps to string. 10 years ago
winlin b78781707e update the srs player 10 years ago