Commit Graph

936 Commits (c681098949f13a1e718509e83ccb17fd7a7fc592)

Author SHA1 Message Date
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 7c64a893f5 add demo.m3u8 and demo.html 11 years ago
winlin 9eb76cb1eb update demo.conf 11 years ago
winlin 189da7e12e fix bug of demo.conf 11 years ago
winlin 15f651bccd update demo, support acodec 11 years ago
winlin acdd5a827e update api server, support servers 11 years ago
winlin ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 11 years ago
winlin 64727ce616 add bandwidth test conf 11 years ago
winlin 3a26b23fba change ffmpeg log to ./objs 11 years ago
winlin ca02cfe1bf update server.py 11 years ago
winlin c3c2767363 update api server, add servers 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 017b96f9b5 fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 11 years ago
winlin 056895a978 add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 11 years ago
winlin 9372a7065a refine the ingest log 11 years ago
winlin 4af7b6e383 update conf file, add id for ingest. 11 years ago
winlin 5a3b59d3c8 update conf file, add id for ingest. 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 3b59a6c687 fix bug of package for arm 11 years ago
winlin 667191913b fix bug of package for arm 11 years ago
winlin 5c9941989e fix bug of package for arm 11 years ago
winlin 503fb93d4e fix bug of package for arm 11 years ago
winlin 5fd582cd26 fix bug of package for arm 11 years ago
winlin a8c5db3fc7 fix bug of package for arm 11 years ago
winlin 6e88634c5c add transcode to package 11 years ago
winlin 9a8eeb685d update package, add http server and api. 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 05e22e9530 fix script run/build/stop bug 11 years ago
winlin c11e266d5c update readme 11 years ago
winlin 3d073f9ef6 update demo script, remove ffmpeg publish. use ingest instead 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 7384ad0caa add ingest config section of full.conf 11 years ago
winlin 5e6c490ba0 add ingest compile feature 11 years ago
winlin e80abac4f0 add ingest feature to readme 11 years ago
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 11 years ago
winlin 5ff1d589f7 change warn to trace for nginx disabled 11 years ago
winlin d546f815df update build/run/stop script 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 7de8bd7595 allow pi to use ffmpeg 11 years ago
winlin 2949c751f6 update install, create http root 11 years ago
winlin 43979f7505 add htt.hls sample 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 3c63cf0a86 update demo page, change http port to 8080 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 1117f78587 support arm build for http api and server 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 d28458d5fa fix script build bug 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 5aa0043934 add rfc822 for http1.1 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 e3254377ce update depends, allow pi/dev to enable gprof/gperf 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 234ce08ed3 force st to use epoll 11 years ago
winlin b8f6ef59c5 update readme, refine the chinese summary 11 years ago
winlin b95e1cab30 update readme, refine the title 11 years ago
winlin 17739e459b update readme, add csdn mirror 11 years ago
winlin 104c143dbe add csdn auto sync script 11 years ago
winlin c6cdc4ad54 refine package for raspberry. 11 years ago
winlin be8aa92ab0 refine package for raspberry. 11 years ago
winlin 37fe08a302 support debian and raspbian 11 years ago
winlin 3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 11 years ago
winlin 917f1ea9e1 fix bug of typo of readme. update package to support --help and options 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 041a07dfda add http config in srs conf 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 ea3561de08 change script log dir to objs 11 years ago
winlin 97435c6bb4 fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir 11 years ago