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

3457 Commits (bb6389143faa78bd0cc3bd17f192bcc955a1cbd7)

Author SHA1 Message Date
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