Commit Graph

750 Commits (034120c6689d676eb0e436ff7875c7ab1d4d631d)

Author SHA1 Message Date
winlin 9861fc4fe3 refine dvr, add comments 11 years ago
winlin 56ff70cdf8 remove lseek and size of fs stream 11 years ago
winlin 271b969d0b set audio/video flag to 0 in flv header. 11 years ago
winlin 73459547e1 support dvr. change to 0.9.69 11 years ago
winlin 996d042a33 add comments for file stream 11 years ago
winlin f5ff9c7241 update dvr comments 11 years ago
winlin fdd0678bcb add thread cid to log 11 years ago
winlin ae3f7d9cb8 change meeting hls to an 11 years ago
winlin 5af1da17ed change to 0.9.68 11 years ago
winlin 0c91fa6bed fix dvr mem leak, free msg when not use it. 11 years ago
winlin 88094af97a refine log, add user original configure 11 years ago
winlin 78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 11 years ago
winlin 47927ab460 refine options, change to 0.9.66 11 years ago
winlin 005502a07e update comments for HLS on_hls_start 11 years ago
winlin fd0002e499 add dvr framework 11 years ago
winlin 96115ac4f7 fix bug of config params. x86/x64/pi never use static 11 years ago
winlin 90dee0924d fix bug of build script 11 years ago
winlin 23a1b29935 add dvr option. refine macros of auto headers 11 years ago
winlin 1ae9178605 add favicon.ico, change to 0.9.65 11 years ago
winlin b86c83b0e0 refine the info for log to file. 11 years ago
winlin ce64dafc3c use stream time for live duration. change to 0.9.64 11 years ago
winlin 2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 11 years ago
winlin 73c310cd2e refine the macro. 11 years ago
winlin bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 11 years ago
winlin 9a036958d7 fix bug #45, support duration for live. change to 0.9.62 11 years ago
winlin 04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 11 years ago
winlin a0472f256d support test config file. change to 0.9.61 11 years ago
winlin f980340e89 refine config option 11 years ago
winlin aa784377fd refine reload, ignore if parse config file failed. 11 years ago
winlin cfee761899 support full reload. change to 0.9.60 11 years ago
winlin bb87272c39 refine reload, rename some vhost specified to add vhost prefix 11 years ago
winlin dc3c3cff8e support reload http_stream 11 years ago
winlin c33ff4fdb8 support reload http_api 11 years ago
winlin 17ac29d160 refine code for reload http api/stream 11 years ago
winlin 821b58af03 support reload atc 11 years ago
winlin eda1ddc03d support reload log level/logfile/tank 11 years ago
winlin f652c28485 support reload pid. 11 years ago
winlin 0a016e58bf add comments for main 11 years ago
winlin b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 11 years ago
winlin 15f651bccd update demo, support acodec 11 years ago
winlin ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 11 years ago
winlin 3a26b23fba change ffmpeg log to ./objs 11 years ago
winlin 8295169e0e refine code, unify the coding style 11 years ago
winlin ccba9ba9ba move log level parse to app utility 11 years ago
winlin f2f30dcc52 add utility, change log to trace 11 years ago
winlin 94874e77af refine reload config 11 years ago
winlin 6c5d8b4851 refine reload config 11 years ago
winlin bc61b1de18 fix bug of reload ingest 11 years ago
winlin e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 11 years ago
winlin 9ed3421586 rename from get_ingest to get_ingest_by_id of config 11 years ago
winlin e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 11 years ago
winlin e6d8bc1e5c ingest reload: support disable vhost 11 years ago
winlin 5e504944dc add comments for http conn 11 years ago
winlin dc71eef394 support ingest reload: add new vhost with ingester 11 years ago
winlin e5646e3bb5 refine ingester, add vhost/id info to ingester 11 years ago
winlin 9372a7065a refine the ingest log 11 years ago
winlin ccf0a423be change sleep time from 3s to 0.6s for ingester. 11 years ago
winlin 509504f27d change sleep time from 3s to 0.6s 11 years ago
winlin 5aded78272 change to 0.9.56, for macro changed 11 years ago
winlin eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 11 years ago
winlin 70e73bc281 add comments for bug #39 11 years ago
winlin d124772d6a add http server/api to srs.conf. add comments for bug #6. 11 years ago
winlin 98809862f7 change to 0.9.55, for 1.0 mainline 11 years ago
winlin 12ba02238d update readme, add ingest 11 years ago
winlin c11e266d5c update readme 11 years ago
winlin 4f445f2f60 support ingest stream 11 years ago
winlin 45d8f4346f implements ingest, change to 0.9.53 11 years ago
winlin e89ab84e4e implements ingest, change to 0.9.53 11 years ago
winlin 2742679354 implements the ingest framework 11 years ago
winlin 92281548b6 add ingest config 11 years ago
winlin 9107831b0e add config to read ingesters 11 years ago
winlin f5c4f492da add comments for ffmpeg 11 years ago
winlin c759a7c6b5 refine log of ffmpeg 11 years ago
winlin 4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 11 years ago
winlin 72c330d47c refine ffmepg and encoder, extract ffmpeg. 11 years ago
winlin 095364a72b refine ingest, start/stop ingest in server 11 years ago
winlin eea2310b07 refine consts 11 years ago
winlin 4a7378b77a ingest stream when server cycle 11 years ago
winlin adfbbbfd68 add ingest files 11 years ago
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 11 years ago
winlin c4524484e6 add comments for aac encoder 11 years ago
winlin 7916cab50e donot check the aac encoder, ensure aac is ok 11 years ago
winlin 30e3323fe4 update readme, add SampleHTTP link 11 years ago
winlin 4e3fe36ae2 refine http server pages. change to 0.9.51 11 years ago
winlin 1c02f4551c always use 64bits for lseek 11 years ago
winlin ced050829e fix bug of http, change to 0.9.50 11 years ago
winlin c5d3b11a6e update http stream. change to 0.9.49 11 years ago
winlin 17ce21348d implements the http stream module. change to 0.9.49 11 years ago
winlin ef26e77560 implements the http stream module. 11 years ago
winlin 00eda0d7b2 implements the http stream module. 11 years ago
winlin 83f35d10b1 add http delivery framework 11 years ago
winlin 8d7877ebd1 refine config, group by sections. 11 years ago
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 11 years ago
winlin 28b0c3a27f refine log and thread function name. change to 0.9.47. 11 years ago
winlin 6d32ad1828 refine log and thread function name 11 years ago
winlin f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 11 years ago
winlin 3f13726544 add log level in conf. change to 0.9.45 11 years ago
winlin 4984631cd6 refine the http crossdomain, send it only required 11 years ago
winlin 133a6f0dbf add crossdomain support for http error 11 years ago
winlin b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 11 years ago
winlin f2216691f9 remove the duplicated http status line when error 11 years ago
winlin 818c1f1520 support http error code, check url 11 years ago
winlin 0ae23d7556 rename version to versions 11 years ago
winlin 4a40075f68 add contributors to api/v1/authors 11 years ago
winlin 5c019c7938 implements api/v1/version, change to 0.9.43 11 years ago
winlin 9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 11 years ago
winlin a14267d2b4 refine the http url handler match. refine json encode 11 years ago
winlin bfa07465f0 implements basic http response framework 11 years ago
winlin 341b5151d9 create http handler framework 11 years ago
winlin eae9b94153 add api framework code 11 years ago
winlin 0ba0c14fb8 refine code, donot listen if not enabled http 11 years ago
winlin ec6d696565 refine http framework, use http message 11 years ago
winlin e70609cea3 refine code, extract http hooks. 11 years ago
winlin 5bbb76a59d remove the namespace srs, use http prefix 11 years ago
winlin 1922d62ff7 add --with-http-api option 11 years ago
winlin 52263457bf fix bug of no http-server feature 11 years ago
winlin 6ca9b774c1 support http methods, support js crossdomain request 11 years ago
winlin 51c1615173 change to 0.9.42, add http parse framework 11 years ago
winlin b0d77c4697 move wiki images to srs.release 11 years ago
winlin c7a4dd8863 move wiki images to srs.release 11 years ago
winlin 27029679e9 donot ensure transaction-id===1 for connect req/res, change to 0.9.41 11 years ago
winlin 64a8dfb09a refine rtmp send protocol, use the same cache for header 11 years ago
winlin 4dfbbcdff4 force st to use epoll, change to 0.9.39 11 years ago
winlin 3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 11 years ago
winlin 41f5217360 refine http code, define CRLF consts for http 11 years ago
winlin 6913efe127 implements the http api/stream framework 11 years ago
winlin ab3c6c92a0 rename srs-client to srs-rtmp-conn 11 years ago
winlin aa89f9f51e change to 0.9.37, for http api/stream 11 years ago
winlin 4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 11 years ago
winlin 0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 11 years ago
winlin ebf1139582 fix the forward loop detect bug. change to 0.9.34 11 years ago
winlin e02293d94d fix bug of handshake with nginx-rtmp for forward, change to 0.9.33 11 years ago
winlin 1386e7a8ab fix bug of handshake with nginx, simple hs 11 years ago
winlin e56c52ceba change to 0.9.32 11 years ago
winlin 7b3bc8f741 fix bug of bwtc 11 years ago
winlin 644dfa1a6d fix bug of librtmp 11 years ago
winlin a9d11df3a3 update arm tool chain 11 years ago
winlin a6d9da5e43 fix bug of script, support both abs and relative path 11 years ago
winlin c3e750e90f add version to log 11 years ago
winlin ade3630fa6 add package and install script 11 years ago
winlin 34efa15118 change to 0.9.30, first release for srs1 11 years ago
winlin cb1499fcb6 change log strategy, write log to file. change to 0.9.29 11 years ago
winlin ed20bd7078 default write log to file. 11 years ago
winlin 76290a5a12 fix bug of get daemon 11 years ago
winlin 7930add7f9 add log tank config, default to console. 11 years ago
winlin b290a00de7 refine log 11 years ago
winlin f1477dc4fe support daemon, default start in daemon. change to 0.9.28 11 years ago
winlin 3ec3c1f532 support daemon 11 years ago
winlin 2c1354b9b9 fix bug of log message 11 years ago
winlin 56679b3c82 add srs_log_file to write log to file. change to 0.9.27 11 years ago
winlin d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 11 years ago
winlin d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26 11 years ago
winlin 3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 11 years ago
winlin fdad7c25f0 fix isse #35: the gettimeofday jitter, log warn message 11 years ago
winlin 4f284b20f0 drop ts segment when duration is too small 11 years ago
winlin 5758551508 support hls republish 11 years ago
winlin f25c6558a5 write pid to ./objs/srs.pid. 11 years ago
winlin 0686b8fa5a update readme, add product wiki link 11 years ago
winlin a0c0c94cf0 refine conf, add comments for other listen type 11 years ago
winlin 2cebaff9d8 refine hls, ts temp file use ext .tmp 11 years ago
winlin e0fb1029c9 support pure audio hls. change to 0.9.24 11 years ago
winlin b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 11 years ago
winlin 238349b0c0 update configure, change to 0.9.23 11 years ago
winlin a2c5075002 update comments for handshake. 11 years ago
winlin a470330383 finish utest for handshake. 11 years ago
winlin 6b84a5e14c change to 0.9.22 11 years ago
winlin b7d40b5aba support vn/an to disable video/audio, for radio streaming 11 years ago
winlin 747bbd988e change to 0.9.21, refine complex handshake, client/server support complex handshake. 11 years ago
winlin da93b6fe99 add complex handshake utest 11 years ago
winlin 491ea4b630 support client complex handshake with server 11 years ago
winlin 841f0f8899 change to 0.9.19, verify the s1/s2/c2, refine the handshake. 11 years ago
winlin 152d3539d8 add s1 validation for client/server 11 years ago
winlin d89d16ca1e print the system info when startup main 11 years ago
winlin 2eeb289c2f assert system is little-endian 11 years ago
winlin b58ab508f9 add rtmp handshake utest, for arm to finger out the bug 11 years ago
winlin 1c055e7424 add log for ssl disabled. 11 years ago
winlin 1ffbdbc098 refine log, donot show error when client gracefully close it 11 years ago
winlin c85dde7f3f substitute all TAB with 4spaces. 11 years ago
winlin e5770b10b1 refine the colorful log for srs. remove the log when client close. 11 years ago
wenjie.zhao 109ce07c1b color text of error msg supported.
strerror msg supported.
11 years ago
wenjie.zhao e0e3504e1d color text of error msg supported.
strerror msg supported.
11 years ago
winlin 3721e72e99 arm: change to 0.9.18 11 years ago
winlin 5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp. 11 years ago
winlin a9da5903f6 arm support ssl/hls, change to 0.9.17 11 years ago
winlin 7744053d28 add arm research files, change to 0.9.16 11 years ago
winlin a90cb9dd84 fix ubuntu build warning, the config unused setter 11 years ago
winlin 010b5c0d7a fix ubuntu build warning, the config unused setter 11 years ago
winlin 3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK 11 years ago
winlin 387be8fa3b change to 0.9.15, finish amf0 utest 11 years ago
winlin 9521fbfaaa change version to 0.9.14, finish amf0 basic utest 11 years ago
winlin 95c2e7fd63 amf0 utest: finish basic utest for amf0 11 years ago
winlin 044138c39e refine summary for amf0 hpp 11 years ago
winlin 9fd48d84c1 refine amf0 object size to total_size, elem count to count 11 years ago
winlin 59db1dd260 utest for amf0 object, refine the count of elem 11 years ago
winlin 8ed9ae6242 amf0 utest: remove the object read/write function, directly use object to read or write. 11 years ago
winlin a3ae871360 refine code, array to ecma_array. 11 years ago
winlin 3129c738cb amf0 utest: refine interface of amf0, only export required objects 11 years ago
winlin b55efef2ee amf0 utest: finish amf0 any read/write utest 11 years ago
winlin 609114a5fe amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself. 11 years ago
winlin 3691c106fa amf0 utest: add usage for amf0 11 years ago
winlin 34f94a1be3 amf0 utest: add object and ecma array create function. 11 years ago
winlin f4aa2f30c1 amf0 utest: change version to 0.9.13 11 years ago
winlin 4306db099d amf0 utest: elem read/write refined 11 years ago
winlin bfe771bbba amf0 utest: null,undefined,object-eof to any 11 years ago
winlin e40be6e89d amf0 utest: boolean to any 11 years ago
winlin 4a0023ae63 amf0 utest: finish utest for string to any 11 years ago
winlin cae8228b09 amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead 11 years ago
winlin 57ce04ae12 amf0 utest: remove struct use class instead, move class together 11 years ago
winlin 404207db4f amf0 utest: refine amf0 size and finish utest. 11 years ago
winlin db7a113441 amf0 utest: refine amf0 size and finish utest. 11 years ago
winlin 3083759273 amf0 utest, refine amf0 size and object/array read/write 11 years ago
winlin 48343e4f3a refien build script, regenereate all options. change to 0.9.12 11 years ago
winlin 6e0bebdacf full support gperf gmc/gmp/gcp 11 years ago
winlin bef7e20ed9 fix rtmp protocol bug, use 31bits timestamp 11 years ago
winlin c89aea8af7 fix rtmp protocol bug, use 31bits timestamp 11 years ago
winlin 741d6f97f6 support gperf memory check(gmc). 11 years ago
winlin dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally 11 years ago
winlin 9d08b42c82 change version to 0.9.11 11 years ago
winlin a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish. 11 years ago
winlin 1ccddf4cfc add gest framework for utest, build success. 11 years ago
winlin fe5811304b add utest script to generate the utest Makefile 11 years ago
winlin 722e79003b merge from xiangcheng.liu, memory leak in amf0 11 years ago
winlin d622da3b44 update readme, finish modularity and wiki, change to 0.9.10 11 years ago
winlin 880f4f5dc2 final the modularity, rename the app module. 11 years ago
winlin c1086f8a9d srs-librtmp: finish the simple publish and play sample. 11 years ago
winlin efa09102cf srs-librtmp: implements the read packet. 11 years ago
winlin c338eb3666 srs-librtmp: implements the publish and play. 11 years ago
winlin fce26d6690 srs-librtmp: implements play stream. 11 years ago
winlin 6b213b73eb refine code, rename SrsRtmp to SrsRtmpServer. 11 years ago
winlin 8aedc51a2f refine code, rename SrsRtmp to SrsRtmpServer. 11 years ago
winlin 4f91cae377 srs-librtmp: add complex handshake. 11 years ago
winlin 76f37baafe srs-librtmp: implements the simple socket stream. 11 years ago
winlin 86267f854c srs-librtmp: implements handshake. 11 years ago
winlin f24f27deb9 srs-librtmp: add make ssl/nossl support for sample 11 years ago
winlin b7a62ba131 use goto to free resource 11 years ago
winlin feaf0c5e89 librtmp: create socket 11 years ago
winlin f8335e2c1f extract simple socket to lib 11 years ago
winlin 40a5edb37f update readme. 11 years ago
winlin db22af07a0 change to 0.9.9 11 years ago
winlin fc9e3fd890 srs-librtmp define interfaces 11 years ago
winlin 44375b9e6b add srs publish/play demo use srs-librtmp 11 years ago
winlin 713b05541b add librtmp demo srs_publish 11 years ago
winlin aa5d28ed85 add library 11 years ago
winlin d5a02a55ee unify code style 11 years ago
winlin 7d570fb4f3 use fast log 11 years ago
winlin 382fd127e4 rename config and pithy-print to app module. 11 years ago
winlin b407021d45 move config to app, for its application level features 11 years ago
winlin 517d346a52 change macro for all rtmp protocol files. 11 years ago
winlin 4c498b67da rename pro to rtmp protocol. 11 years ago
winlin 8d5806154b add todo, to rename to the right name SrsRtmpServer 11 years ago