github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,171 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

3973 Commits (da72caf8b9e4b5a3fb5b944ad9f869bab37228f9)

Author SHA1 Message Date
winlin ff82ca1233 Merge branch 2.0release into 3.0release
winlin 99430d2edb For , Not support macOS 10.14
winlin 24f46f5085 , Support _definst_ for Wowza. 3.0.44
winlin 99aa249f3a , Support _definst_ for Wowza. 2.0.260
MakarovYaroslav e62ac29f48 add ignoring _definst_ at the end of app ()
winlin b2066cbf68 , Fix string trim bug. 2.0.259
MakarovYaroslav a2480a6c94 fix bug with for loop ()
winlin 39f1629168 Merge from SRS2
winlin 58e501ee24 Fix , Support build on OSX10.14 Mojave. 2.0.258
winlin 63ac93a642 Merge from 2.0release
winlin a5b452f965 Merge , Fix sleep bug in us. 2.0.257
RocFang 768fe68ca3 fix st_usleep param from us to ms. () 
fix st_usleep param from us to ms.
winlin 3f009937ee Merge from 2.0release
winlin 9859fa9e6f Merge , Support param for transcoder. 2.0.256
Mirko Velic 70ad16ff6a Add request stream param to encoder output format parameters. ()
winlin 8e55ef4b60 Refine code
winlin 1e2cca4712 For , Refine HLS encryption wiki
winlin 5945fb5a24 Fix , Support HLS encryption. 3.0.42
winlin ee068cf120 For , Support without ssl for HLS key.
winlin 522fba99aa Merge branch 3.0release into harlanc-3.0release
winlin e73e30de3a Fix , Drop ts when republishing stream. 3.0.41
winlin 74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release
winlin 1e054d2bcc Fix , Rename impl__SrsAutoFree to impl_SrsAutoFree
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
Harlan bf12a45274 add configuration instructions for hls encryption
Harlan ac6b37de4b rewrite ff_data_to_hex
winlin a9b5d65ca7 For , Support auth_key param for srs player
winlin 728ddd133b For , Support edge/forward to Aliyun CDN. 3.0.40
winlin 74a87d54f2 For , Support edge/forward to Aliyun CDN. 2.0.255
winlin 1cc72df134 Fix , Support HTTP FLV with HTTP callback. 3.0.39
winlin 1e7c12a6dd For , Support HTTP FLV with HTTP callback. 2.0.254
winlin 928c6ab091 For , Add utest
winlin 01d8bba455 For , Refine code to write utest
winlin 6cea551c64 For , Refine params in http callback. 2.0.253
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38
winlin 03ac48f8fa Merge 2.0, for FLV latency
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252
winlin 580c94c8c0 Refine code
winlin 31945c244d For , Refine code.
winlin 455a060fa5 Merge 2.0
winlin ee43fc92ae For , Refine conf
winlin ae99131512 Fix , Ignore iface without address. 3.0.37
winlin 82699ff616 Refine code for librtmp
winlin 29b74c7220 For , Support params in http callback. 3.0.36
winlin 85d3a5001c For , Support params in http callback. 2.0.251
winlin 68a1656e07 Fix , Always use vhost in stream query, the unify uri. 3.0.35
winlin 09dbda5b18 For , SRS forwarder support douyu.com.
winlin a66d450ec1 For , SRS edge support douyu.com. 3.0.34
winlin 586899a010 For , SRS edge support douyu.com. 2.0.250
winlin 41c6e833b9 Replace hex to string to match MIT license. 3.0.33
winlin 84f81983aa Replace base64 to match MIT license. 3.0.32
winlin 0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31
winlin e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30
winlin dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code
winlin 608c88b8f2 Merge 2.0release
winlin 6d7c7418a8 Merge , fix memory leak. 2.0.249
winlin 551863a7ed Refine code
winlin 693194dffe Merge 2.0release
winlin d27db215df For , should not close fd when success.
winlin e4742ddac7 Merge 2.0release
winlin 2d49b9d1a7 Merge , fix scaned issues. 2.0.248
Hui Zhang (huzhang2) 01ed485cf3 fix 
security scan report issue
Harlan e9cb8210fc fix default value error
Harlan 45a57acbb4 fix bug
Harlan 43ebd5958d fix bug that only one stream can be encrypted..
winlin dba44c7c3f Merge branch 'develop' into 3.0release
xialixin bb4e16ae3c fix create dir success result check ()
xialixin aaf2905a9d add: hls configuration adds [duration] variable ()
Harlan 52596a0b04 add HLS encryption feature
winlin 0d78b908a7 Fix client tools resolve dns failed bug
winlin 449c632e49 For : Add example for origin cluster
winlin bd797ad385 Fix utest build failed for ::atoi
winlin 459272b94c Merge from 2.0release
winlin 0fe17c3e34 Merge , fix crash for edge HLS. 2.0.247
RocFang fd016ed91a use hls->initialize to set req of hls ()
winlin 4bf5ab2044 Fix , support RTMP origin cluster. 3.0.29
winlin c70421e656 Fix , support origin cluster
winlin 2f09ec4353 For , refine result of origin cluster api
winlin 92f2bcd878 For , support config origin cluster
winlin 55c96192e2 For , refine code
winlin ec362b2774 For , query origin info and ip addresses
winlin 469250f850 For , support origin cluster api
winlin d0fbf44d18 For , support config for origin cluster.
winlin db6b8cf914 Fix , switch to simple handshake. 3.0.28
winlin a2cefe4dbd For , show more information from stream
winlin 681138d2af Fix , merge from 2.0, supports url with vhost in stream. 3.0.27
winlin 1721e4ea4b Fix , support vhost in stream parameters. 2.0.246
winlin 93d3e1464a For , revert macro for TCP keepalive detection, use system macro
winlin 366309ce2d For , revert macro for TCP keepalive detection, use system macro
winlin 049e7c82c0 Merge , for , set TCP SO_KEEPALIVE
winlin 911cd448f1 Merge , for , TCP connection alive detection. 2.0.245
juntaoliu a6871052af set tcp keepalive for tcp socket ()
winlin 82457cda4b Change date from 2017 to 2018
winlin ca1395a807 Change date from 2017 to 2018
winlin d9e37d2f54 Merge branch '2.0release' into 3.0release
RocFang d22d7afd83 update init.d file ()
winlin 5730bf8e43 Fix , support complex error. 3.0.26
winlin b426036832 Merge , allow user to add some specific flags. 2.0.244
RocFang 015e76cb3f Update configure () 
allow user to add some specific flags.
winlin 922a8f3a5c For , refine code.
winlin 823dc2df21 Refine help
Thomas Dreibholz feaae341b9 IPv6 support (for 3.0 release) () 
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
winlin db08f1586c For , APP support complex error.
winlin e2c1f58674 For , APP support complex error.
winlin 6eae93258a For , APP support complex error.
winlin aebbbadf42 For , Service support complex error.
winlin 15aea686c3 For , KAFKA, RTSP support complex error.
winlin 70a20ffadb For , RTMP support complex error.
winlin 60accb6e54 For , AMF0 and RTMP support complex error.
winlin 204ef041da For , Kernel MP4 FLV HTTP support complex error.
winlin 9802dc326e For , source support complex error
winlin abcaba33ee For : TS/HLS/MPEGTS support complex error
winlin 20a42599f3 For , http callback use complex error
winlin fd91df9411 For , reload use complex error
ME_Kun_Han 3744606c9b fix bug: parsing Exp-Golomb codes failed ()
winlin baa55f14b9 Change stable release to SRS2
winlin 9f5224c34a For , use complex error for http
winlin 661eb8b37c For , use complex error for reload utc time
winlin 5c9a12e72a For , use complex error for listener
winlin 71dd3f3137 For , use complex error for server handler.
winlin e135ab59d9 Fix the utest failed for chunk_size
winlin 6d4315fc3c Disable valgrind by default
winlin 0ad4b65a56 Disable valgrind for osx.
winlin b3825c4021 Fix warnings
winlin 9db2a04c3b For , coroutine support complex error.
winlin b5c14938d9 For , config and log support complex error.
winlin 860aac3e50 For , config reload and persistence
winlin 7cac35a289 For , source cycle error
winlin 7275fd5397 Fix , build failed for headers for error.
winlin a20e2c3ef6 For , refine server utility
winlin ca9f0bdb1e For , refine server initialize st
winlin 4e4091231e Refine object create in server.
winlin 372a9e5cb3 Fix , string ends with
winlin 93710c7489 For , refine the error mechanism
winlin bb200b5d2d For , add complex error.
winlin 58521751c3 Fix , support experimental MPEG-DASH. 3.0.25
winlin 69374c8d6d For , use format for v/a sequence header.
winlin 9ca36970aa Fix , use empty coroutine to avoid NULL pointer.
winlin 0e9e1792fe For , write fMP4 for DASH.
winlin baed1cc043 For , support parse dash video segment
winlin 8cc3ab2fa2 For , print mdat and udat
winlin beae090d67 Refine logger header
winlin 4f6f8a8244 Fix verbose bug, for
winlin 6c64297264 Fix , support MP4 file parser. 3.0.24
winlin 12a55cd0c2 Fix build failed.
winlin 86f3bd7a0f Fix build failed.
winlin 121eadbc07 Fix build failed.
winlin 1bf99e8f3e For , Wrap ST, only use in service ST.
winlin 54411e0768 Fix , replace NXJSON(LGPL) with json-parser(BSD). 3.0.23
winlin 6993ac226f For , , use coroutine for reusable2 thread
winlin ea9a5f26d9 For , , use coroutine for reusable thread
winlin 2ed2513f08 For , , use coroutine for one cycle thread
winlin b21f92f97a For , , remove the thread start and stop event
winlin 3ffb0980f5 For , , use connection manager to remove connection
winlin 44f542f77f For , , replace the endless thread with coroutine
winlin fc380fe48d For , , refine thread object.
winlin 5792c462b8 Merge branch 'develop' into 3.0release
winlin c4966484e1 For , , merge SRS2
winlin e8cb2e6be4 Merge to fix , ts PES ext length. 2.0.243
OtterWa d1bd6993c5 fix ts decode ()
winlin 1e3550a52c For , Parse basic mp4 boxes.
HungMingWu 234904c206 Refine Refine Refine kernel/ts code ()
winlin dd1cca45cc Remove non-exists conf file.
winlin eaccbd0f85 Support print MP4 box.
winlin fe43a31d06 Parse all mp4 boxes
winlin 366d6bcb82 Refine code
xialixin 92c8c0505d Fix the timebase bug, change from us to ms. () 
* 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)
HungMingWu e8ea27088a Refine Refine kernel/ts code ()
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro () 
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.
winlin a58874178b Fix merge build failed.
winlin f97260be1d Merge SRS2
winlin a613eb78c6 Fix , shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242
walkermi 79e4f9f3a0 fixed compile error when add --log-info () 
* 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
winlin ae5450181c Fix , FD leak for requesting empty HTTP stream. 2.0.241
HungMingWu 98d4b6ae11 Refine srs_kernel_codec audio & video config code ()
winlin c97f2233a2 Merge SRS2 for
winlin ff87318b95 Fix , HTTP API support number of video frames for FPS. 2.0.240
winlin 9a2a6ab95f Merge SRS2
winlin 5e284b58a4 Fix , crash at HTTP fast buffer grow 2.0.239
winlin bcd24126c5 Update comments for HLS
winlin a98c9e04e3 Fix , support HLS audio in TS. 3.0.22
winlin 6ee85aea83 Refine mp4, extract mp4 box reader.
winlin c9bed5a8bf Refine mp4 codec for mdat.
winlin 18d9f6c8f1 Fix build failed.
winlin 1054b0a90f Merge SRS2
winlin 33a0abdeff Fix , support Haivision encoder. 2.0.238
winlin d6e28bde69 Merge from SRS2.
HungMingWu 14acc59a19 Refine kernel/mp4 code ()
winlin 1c139d8fd8 Merge , fix fd leak for FLV stream caster. 2.0.237
haofz 52b6823a90 fix , fix memory leak in streamCasterFlv ()
winlin 8d35585c13 Merge , avoid the duplicated sps/pps in ts. 2.0.236
ME_Kun_Han bd2a1f9d3c fixed bug: video rendering in hls stream generates only vertical parttern ()
winlin 33375db401 Merge from SRS2, for
winlin b11ddc7f41 Fix , crash for TS context corrupt. 2.0.235
winlin 8b7566a007 Refine code
winlin 032107dbf0 Refine hls ingester
winlin 609605a50b Fix , extract service for modules. 3.0.21
winlin b75a3fad4e For , fix ubuntu build failed.
winlin 362b5788cd For , fix warnings
winlin 7d618fed43 For , fix utest failed.
winlin e3526c0cf6 For , modules use service only.
winlin ff822b55cd For , extract service module.
winlin 0a57a46016 Refine LICENSE
winlin f32aab3d92 For , refine code.
winlin 62b7204514 Refine code, add mp4 parser module
winlin c648fd27bf Refine code
winlin 2980e7d3ef For , refine code.
Chengdong Zhang 8ad934a8a4 srs_info use not available variable () 
srs_info use not available variable.
Variable has been removed or changed.
winlin 9ab5e6a916 For , fix bug of fragment url
winlin c71e8fa947 For , fragment reap workflow
winlin 721a8457c2 For , Refine init mp4, use fragment
winlin 8d679a6f9a For , use fragment for dvr FLV/MP4
winlin da4c390d69 For , extract fragment and fragment window for hls
winlin 6da6e0511d For , should refine code.
Chengdong Zhang a6eebacc99 Streams API is not correct. () 
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
“winlin” 1b26536253 Add SIP RFC
“winlin” a48fdd9f03 Add ICE RFC
winlin ce034c3556 Refine docs, add TURN/STUN rfc.
winlin 3ec9df6578 For , A/V init mp4 are fine.
winlin 886930c22a For , refine the comments.
winlin 14765c2ba5 For , play or publish is not neccessary for bandwidth test.
ME_Kun_Han 3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success ()
winlin 8ab43b3e78 Fix , refine the comments.
winlin 308c6fee18 Fix , simply don't reuse object. 3.0.20
winlin 7680ac04ad Refine srs-librtmp
winlin 1743899a23 Refine code
winlin 16cde27a1e Remove MacOS compile option, for it's on use. It's caused by paralell make
winlin 121a2e5886 For , refine thread object. 3.0.19
winlin 44014683e1 Refine thread.
winlin 5bec6a4fdd Refine srs-librtmp
winlin 011b693235 Update srs-librtmp, set errno to ret when failed.
winlin 72c4ae4a8c Refine srs-librtmp API, change print to format
winlin ad87bd7cf2 Refine configure
winlin 68a5407b3a Remove using of connect_app2.
winlin 26c20db2b3 Fix parse srs version bug
winlin c849010fe2 Refine api for srs-librtmp
winlin af73e8ee65 Add log functions for srs-librtmp
winlin ca43bfe6d9 Fix build failed, for srs librtmp API changed.
winlin cdfded6a74 Support disable valgrind
winlin 89a5fa69d1 Refine srs-librtmp, set the schema, rather that connect app3
winlin 4e96c443d8 Change the bool to int for C
winlin 747d6f2f52 For , write legal MPD, fix CORS.
winlin 8ab727f3c5 For , write MPD file.
winlin 3903d2a8e3 For , remove the test code. 2.0.234
HungMingWu a6582c6208 Disable openssl thread support to prevent ubuntu linking pthread error
winlin 764cf245e9 For , build librtmp exmaples failed for -lpthread
winlin ac0e27b936 For , refine code style
HungMingWu 01d5e4da17 Replace openssl from l-1.0.1f to 1.10e () 
DUe to API breakchange, add a wrapper for backward compatibility
winlin 695ceeab48 Refine code for
Chengdong Zhang a3df4e3bfb Fix http callback set a wrong default port () 
* Add port verify

Code is more robust

* Verify port

Verify port

* Change hard code to defined.

Change hard code to defined.
winlin d786d61685 Merge branch '2.0release' into develop
winlin 0059b1cf7a For , use directly free to replace auto free
ljx0305 b0d16840b5 fix Repeated release () 
fix  Repeated release
winlin cee9d736a4 for , refine code.
winlin ede1c34a25 for , refine the signature of api for hls/dash
HungMingWu 33d6274217 Replace ffmpeg version from 2.1.1 to 3.2.4
winlin 2fcd3972c1 for , refine the encoder object name
winlin 2a4f57a587 Fix , User must config the codec in right way for HLS. 3.0.18
winlin d612a21bad for , refine audio codec object name
winlin caf69f193d for , refine the codec object name
winlin d7458c4e72 For , refine the codec to format-frame-sample chain.
winlin c4a510b834 For , refine the codec info structure.
winlin 5e419c66f8 For , add dash files.
winlin 7fd221ef63 Always enable DVR
winlin b0789c54e4 Update HLS wiki to v3
winlin 8e5d4dc73d always enable http and hls
winlin 11e8fe5bc0 refine options, remove rtmp-hls
winlin 477414106a add dash files.
winlin 5fec59ace2 merge from srs2, fix
winlin 99bffea328 fix , disable utilities when reload a source. 2.0.233
winlin 15570d93ce change conf to console without daemon.
winlin 90ff579a83 add gitignore.
winlin afbc3443f3 fix , support DVR general mp4. 3.0.17
winlin 3209ad29e0 for , refine code for DVR mp4.
winlin 0a054cd6bd for , remove the dvr plan append for it's no use
winlin 8c01f52372 for , refine the dvr segmenter.
winlin 31191f2650 for , support srs ingest mp4
winlin 4fe79a1025 for , fix the audio sample offset error.
winlin 733252dc21 for , remove test code
winlin 733ba73d54 for , write mp4 samples.
winlin e24674e9cf for , refine build mp4 samples from moov.
winlin 3025aebf42 for , mp4 build samples from moov.
winlin 253ac40312 for , parse avcc/sps/pps/asc from mp4.
winlin 9d21a8bb33 for , use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov).
winlin bbee16e4db for , parse moov, get the h.264/avcC and aac/asc
winlin e8eb050bf2 update readme
winlin ac7ee10b60 fix #751,#756, refine code
Chengdong Zhang 80540e4dc1 change TAB space 
change TAB space for line 794
eagle-zhang 7b02e3543f Clients Api support start and count 
Clients Api support start and count
line 794~810 && line 830
winlin 7ee1df33d1 for , parse mp4 udta(user data) box.
winlin ffe0a4426d for , parse mp4 moov boxes.
winlin 96f2e18d3a for , demux the aac mp4a and esds
winlin 128a1fd3db for , decode mp4 video track boxes.
winlin 5a84b6ca94 for , complete all mp4 boxes codec.
winlin 2ad265bd5a for , implements boxes codec
winlin b6bb3f2446 fix c99 build failed.
winlin 858951da49 for , add srs ingest mp4
winlin 34a8eb6113 for , add srs ingest mp4 tool
winlin 33ba6cdee2 change utest when demuxer use io interface.
winlin 01d401c270 for , refine flv codec to use io interface.
winlin d3bb8b6a86 for , refine the io interfaces.
winlin eaa222f034 for , refine the file reader and writer interface.
winlin bb5bd0ee1c include for uintxx_t
winlin b16ab038ce for , refine the u_intxx_t to uintxx_t
winlin 011ac4f6a9 for , add mp4 demuxer to librtmp
winlin 3f3e98e9db for , major boxes from isom
winlin 8588a10775 Merge branch '2.0release' into develop
winlin a37a14377a fix the example dvr config file error
winlin b09183010b for , add isom boxes.
winlin ca02aaa7b3 for , add doc, moov box.
winlin 6b6ac9a054 for , add box and fullbox.
winlin 91a3989372 for , add mp4 demuxer files to kernel.
winlin 136a7ef488 for , refine docs.
winlin e8353cba3b for , add mp4 and dash doc.
winlin 38a683fe14 disable glibc memory check
winlin 7057bb1ef5 for , always enable http utilities.
winlin a1fcf66f32 for , always enable http utilities.
winlin 79def81792 for , refine the rtmp conn, use info as data cluster.
winlin 39aee2b318 for , fix publish recv thread bug.
winlin 954bb186c1 identify the flash and fmle for recv thread.
winlin 4583a63789 for , refine code for recv thread.
winlin a07986f4ee for , refine code
winlin 5c959fc781 merge from srs2, for kbps free io
winlin 6706bda42c for , release the io then free it for kbps. 2.0.232
winlin a3ea83f504 directly free the transport, not need to close for maybe NULL
winlin 99c13fb1c1 convert ms to us for st
winlin 7bfb648bd8 refine the meta cache name
winlin 4cff49afd2 for , refine source, meta and origin hub. 3.0.16
winlin 8acb99f96c refine comments for librtmp
winlin c5fcc15989 update the date info
winlin 0e6f7e66f0 add srs_rtmp_free_packet for srs-librtmp
winlin 7acc3aca16 refine hijack io for srslibrtmp
winlin e8c48ac8f8 merge srs2, use specific error code for dns resolve
winlin 60be29f324 fix , use specific error code for dns resolve. 2.0.231
winlin 310032d8d8 merge srs2, timestamp overflow for ATC.
winlin d76419e3bb fix , timestamp overflow for ATC. 2.0.230
winlin 2ef1ef06e9 increase the nb_samples because some large video may overflow.
cenxinwei 762d7a8884 fix publish_normal_timeout 配置读取错误
winlin 3fe338d1c5 for , use ms for application clock tbn.
winlin dca9749f37 for , refine the object live cycle. 3.0.15
winlin f4c0af8bfc refine code remove dup api for
winlin 1ed5118246 refine the spaces, no TABS
winlin 750f4413c8 merge srs2 for
winlin 142a9733b2 refine encoder code for .
winlin ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common.
winlin e6eafd3b97 fix , convert ts aac audio private stream 1 to common. 2.0.229
winlin f92db0f87e merge srs2 for kbps
winlin 6a8c232c5b fix , kbps interface error. 2.0.228
winlin c58dbe4d14 fix , kbps interface error. 2.0.228
winlin 7fe60b5bbf fix config transform refer_publish invalid. 3.0.14
winlin 7bbb3bae42 merge srs2
winlin e3aa34ec5f fix , recovery the hls dispose. 2.0.227
Himer afa704bca5 Update srs_app_source.cpp 
enabled 为true才进行转发实例创建
winlin db231f6d37 refine hls html5 video template.
winlin 087a596a63 refine hls html5 video template.
winlin df983cc9ec fix typo
winlin a1ae48f4ac Merge branch '2.0release' into develop
winlin 6fbda2ae3f for , refine hls open/close gop.
winlin 07871a442e fix typo
winlin ae1920e91a Merge branch '2.0release' into develop
winlin 4104f25069 for , support IDR and NonIDR(open-gop).
winlin 1dd877c0d6 merge srs2
winlin c9a71b7fb2 fix , hls support NonIDR(open gop). 2.0.226
winlin d49f195bbf fix , log format error.
winlin c46e925be5 add utest for avc uev
winlin b7dd764920 update gitignore
winlin 10a0c6c10c update for srs3
winlin 1b1ae00910 fix , install valgrind-devel
winlin 517812dbe2 remove test code for
winlin 1b175b1107 for , support config in/out ack size. 3.0.13
winlin bbbc40f9c2 Merge branch '2.0release' into develop
winlin aa2b7afb44 refine code, print protocol level info.
winlin e434c09dc0 for , merge srs2
winlin c67036d52e for , reset ack follow flash player rules. 2.0.225
winlin dc1f227aeb for , refine code to decode the acknowledge message
winlin d29416a5f0 add conf sample for ingest rtsp
winlin 4709d0214c for , support prefile for transcode. 3.0.12
winlin f9a159cd21 patch ST for valgrind and ARM. 3.0.11
winlin 8bdf50b14d update feature list
winlin f2efa96015 for , always enable hstrs. 3.0.10
winlin 7ac932cfa0 update to 2013-2017
winlin b231550c32 fix , , http api/static/stream support cors. 3.0.9
winlin f6661989af fix typo for ,
winlin 664844b5f5 merge from srs2. for .
winlin 759c84a395 for , remove hls ram from srs2 to srs3+. 2.0.224
winlin f30b3073a2 refine the cros of api for flv
winlin 3df8f11884 refine thread stop
winlin 8935fe8897 merge srs2.
winlin aca8a79d95 fix , disable the source cleanup. 2.0.223
winlin 9ba4bed648 merge srs2
winlin cb1d47bfef fix , refine source to avoid critical fetch and create. 2.0.222
winlin 439c67018d remove unused macros.
winlin 2955b1fd2d support log rotate signal SIGUSR1. 3.0.8
winlin 9e9cad1826 refine messages
winlin dd1c769f65 refine main
winlin 83c251fc1c fix bug
winlin 2d387035cd refine the global variables.
winlin b06203e777 dispose kafka
winlin 9a3674c624 refine kafka
winlin 28517849ed refine typo
winlin f6c8e02cca Merge branch '2.0release' into develop
ME_Kun_Han ec4d1b3b4f fix bug: run srs at startup failed. ()
winlin 6dfb44b7b5 Merge branch '2.0release' into develop
winlin 85a7cb884f fix bug: fix the way calculating PCR for ts() ()
hankun e0ab8b080d fix bug: fix the way calculating PCR for ts()
winlin 0a8d40925f merge from 2.0
winlin d8599a56ca fix , crash when source cleanup for edge. 2.0.221
ME_Kun_Han f107f404ea fix bug for issues ()
winlin 2f5f7d4a7b merge srs2
winlin 8b00e56a84 fix , crash when source cleanup for http-flv. 2.0.220
winlin 5796e4bf89 merge from srs2
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()
winlin 112d98ffdb merge srs2.
winlin d6fc289c6a fix , close fd after thread stopped. 2.0.219
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs ()
winlin 78aa518ecc merge srs2
winlin b19702f669 update srs player
winlin 9cc528cd33 merge srs2
winlin 3659eec9d1 update the cwd
winlin 0e308b0fa1 merge srs2, support oryx
winlin 07fe35f11d support asprocess for oryx. 2.0.218
winlin b748fac23a support asprocess for oryx. 2.0.218
winlin 2a01540433 support change work_dir for oryx.
winlin b5d466f3d2 update utest
winlin 0fb71281a9 add circleci
winlin cbffe74494 add circleci
winlin e15e07c4d1 merge srs2
winlin ff3f8272a9 fix , typo for rtmp type. 2.0.217
winlin 0596550a72 Merge branch '2.0release' into develop
winlin 99d87f9f9c fix sys-ssl librtmp build bug.
winlin 4bcd90d747 fix sys-ssl librtmp build bug.
winlin 92fb81003c link crypto when use sys-ssl
winlin 77bca7cc05 Merge branch '2.0release' into develop
winlin 53d2eb5e02 fix librtmp get bytes bug.
winlin 6b8fe92afa Merge branch '2.0release' into develop
winlin 588de3e7b4 check lsb_realease for install
winlin 504352d17a merge srs2.
winlin c2cb666995 fix fast stream error bug. 2.0.216
winlin c231f45fe8 Merge branch '2.0release' into develop
winlin bd652e4607 fix build failed for stdc++
winlin 8a4e241eec merge from srs2
winlin 6c4c68ccb6 2.0 beta1(2.0.215) released.
winlin 49b880d4ce refine comments
winlin eb915413ad Merge branch '2.0release' into develop
winlin 0015b303a6 librtmp: refine comment for NALU process.
winlin 93eb961b4c Merge branch '2.0release' into develop
winlin 4c6c2c28b8 refine h264 raw publish with fps
winlin 09895fcfc2 Merge branch '2.0release' into develop
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.
winlin 17df61724d Merge branch '2.0release' into develop
winlin 7aaa74b9e0 TODO: FIXME: for librtmp, must group NALUs to frame.
winlin 2cf077abe9 Merge branch '2.0release' into develop
winlin 80a98cf836 refine annexb parse
winlin b24d1de377 Merge branch '2.0release' into develop
winlin 590e951739 fix memory leak of source.
winlin 0e9318e5d8 merge from 2.0
winlin c7b97aa1c3 fix memory leak at source. 2.0.214
winlin 815f2491a4 merge from 2.0
winlin 6ec60b0a21 fix memory leak at handshake. 2.0.213
winlin 39a46f7b97 Merge branch '2.0release' into develop
winlin 1214af643e refine comments for arm
winlin c0498c82ee merge 2.0
winlin e775eb3ff2 support all arm for patched st. 2.0.212
winlin 8ad7da1cb6 merge from 2.0
xubin 49853d2b8a 修复forward崩溃
winlin 7d96a33207 Merge branch '2.0release' into develop
winlin e2865c6ac1 workaround for , the fly stfd in close. 2.0.211
winlin b49cb3d379 Merge branch '2.0release' into develop
winlin a0890fe06a comment the pcr
winlin 5d5fa7204d Merge branch '2.0release' into develop
winlin d919668b61 don't ignore aud
winlin bf22acd689 Merge branch '2.0release' into develop
winlin a4bb03b9d6 ignore other 264 frame except sps,pps,idr,nonidr
winlin 31a1b7bed2 Merge branch '2.0release' into develop
winlin 304ff02aef default to 30s timeout for librtmp
winlin d68a459198 Merge branch '2.0release' into develop
winlin 02fb0779be fix the microsec calc bug for librtmp
winlin 14760003ba merge from 2.0
winlin e00928557e fix the timeout for librtmp
winlin 516f33888c refine config
winlin 36eb0981ec merge from 2.0release
intliang 3fbe9d2442 fixed crash by improper srs_info use.
winlin f87646d489 fix typo of config.
winlin abeb4f46a9 merge 2.0
winlin ec6e77992e 2.0.210
winlin 499fc07db1 refine the hls m3u8 refresh interval.
winlin 5fa500646e update srs player version
winlin ec57e2170d refine hls m3u8 refresh interval and buffer time
winlin b463e4a2f4 Merge branch '2.0release' into develop
weiyabo 8df7135dee for bug , success parse 264 sps
winlin c746753c6a update player, add pst(player startup time)
winlin 892591f9a6 merge from @mbeacom
winlin 2e75c9f45f add more buffer
winlin 9312d77c20 default not to preview the stream for publisher.
winlin 6b5c880ff9 refine player to support status change.
winlin 4841435b14 fix default http port bug.
winlin a2d235f015 refresh js cache.
winlin d7a28059ed remove jwplayer and osmf
winlin d9f1ced732 change srs player to 1.28
winlin 77167f3331 refine srs player for hls, extract a HlsNetStream.
winlin 2492562d25 use xpsid X-Playback-Session-Id to more useful.
winlin b2bd63e833 refine srs player to play hls.
winlin 46a31f4884 support play hls
winlin 69ec66ee36 refine js for player.
winlin 0a2e00f8c5 dump logs
winlin 9ab5039b36 extract iplayer for srs-player.
winlin 10ce961a00 update version for bwtc
winlin b3c13f2550 refine the bwtc, to compatible with bms4.
winlin eed4626c35 use larger limit
winlin a3038b1274 fix the rtmp url parse bug.
winlin 82aa9d120c for , display metadata.
winlin a8ee3162d4 Merge branch '2.0release' into develop
winlin d72b93e58b fix the sed bug, to compatible with osx
winlin 00c60db7c3 Merge branch '2.0release' into develop
winlin f7d9ed5ae4 update api
winlin 8db25a0bf5 fix the log for mmap.
winlin 214eda745d open null dev, not close stdout or stderr.
winlin 03469fc37d refine code for process fork.
winlin ce8f3b4478 refine the dup2 of stdout and stderr.
winlin ae8bd4c2aa should never close the fd 3+, for it myabe used.
winlin a6dc17a67d support redirect stdout by >
winlin 0cd15068de set default buffer time to 0.5 for srs player.
winlin f8358da316 refine ingester log.
winlin dfe5306327 fix process bug.
winlin 61c0c168b9 merge from srs2.
winlin 266397acee merge from srs2
winlin 28080efec8 fix http reader bug, support infinite chunkted. 2.0.209
winlin f971538cf3 refine http, support no host.
winlin 2941328ee8 rtmp edge support 302 redirect.
winlin e2e6e76f92 for and , 2.0.208
winlin d81b2cb140 support hls mount to vhost and reload
winlin 041040b846 ignore ingester when vhost disabled.
winlin eac5440559 merge from srs2
winlin da722b5b5d Merge pull request from tufang14/2.0release 
srs reusable thread need join
tufang14 56bffb6646 Update srs_app_thread.cpp
flowerwrong d42a58faf4 Keep blank of line
tufang14 233ff11172 srs reusable thread need join
winlin d24aef50ba for , support RTMP 302 api at protocol level.
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies.
winlin 5338f21439 merge from srs2
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207
winlin dc38ae1687 show first message when not show version.
winlin 9d22d09646 show signature of server.
winlin 973194c663 merge from srs2.
winlin 26211abf2e refine code.
winlin f516636448 refine code for hooks and http core.
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr.
winlin 96a4428bdb refine the http request parse. edge retry timeout.
winlin 190db75835 refine code for nx_json modify the data when loads.
winlin 86a7db0adb refine edge ingester, use upstream adapter.
winlin 7ae2c6bf50 merge from srs2.
winlin eca46c03d2 refine code for consumer to refer the rtmp connection.
winlin 11e11005ac specifies the try default vhost
winlin d267b8fa19 fix bug for create connection with ip.
winlin a7bf4bfda5 refine code, ignore client when no ip.
winlin 49308dddfb update 2015 to 2016
winlin d0c74fa7cd update 2015 to 2016
winlin 714c13d88d merge from srs2
winlin 5d3a183f43 fix , always alloc big object at heap. 2.0.205
winlin 65b81a4e68 merge from srs2
winlin 8b24319ffb fix , ignore null connect props to make RED5 happy. 2.0.204
winlin 8d378cda2e for , when simple handshake, copy s1 to c2.
winlin b881166f9a merge from srs2
winlin c7850570c1 fix , thread terminate normally dispose bug. 2.0.203
winlin 5f915aa959 merge from srs2
winlin cee8c3d07d fix , failed when chunk size too small. 2.0.202
winlin e124aeb614 Merge branch '2.0release' into develop
winlin 69d191e53f refine the hls error log.
winlin 0ab64ccd2a merge from srs2.
winlin 40457e6cab default hls_on_error to continue. 2.0.201
winlin f6ff116505 refine code, persistence use isolate method.
winlin b486f6fe6b refine /api/v1/summaries, with code and server id.
winlin 26d328e7f2 fix bug for api, level should be string.
winlin ffef3905af merge from srs2.
winlin 5660e24953 fast stop server.
winlin 2830ee12c1 fix the on_hls.ts_url bug.
winlin 1e4c8f8bf3 fast stop server.
winlin 3ab5892863 refine comments.
winlin 5ac8177ce6 fix bugs
winlin fabcc91a0e refine codes.
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack.
winlin fba1122835 private the srs_vhost_resolve
winlin 17bb31cab1 fix the config bug.
winlin eec2c34b5c refine publisher.
winlin cfe230438a revert test code
winlin 6191e0af90 s1 compute key.
winlin 18eb8c81b3 merge from srs2
winlin 2310b2da59 fix , fix fd leak bug when fork. 2.0.200
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server
winlin c77cefb6fa refine the position of log script
winlin 44b26271bf Merge branch '2.0release' into develop
winlin c4c63f7825 fix build failed bug for osx.
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs
winlin 6c7a51d310 Merge branch '2.0release' into develop
winlin 1d8318d2fc change simple-rtmp-server org to ossrs
winlin d2ccc4f661 Merge branch '2.0release' into develop
winlin 8c04b17d08 use /usr/local/bin for osx.
winlin 7db7d43aea Merge branch '2.0release' into develop
winlin 18b50d961f support query server by id.
winlin aca9fe805c Merge branch '2.0release' into develop
winlin d916c53702 refine the api server.
winlin a89ed68aa3 update readme for .
winlin 75be18133d fix build failed for utest.
winlin 6df4d1f05a merge from srs2.
winlin 98e25def6c fix utest build failed for osx.
winlin 97f5bb8b99 merge from srs2
zhengfl 38b81ce312 允许操作SrsStream中的函数时，长度为0.
zhengfl 1dae8fc987 fix , fix the bug of thread stop invalid.
winlin 49d77b3f09 for , use srs_freepa and SrsAutoFreeA for array. 2.0.198
winlin 4b5eb5ea2d fix the parse rtmp url bug for ingest.
winlin ec225b2108 quit child process when fork failed.
winlin 9d7826c681 quit child process when fork failed.
winlin f57e537686 for , merge from srs2, use SrsAutoFreeA.
winlin f4f76cd196 for , use SrsAutoFreeA to free the array.
winlin 604486b0a3 for , use srs_freepa to free array.
winlin 8cec06e898 merge srs2, use srs_freepa for array
winlin 2af7749771 for , use srs_freepa to free the array.
winlin cef1ae5a8e fix the config bug.
winlin 9ebb77d711 fix the warnings
winlin e9e202dbf1 merge srs2
winlin ef00005ab4 for ExoPlayer, remove duration for live.
winlin 8c96472cea merge srs2
winlin 50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197
winlin 59f5c5d6a5 Merge branch '2.0release' into develop
winlin 3b0bf1e10b for , make the segment more acceptable, when in [min, max_td * 2], it's ok.
winlin 390f58e186 fix compile failed.
winlin a416e891b4 fix compile failed.
winlin 1d57e53910 merge from 2.0release
winlin d1979c760f for , partical hotfix the hls pure audio. 2.0.196
winlin 3683f06e4d for , write audio frame by frame for video+audio hls.
winlin fe27e76492 support schema
winlin a501f5bd7a update htbt script
winlin dd2945add1 update htbt script
winlin 6f6d495a19 update htbt script
winlin 3933819686 add htbt script
winlin 0a8cb8a391 add heartbeat script
winlin 11979229e6 Merge branch '2.0release' into develop
winlin e08beba89e fix the sed command for arm
winlin 45385241bb fix the sed command for arm
winlin b8f2ba4f0d complete kafka
winlin cbe4252b4d refine code.
winlin d2ca51ac50 notify kafka when client close
winlin 71451878c9 refine kafka, simplify code.
winlin 9a47390253 fix , support write log to kafka. 3.0.6
winlin 76cd3f8749 kafka convert json to producer message.
winlin 8e344f1c26 add producer api messages.
winlin 7a0aaf5900 kafka refine code
winlin f9f5b56951 kakfa erase messages when wrote.