Commit Graph

3304 Commits (0d78b908a7ea446b382db9e55135d42a53155440)

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