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

3883 Commits (4a69499f2c989c6748517a6efdd8c490ca7c4b4b)

Author SHA1 Message Date
winlin a8c5db3fc7 fix bug of package for arm
winlin 6e88634c5c add transcode to package
winlin 9a8eeb685d update package, add http server and api.
winlin 98809862f7 change to 0.9.55, for 1.0 mainline
winlin 12ba02238d update readme, add ingest
winlin 05e22e9530 fix script run/build/stop bug
winlin c11e266d5c update readme
winlin 3d073f9ef6 update demo script, remove ffmpeg publish. use ingest instead
winlin 4f445f2f60 support ingest stream
winlin 45d8f4346f implements ingest, change to 0.9.53
winlin e89ab84e4e implements ingest, change to 0.9.53
winlin 2742679354 implements the ingest framework
winlin 92281548b6 add ingest config
winlin 9107831b0e add config to read ingesters
winlin f5c4f492da add comments for ffmpeg
winlin c759a7c6b5 refine log of ffmpeg
winlin 4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg
winlin 72c330d47c refine ffmepg and encoder, extract ffmpeg.
winlin 095364a72b refine ingest, start/stop ingest in server
winlin eea2310b07 refine consts
winlin 4a7378b77a ingest stream when server cycle
winlin adfbbbfd68 add ingest files
winlin 7384ad0caa add ingest config section of full.conf
winlin 5e6c490ba0 add ingest compile feature
winlin e80abac4f0 add ingest feature to readme
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding
winlin 5ff1d589f7 change warn to trace for nginx disabled
winlin d546f815df update build/run/stop script
winlin c4524484e6 add comments for aac encoder
winlin 7916cab50e donot check the aac encoder, ensure aac is ok
winlin 7de8bd7595 allow pi to use ffmpeg
winlin 2949c751f6 update install, create http root
winlin 43979f7505 add htt.hls sample
winlin 30e3323fe4 update readme, add SampleHTTP link
winlin 4e3fe36ae2 refine http server pages. change to 0.9.51
winlin 1c02f4551c always use 64bits for lseek
winlin ced050829e fix bug of http, change to 0.9.50
winlin c5d3b11a6e update http stream. change to 0.9.49
winlin 3c63cf0a86 update demo page, change http port to 8080
winlin 17ce21348d implements the http stream module. change to 0.9.49
winlin ef26e77560 implements the http stream module.
winlin 00eda0d7b2 implements the http stream module.
winlin 83f35d10b1 add http delivery framework
winlin 8d7877ebd1 refine config, group by sections.
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48
winlin 28b0c3a27f refine log and thread function name. change to 0.9.47.
winlin 6d32ad1828 refine log and thread function name
winlin 1117f78587 support arm build for http api and server
winlin f089eafd9f fix bug , remove app slash of jwplayer, change to 0.9.46
winlin 3f13726544 add log level in conf. change to 0.9.45
winlin 4984631cd6 refine the http crossdomain, send it only required
winlin 133a6f0dbf add crossdomain support for http error
winlin b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44
winlin f2216691f9 remove the duplicated http status line when error
winlin 818c1f1520 support http error code, check url
winlin 0ae23d7556 rename version to versions
winlin 4a40075f68 add contributors to api/v1/authors
winlin 5c019c7938 implements api/v1/version, change to 0.9.43
winlin 9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field
winlin a14267d2b4 refine the http url handler match. refine json encode
winlin bfa07465f0 implements basic http response framework
winlin 341b5151d9 create http handler framework
winlin eae9b94153 add api framework code
winlin 0ba0c14fb8 refine code, donot listen if not enabled http
winlin ec6d696565 refine http framework, use http message
winlin e70609cea3 refine code, extract http hooks.
winlin 5bbb76a59d remove the namespace srs, use http prefix
winlin 1922d62ff7 add --with-http-api option
winlin 52263457bf fix bug of no http-server feature
winlin d28458d5fa fix script build bug
winlin 6ca9b774c1 support http methods, support js crossdomain request
winlin 51c1615173 change to 0.9.42, add http parse framework
winlin 5aa0043934 add rfc822 for http1.1
winlin b0d77c4697 move wiki images to srs.release
winlin c7a4dd8863 move wiki images to srs.release
winlin 27029679e9 donot ensure transaction-id===1 for connect req/res, change to 0.9.41
winlin e3254377ce update depends, allow pi/dev to enable gprof/gperf
winlin 64a8dfb09a refine rtmp send protocol, use the same cache for header
winlin 4dfbbcdff4 force st to use epoll, change to 0.9.39
winlin 234ce08ed3 force st to use epoll
winlin b8f6ef59c5 update readme, refine the chinese summary
winlin b95e1cab30 update readme, refine the title
winlin 17739e459b update readme, add csdn mirror
winlin 104c143dbe add csdn auto sync script
winlin c6cdc4ad54 refine package for raspberry.
winlin be8aa92ab0 refine package for raspberry.
winlin 37fe08a302 support debian and raspbian
winlin 3932cf1334 update build, always patch st, for we need to build in raspberrypi directly
winlin 917f1ea9e1 fix bug of typo of readme. update package to support --help and options
winlin 41f5217360 refine http code, define CRLF consts for http
winlin 6913efe127 implements the http api/stream framework
winlin ab3c6c92a0 rename srs-client to srs-rtmp-conn
winlin aa89f9f51e change to 0.9.37, for http api/stream
winlin 041a07dfda add http config in srs conf
winlin 4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36
winlin ea3561de08 change script log dir to objs
winlin 97435c6bb4 fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir
winlin 0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35
winlin ebf1139582 fix the forward loop detect bug. change to 0.9.34
winlin e02293d94d fix bug of handshake with nginx-rtmp for forward, change to 0.9.33
winlin 1386e7a8ab fix bug of handshake with nginx, simple hs
winlin e56c52ceba change to 0.9.32
winlin 7b3bc8f741 fix bug of bwtc
winlin 644dfa1a6d fix bug of librtmp
winlin a9d11df3a3 update arm tool chain
winlin a6d9da5e43 fix bug of script, support both abs and relative path
winlin c3e750e90f add version to log
winlin bcb54e6587 fix bug of package arm
winlin 4992a9979a add package arm
winlin 7431c110fe package support arm package
winlin 0e54967fb8 fix bug of package, use uname hardware platform
winlin 3035e2b46a refine package, add os machine
winlin 494894a846 remove dev.sh
winlin ade3630fa6 add package and install script
winlin 34efa15118 change to 0.9.30, first release for srs1
winlin 9055d8eecf update readme.
winlin cb1499fcb6 change log strategy, write log to file. change to 0.9.29
winlin ed20bd7078 default write log to file.
winlin 76290a5a12 fix bug of get daemon
winlin 7930add7f9 add log tank config, default to console.
winlin b290a00de7 refine log
winlin d9104f3b5e fix bug of make file
winlin f1477dc4fe support daemon, default start in daemon. change to 0.9.28
winlin 3ec3c1f532 support daemon
winlin 2c1354b9b9 fix bug of log message
winlin 56679b3c82 add srs_log_file to write log to file. change to 0.9.27
winlin d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27
winlin 4ddb5256ac fix bug of init.d script
winlin 2e1aed5403 rename init.d script to srs and srs-api
winlin 29fe53e21b fix bug of build cherrypy
winlin 73f1762122 fix bug of build cherrypy
winlin f3e4c16a2f copy ffmpeg when install-demo
winlin 22603b7465 add api-server init.d script
winlin d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26
winlin 62762cf1ad add reload support. add make install and uninstall
winlin 3c5878c980 rename ./etc/init.d/srs to ./etc/init.d/simple-rtmp-server
winlin 3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make.
winlin fdad7c25f0 fix isse : the gettimeofday jitter, log warn message
winlin 4f284b20f0 drop ts segment when duration is too small
winlin 5758551508 support hls republish
winlin f25c6558a5 write pid to ./objs/srs.pid.
winlin 0686b8fa5a update readme, add product wiki link
winlin a0c0c94cf0 refine conf, add comments for other listen type
winlin 2cebaff9d8 refine hls, ts temp file use ext .tmp
winlin dbf642723f update readme, add hls(audio-only) support to readme. update sample flv from h264+mp3 to h264+aac
winlin 8600c0ebe9 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlin e0fb1029c9 support pure audio hls. change to 0.9.24
winlin b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable.
winlin 2036cef43b Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlin ef7853d7f7 fix demo bug, remove the api server static-dir when link to nginx
winlin 6bc18f2e44 fix script generate auto header bug, always create file
winlin 8239174e97 update configure, change to 0.9.23
winlin 238349b0c0 update configure, change to 0.9.23
winlin 6374fa1383 simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof
winlin c63ad48893 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlin 822143b500 fix bug of build script
winlin a2c5075002 update comments for handshake.
winlin a470330383 finish utest for handshake.
winlin 6b84a5e14c change to 0.9.22
winlin b7d40b5aba support vn/an to disable video/audio, for radio streaming
winlin 747bbd988e change to 0.9.21, refine complex handshake, client/server support complex handshake.
winlin da93b6fe99 add complex handshake utest
winlin 491ea4b630 support client complex handshake with server
winlin 841f0f8899 change to 0.9.19, verify the s1/s2/c2, refine the handshake.
winlin 152d3539d8 add s1 validation for client/server
winlin 12445174e7 add option --static, to static link for arm
winlin efa22074be always use static link, for manually build arm, and x86/64 use static link is ok.
winlin e0e451b680 add utest support for arm
winlin d89d16ca1e print the system info when startup main
winlin 2eeb289c2f assert system is little-endian
winlin b58ab508f9 add rtmp handshake utest, for arm to finger out the bug
winlin 1c055e7424 add log for ssl disabled.
winlin 1ffbdbc098 refine log, donot show error when client gracefully close it
winlin b52a051d80 refine readme, confs
winlin a0b747621e update srs.conf, add comments to see full.conf
winlin b36338853a refine the conf files, rename srs.conf to demo.conf
winlin d67edf631b update readme, add ubuntu12 to test list
winlin c85dde7f3f substitute all TAB with 4spaces.
winlin e5770b10b1 refine the colorful log for srs. remove the log when client close.
winlin 8029b7464a Merge pull request from wenjiegit/master 
merge from wenjie.zhao for colorful log.
winlin 618f6f52ae fix bug of librtmp sample on x86/x64 platform
winlin 1a3142d23b fix bug of librtmp sample build for arm, use static link
winlin 618579e484 refine srs build for arm, support librtmp sample
winlin a29bd05c0f refine build script
winlin 71adff776b fix build script, remove unused build tool defines
winlin 77e652fcbe refine buils nginx script
winlin 421fbd4c3e fix bug of arm build script__SRS_BUILD_NGINX=NO
winlin 3721e72e99 arm: change to 0.9.18
winlin 5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.
winlin ad05eec7a2 arm support librtmp
winlin a9da5903f6 arm support ssl/hls, change to 0.9.17
winlin 75340e3ac0 add refer for arm research code
winlin 7744053d28 add arm research files, change to 0.9.16
winlin a90cb9dd84 fix ubuntu build warning, the config unused setter
winlin 010b5c0d7a fix ubuntu build warning, the config unused setter
winlin 04cc29f4e1 support ubuntu make colorful display
wenjie.zhao 109ce07c1b color text of error msg supported. 
strerror msg supported.
wenjie.zhao e0e3504e1d color text of error msg supported. 
strerror msg supported.
winlin 98c9002b41 remove the patch for st for arm
winlin 24be5fb386 add http 1.0 and 1.1 specification
winlin 7112c6ac73 add http 1.0 and 1.1 specification
winlin b9613fd0d1 update readme, add wiki sample:transcode2hls
winlin e6e32f963c add wiki Usage: Forward and Realtime
winlin 3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK
winlin c1149607c9 simplify usage
winlin 4a8ee0f6e9 fix bug of stop script
winlin 2fa0d60186 simplify usage
winlin 13d9b44c73 simplify usage
winlin 431b0fb31d add FMLE snapshot
winlin 91c1a2cd28 fix ubuntu build bug, add --force-yes to install
winlin f6126c5ad2 fix ubuntu build bug, add --force-yes to install
winlin 387be8fa3b change to 0.9.15, finish amf0 utest
winlin 9521fbfaaa change version to 0.9.14, finish amf0 basic utest
winlin 95c2e7fd63 amf0 utest: finish basic utest for amf0
winlin 044138c39e refine summary for amf0 hpp
winlin 9fd48d84c1 refine amf0 object size to total_size, elem count to count
winlin 59db1dd260 utest for amf0 object, refine the count of elem
winlin 8ed9ae6242 amf0 utest: remove the object read/write function, directly use object to read or write.
winlin a3ae871360 refine code, array to ecma_array.
winlin 3129c738cb amf0 utest: refine interface of amf0, only export required objects
winlin b55efef2ee amf0 utest: finish amf0 any read/write utest
winlin 609114a5fe amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself.
winlin 3691c106fa amf0 utest: add usage for amf0
winlin 34f94a1be3 amf0 utest: add object and ecma array create function.
winlin f4aa2f30c1 amf0 utest: change version to 0.9.13
winlin 4306db099d amf0 utest: elem read/write refined
winlin bfe771bbba amf0 utest: null,undefined,object-eof to any
winlin e40be6e89d amf0 utest: boolean to any
winlin 4a0023ae63 amf0 utest: finish utest for string to any
winlin cae8228b09 amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead
winlin 57ce04ae12 amf0 utest: remove struct use class instead, move class together
winlin 404207db4f amf0 utest: refine amf0 size and finish utest.
winlin db7a113441 amf0 utest: refine amf0 size and finish utest.
winlin 3083759273 amf0 utest, refine amf0 size and object/array read/write
winlin 48343e4f3a refien build script, regenereate all options. change to 0.9.12
winlin 1892245db6 add option bwtc, to enable or disable the bandwidth test tool
winlin 0a2b8b797d support disable the librtmp
winlin 179e2a2bba use zip format
winlin 59a2d5e7e0 add --with-gprof support
winlin 42ad264182 add gprof files and dot files
winlin 6e0bebdacf full support gperf gmc/gmp/gcp
winlin 8cd1c11add change forward schema
winlin bef7e20ed9 fix rtmp protocol bug, use 31bits timestamp
winlin c89aea8af7 fix rtmp protocol bug, use 31bits timestamp
winlin 741d6f97f6 support gperf memory check(gmc).
winlin 489a492e47 add url for gperftools
winlin 10852acb25 refine gperf build script
winlin dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally
winlin 03a14e2e1a add gperftools for mem leak detect, mem/cpu profile.
winlin ee7fafe465 add gperftools demo: heap check and profile, cpu profile
winlin 9896842b05 add cpu profile
winlin 4061f0db58 refine the profiler
winlin 7239963780 add heap checker and profiler demo
winlin 0b17b2a481 build gperftools
winlin 34e913c58f add gperftools for mem leak detect, mem/cpu profile.
winlin 9d08b42c82 change version to 0.9.11
winlin 8bdf98afa5 refine the multiple processes architecture, remove the isolate bandwidth test process
winlin a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish.
winlin 1ccddf4cfc add gest framework for utest, build success.
winlin 338e129a29 add utest build project, no testcase.
winlin fe5811304b add utest script to generate the utest Makefile
winlin 02326cd844 support build with jobs
winlin 52b6ab3f2f support build with jobs
winlin 128783ded3 add build summary colorful display for each feature.
winlin 47aee8dce0 add utest framework gtest
winlin 722e79003b merge from xiangcheng.liu, memory leak in amf0
winlin d622da3b44 update readme, finish modularity and wiki, change to 0.9.10
winlin 880f4f5dc2 final the modularity, rename the app module.
winlin c1086f8a9d srs-librtmp: finish the simple publish and play sample.
winlin efa09102cf srs-librtmp: implements the read packet.
winlin c338eb3666 srs-librtmp: implements the publish and play.
winlin fce26d6690 srs-librtmp: implements play stream.
winlin 6b213b73eb refine code, rename SrsRtmp to SrsRtmpServer.
winlin 8aedc51a2f refine code, rename SrsRtmp to SrsRtmpServer.
winlin 4f91cae377 srs-librtmp: add complex handshake.
winlin 76f37baafe srs-librtmp: implements the simple socket stream.
winlin 86267f854c srs-librtmp: implements handshake.
winlin f24f27deb9 srs-librtmp: add make ssl/nossl support for sample
winlin b7a62ba131 use goto to free resource
winlin feaf0c5e89 librtmp: create socket
winlin f8335e2c1f extract simple socket to lib
winlin 5e4b7d3ae9 add colorful display for make.
winlin e14d3bb5df add colorful display for make.
winlin 40a5edb37f update readme.
winlin db22af07a0 change to 0.9.9
winlin fc9e3fd890 srs-librtmp define interfaces
winlin 44375b9e6b add srs publish/play demo use srs-librtmp
winlin 713b05541b add librtmp demo srs_publish
winlin aa5d28ed85 add library
winlin d5a02a55ee unify code style
winlin 7d570fb4f3 use fast log
winlin 382fd127e4 rename config and pithy-print to app module.
winlin b407021d45 move config to app, for its application level features
winlin 517d346a52 change macro for all rtmp protocol files.
winlin 4c498b67da rename pro to rtmp protocol.
winlin 8d5806154b add todo, to rename to the right name SrsRtmpServer
winlin 2074b50d87 move handshake and rtmp to protocol module
winlin 0296c8eff4 change to 0.9.6
winlin 4e3f7843fe rename protocol dir to pro. move rtmp stack to protocol module
winlin 4a8bc3b277 change version to 0.9.5
winlin 7dfc902b87 extract protocol io interface to prepare to extract the protocol from underlayer socket.
winlin a73dec4c41 refine code, rename ISrsReader to ISrsBufferReader
winlin 85cd1e1a41 extract protocol module, move amf0 to protocol module
winlin 7e14e7fa57 move pithy print to kernel
winlin fddd60b962 change to 0.9.4, extract kernel module
winlin c0dbee0854 move buffer to kernel. extract ISrsReader for buffer
winlin 8fea433450 move stream to kernel module
winlin cb99de4462 move config to kernel module
winlin 5e14aa9c13 fix the macro bug
winlin b0d20f57e1 move reload to kernel module
winlin 39d3425691 extract log context, move log to kernel module.
winlin dea66a322d extract kernel module, depends on core and provides kernel service(no stream)
winlin bcbea86202 extract auto_free to core module
winlin 4e91a3d5aa extract core and app module.
winlin 62fbe9e760 refine modules, extract core module
winlin c2ccb83912 rename core to app
winlin 6616dfecfc refine configure.
winlin 91d57ae7f9 refine build script, add comments for app.sh. change version to 0.9.3
winlin ac3be10435 patch st and srs for arm build, allow user to specifies the gcc/g++
winlin 7fa031e7fb fix bug of openssl, use objs/openssl/include
winlin a6f4815994 use local openssl and link libssl.a
winlin bcb719bf18 create log dir
winlin 985034860c add comments for depends
winlin 7e0cf2b9fc add comments for configure
winlin 979ee7d39c update config, remove the script to create logs dir.
winlin 72d477f466 support use other g++ when configure.
winlin cd7e6cc321 refine the configure, add comments
winlin b730fda176 add rtsp protocol
winlin 4aeed8df1d fix bug of SrsFMLEStartPacket command name, set_recv_timeout(SRS_PAUSED_RECV_TIMEOUT_US)
winlin 797d548766 fix bug of comment, change version to 0.9.2
winlin 980b53dfbe change version to 0.9.1
winlin 745797365e change version to 0.9.1
winlin 39f15ba3da refine the comments, fix bug of parse message
winlin 73b298cab5 fix bug of connect app response data
winlin 11c5b2cf14 refine code, use RTMP_FMT_TYPE0 instead
winlin 7a91826732 refine code, use RTMP_FMT_TYPE0 instead
winlin 8697adacd9 fix compile warning on 64bit centos
liuxc0116 490033f601 forget delete memset 
at last modify,forget delete memset(payload, 0, size);
liuxc0116 81e085dd1b memory will leaks 
the payload pointor assigned two memory,will lead to memory leaks
winlin 527abe2157 update readme
winlin 1d3621dc23 fix warning on 32bits centos6.
winlin 5a9a15f796 Update srs.conf
winlin 574536d9ed merge wenjie. fix jw/flower player pause bug, which send closeStream actually.
winlin 29a97152fa fix bug of compile ts_info on old gcc, add LL to large number.
winlin b54aefe897 update script
winlin 47dfdd3ae2 update readme
winlin 63388e8ac3 merge from wenjie, fix the flower player play bug, play(reset=amf0-number)
wenjiegit a91ffb1e11 update master
wenjiegit 6d2e1c95da update master
wenjiegit 8d808d8868 update master
wenjiegit 54bd613cf5 update master
wenjiegit d05f69b247 update master
wenjiegit f387b2b569 update master
wenjiegit a0fc4e5f25 update master
wenjiegit e981cde90c update master
wenjiegit f8a7db51f2 fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]
wenjiegit 276b60200f fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]
wenjiegit bfef0eebfe fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]
wenjiegit e959bb6c5c fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]
winlin 993c5daec7 chunk size default to 60000, high performance. set chunk size when forward
winlin 4d631d749f fix ts_info centos5 build bug
winlin 4955425be9 fix the listen backlog bug, change from 10 to 512
winlin 3dbb2132d3 change server timeout longer, recv timeout from 5s to 30s
winlin 99b9fa0c25 fix the forwarder dead when st_thread interrupt at st_usleep, check thread->can_loop().
winlin fabdf9507e fix bug of play stream of nginx, remove the start slash of streamName.
winlin 273bdb2242 update flash client.
winlin dba7329682 refine readme.
winlin 0b7c7240e6 refine the authors and license
winlin bb3c88fef7 change copyright from 2013 to 2013-2014.
winlin 649419c1aa refine the utility of js.
winlin c221eb61c4 fix bug of bandwidth test, donot use vhost in query
winlin 5537f9b066 fix bug of bandwidth test, donot use vhost in query
winlin df349da7d9 fix bug of bandwidth test, donot use vhost in query
winlin 89ac091c35 fix bug of bandwidth test, donot use vhost in query
winlin 62f1f23991 fix bug of bandwidth test, donot use vhost in query
winlin 7901b481e4 change ui version to 1.19
winlin 19f9342034 refine bandwidth test
winlin 20d1732ced merge from wenjie, the bandwidth test feature.
winlin 6bba081485 update the stop/start script
winlin 51686b91d2 change ui version to 1.17
winlin 2e58de393a refine the ui of chat, to 5x3+1
winlin 5cec967931 refine the index. refine the parse_query_string, add user_query object to result
winlin c51842aa9a jump nginx index to api-server, for ie crossdomain.
winlin b6280f3804 jump nginx index to api-server, for ie crossdomain.
winlin c23b133fdc support query in index.html
winlin 702ad69817 support query in index.html
winlin 7094b6f437 set default to chat.
winlin 531fa6fb76 change ui version to 1.15, fix the publiser bug, support chrome/firefox/safari/ie browsers.
wenjiegit 3af83fb02a add linux version of band check app; add web version of band check app
wenjiegit 237fb13e1b add linux version of band check app; add web version of band check app
wenjiegit 7b5ac6367f add linux version of band check app; add web version of band check app
winlin 4b4f317e09 refine the ui, link the players to the api server static dir
winlin 7b2f9d59a2 fix bug of identify the truevision camera
winlin ec5e33f3bc refine the filter of camera and microphone
winlin b1fe298def change ui version to 1.13
winlin 962deefb92 refine the ui of chat.
winlin 70dc3dbb53 layout the chat in 2x8 table
winlin 3ab867d907 fix bug of player dar.
winlin 836bc413f9 fix the bug of publish, server close the connection when timeout.
winlin ffda615124 auto play, donot scale audio volume
winlin f308cc39ef change volume to 2.0
winlin 4b12724abc change ui version to 1.11
winlin b36d31b84c extract the components of js
winlin e64a11943b extract the components of js
winlin cb0c7dcf2e fix the bitrate bug(in Bps), use enhanced microphone.
wenjiegit c7cd726f1b merge upstream
wenjiegit 00fb37a831 merge upstream
wenjiegit 3753e8c5f1 merge upstream
winlin 5636fc7ca2 update ui, remove the collaps of local video.
winlin 47e173bf24 refine the build result.
winlin 2cefe1a9bb refine the script, add build/run/stop
winlin 1783e1f764 refine js, move the consts to the head of srs.js
winlin 46eb1ebd6b refine the srs js player and publisher, add private object
winlin 116129d1c6 refine the pages, use this(means the player object) in the callback
winlin 6b99a749ea refine the chat, use players_pub_rtmp without hls and gopcache, low latecy
winlin 0846f05e6a add scripts
winlin 8e95227ada update ui version
winlin 12586f793c update reame
winlin 6875b6f5f2 support chat room, meeting.
winlin e9a88e6b43 remove the wizard control, too complex
winlin 593d16446e add bandwidth workflow
winlin 908f0d87e9 add bandwidth workflow
winlin 084ad79534 refine the bandwidth test
winlin 9455181790 merge from wenjie, support banwidth test.
winlin bad6f0d3a8 revert the copyrigh, only when commit feature, add the copyright field
winlin dfb3e117f8 add contributor to core.hpp
winlin 725ff8e5a5 merge from wenjie: support set chunk size at vhost level
winlin 309322fd5c update the bootstrap wizard, use v2
winlin 2bc4bd8913 update the publisher, to auto prompt the dialog to get the publisher.
winlin b628b5e7a4 fix bug of dar and fs size.
winlin 4c325261f7 add low latecy player
winlin dd5aa36ba6 add low latecy player
winlin 01a02d2eff refine the tips of ui
winlin 4b74435e89 fix bug of resolve vhost, must strip then get from config.
winlin 96f9a40ca3 update version of ui
winlin f70d9b101f update version of ui
winlin ee79f4a52f update the conf, add demo.srs.com, add players and players_pub, add __defaultVhost__ for rtmp
winlin 632255f08f update the signature, when connect to server, parse the response.
winlin cb55f23363 update the publish link
winlin ec29cc0925 refine the publish url.
winlin 825215f7e5 add primary button, refine readme.
winlin a744308e97 use version to anti swf cache.
winlin 0967ec5e2f use version to anti swf cache.
winlin 4a31ac3e25 filter the first non-virtual camera
winlin e9ec22e66e use timestamp to stream
winlin a6e2f19a0f support publish
wenjiegit 9a70ce7865 add bandcheck code and modified srs code for merge
wenjiegit adb169eaf1 add bandcheck code and modified srs code for merge
winlin 85515f05d3 rename the title
winlin 7a21427b10 override the default nginx page. jump to players page.
winlin 66ea34c514 refine the ui buffer effect
winlin 821e7e01df refine the ui buffer effect
winlin 65a5f4d460 refine ui, unify the player size
winlin 21c6001210 add buffer time and play time display
winlin 065cbbe4aa add fullscreen event and rescale
winlin 02f46d6fcc update the srs player, set the DAR.
winlin 190540683a update the srs player, set the DAR.
winlin 11cd5c640f update the srs player, set the DAR.
winlin b5c17e2338 update the srs player, set the DAR.
winlin 42ec5f19fc update the srs player, set the DAR.
winlin 5bfb561f89 add srs player
winlin 40c1298476 add srs player
winlin 6beff7cf54 fix build script bug, create nginx/html/live dir
winlin 609a8fa472 update depends script
winlin 764aa9b40a refine the build script
winlin f019eb303c add crossdomain.xml
winlin 0c08942fec update the ui, add hls player
winlin 6e4795ee5c extract the srs.js
winlin ff4b28f4d4 extract the srs.js
winlin 4400fc8d0b add srs_publisher
winlin 1c04e35924 refine the ui, add osmf/jwplayer
winlin 5e9915bd15 add players to nginx
winlin c4477cd64f add players to nginx
winlin 9080c2e559 ensure the HLS(ts) is continous when republish stream.
winlin e262147e81 fix the hls reload bug, feed it the sequence header.
winlin 27255a3e7a refine protocol, use int64_t timestamp for ts and jitter.
winlin ce4928cef6 support set the live queue length(in seconds), drop when full.
winlin 5836ffd2d4 refine the forwarder, use srs message queue
winlin c47f07c69a refine the consumer, use srs message queue to shrink message when overflow.
winlin b4093bfbe4 support set live queue length
winlin 270041b225 fix the forwarder reconnect bug, feed it the sequence header.
winlin c7ec6f511c fix the script error
winlin 63cec6f967 update readme
winlin d911c85a12 add todo for the reload
winlin b3ef28f831 fix bug of get hls enabled config
winlin fb67f91167 support reload the hls/forwarder/transcoder
winlin aaba290c1d add reload readme.
winlin b90b64954e support reload the forwarder
winlin 7622878979 support reload the gop_cache
winlin 2f397d0460 support reload the gop_cache
winlin e2bb38c483 support reload the removed vhost
winlin f016914ac1 rename SrsReloadHandler to ISrsReloadHandler
winlin 010b7a7595 refine config.
winlin 5b29d0ec42 refine the config
winlin 3dd7156f0d refine the config buffer.
winlin ac5ccbc77e refine the thread model for the retry threads
wenjiegit 94fb022ef9 merge srs.conf
wenjiegit c87e55a2cc merged master
wenjiegit 25caf5db36 for merge
wenjie 6e9f375606 +server support band check +every vhost can have it's own chunk size
winlin 6329284b39 add todo for the bug of forwarder
winlin 7baa53a8d6 add todo for memory increase when forwarder server failed.
winlin ff9c434eb9 add todo for memory increase when forwarder server failed.
winlin 66048cebbb add todo for source
winlin ae18c388c1 fix bug of build script on centos
winlin 5d349882bb update build script for ubuntu
winlin 86e30ec2c9 update build script for ubuntu
winlin bb90881489 auto install depends software for ubuntu or centos.
winlin 5d50bdc3fc update build ffmpeg script bug for ubuntu, remove the opencl from x264
winlin 8887754b17 change version to 0.9 dev
winlin c618229487 regression test ok
winlin 3fd3ac5a11 support http hooks: on_connect/close/publish/unpublish/play/stop.
winlin 889ad9238b support http hooks: on_connect/close/publish/unpublish/play/stop.
winlin 3d4474f620 support multiple http hooks for a event.
winlin 2887cda176 support multiple http hooks for a event.
winlin 30099dfa09 support multiple http hooks for a event.
winlin 9f3139c5c3 add comments for api server
winlin a478452f57 support http callback hooks: on_connect
winlin 65fde21e6c add http client
winlin bb22c3b5cd add http library, support in build script
winlin 3600be9796 add http callback in config
winlin d3cee00b3b add cherrypy api server
winlin 4b9eabdf01 udpate files.
winlin 263213d8b6 update version, add build date
winlin 3b09f9bea9 support audio transcode only, speex/mp3 to aac
winlin 2d592d177d refine the signals of ffmpeg.
winlin 71895a4da6 fix the ffmpeg kill bug, wait until ffmpeg quit.
winlin cab88dfe70 hls support multiple publish/unpublish. disable hls when not support
winlin 679e851f07 support max_connections, drop if exceed.
winlin 4827777035 fix the build ffmpeg script bug, add yasm to path when build
winlin 86b1f3349a fix bug of forward, erase msgs when error
winlin 89c0170850 fix bug of forward, earse the forwarded msgs.
winlin 8c5661b9ff fix bug of hls muxer, support close/open/flush even muxer is closed.
winlin 6207a2f19e fix the rewind bug, support republish by restart the ffmpeg encoder.
winlin b9440df745 add encoder/hls pithy print
winlin 464d78b762 add todo for ffmpeg
winlin 113731dd6b reap the transcode process
winlin b5bba29768 refine hls, extract ts cache for ts cache audio and flush once
winlin 1c2f5052dd refine the hls muxer module
winlin b4eb38c86b refine hls code, reorder classes.
winlin d6897205c7 add todo for protocol
winlin a2e6e6718e fix the m3u8 crash bug, simplify it
winlin 2b0bef18ed add todo for forward
winlin 09f9811a97 fix the hls crash bug
winlin 6f0bba9856 add todo: cycle all process, reap the exited
winlin 2695e4d0c6 fix bug of core
winlin 6af0794bab support dead-loop detect for forwarder and transcoder.
winlin e4ea965a3a update conf
winlin 9d65cd1c9f change server name to demo, dev used for development vhost
winlin 35676920be convert to unix format
winlin 18028ad4cb update readme
winlin bf18a3ac96 change demo video to 200kbps
winlin bbf7b9bb01 disable the forward for bug. update the steps
winlin 41fcda1d86 use hosts to play stream
winlin 5502344e85 add forward sample
winlin 5cc1ad6da8 add drawtext filter sample
winlin 1da09e5ffb add sample video
winlin a7c83b1aee support ffmpeg filter
winlin 9a0d8855d8 support ffmpeg filter
winlin f85b70966c rename global username and email
winlin 951cd08f1f refine the params
winlin 407801b8a6 add ffempty
winlin b88596b6dc update readme
winlin 601a69aa70 update readme
winlin 52e6115f9a update readme
winlin 525af4599f support live stream transcoding by ffmpeg.
winlin ee18b9f537 add ffempty
winlin 2be9ef2a8b add research empty ffmpeg
winlin 06278176dd add research empty ffmpeg
winlin 80a81b1661 parse ffmpeg params
winlin ce15f4bce3 update encoder framework
winlin 8d91561ca0 add ffmpeg transcoding framework
winlin b1466c8883 fix build ffmpeg bug, add -ldl compile option
winlin 129244aafa change x264 from 10bit to 8bit
winlin a086e2bbfa add transcoding params to config
winlin 57064237d0 rename author to contributor
winlin 9a582b0e4a refine the configure
winlin ad618702aa add ffmpeg build script
winlin 041ce8f18f add ffmpeg build script
winlin e4840d4480 add ffmpeg build script
winlin 14c2585cc3 add build ffmpeg script
winlin df53681a07 add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2.
winlin 93fec0997f add ffmpeg2.1
winlin 790294f437 add authors
winlin 28572b009a remove the clock msg from log
winlin 5d69236bff convert to unix format
winlin db405b7e0e support forward stream to origin/edge
winlin f656087d74 add forward framework
winlin 2fa7610f9c add rtmp client
winlin 844718c99b refine the forwarder
winlin 1f8bb0e935 add forward st thread
winlin f09d457644 add forward framework
winlin c76043f95b add ccache zip
winlin eddef96479 add +x for build ccache script
winlin 3515af9dff add tools
winlin de95bf74b1 refine source, extract gop cache, add srs forwarder.
winlin 023e23bc82 add performance test
winlin ecebedfed2 refine code
winlin af5e7f002f fix the memory leak error
winlin 005f821441 fix bug of hls conf detect
winlin 3877ab0ff2 fix bug of hls conf detect
winlin a26c28334e update readme
winlin 1653e444dd add comments for auto ptr message
winlin 90af450d63 add todo for response client detail error
winlin 62a2384a35 check publish streaming available
winlin ec5cb39b96 add options --with/without -hls/ssl
winlin f8855cfcbb fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio
winlin d631882d34 use nginx-1.5.7 for security hole fixed
winlin c78baedf4e fix bug of 0.5 release.
winlin 94623c0cee fix bug of shared ptr, must copy the payload for it free it.
winlin 758dff0e97 fix bug of hls, close the muxer when segment finished
winlin 00ec634d56 support hls_fragment and hls_window
winlin 04cfe20279 support HLS, refine the dir use app
winlin 57ea56970d add nginx and used as http server
winlin 0c72c56f74 support HLS(m3u8)
winlin 749b7bdb2a refine hls, support time jitter detect and correct
winlin 326713fbed refine code, extract the rtmp jitter for hls
winlin 501b182dc9 refine code, write audio immediatly
winlin dbdfb29de1 refine code, remove the base dts, donot drop start BP frames
winlin b4235582dc refine code, remove the base dts, donot drop start BP frames
winlin 9e5b3afcbe update readme
winlin 7ed20cc670 support write ts file
winlin 164392f6aa fix bug of ts_info
winlin d5b84b5e20 refine ts code
winlin 38e66be490 fix ts audio bug, aac adts header and PES_packet_length fixed
winlin 4fca914694 support write ts file
winlin ca6720aab2 add time to write ts file
winlin 385394315d add ts mux framework
winlin 4af3982721 add ts muxer to write hls/ts file
winlin ce021b25c7 update the config file format
winlin bb775ef7bd update the ts_info
winlin adb7572c8c print the nalu of avc
winlin 19f16ba7a8 remove the analysis doc for ts
winlin ecc8688455 ensure sequence header is ok when parse avc/aac data
winlin c243ad3282 avc/aac demux the flv samples
winlin fcfd51ee20 decoded audio and video. add avc file format doc
winlin ba234e8741 add avc format doc. decode the flv codec info
winlin b87318dec0 extract method to process publish message
winlin 195a857f22 nginx never keep the metadata.
winlin 4f3cdd51c1 change metadata. add hls class.
winlin 200a6a6975 add hls config
winlin e3e0db9bb1 fix the format to unix without x
winlin 235e3cc120 add comments for PES packet length is 0
winlin 2c4c91d821 convert format to unix
winlin 145eb7bf29 convert ts_info to unix format
winlin 14211d884a add comments for ts_info
winlin cdd548004c rename ts_info.cpp to ts_info.cc
winlin 37e53f3735 add ts PCR analysis, the tool MPEG-2-ts-packet-analysis.2.4.5.0 decode PCR wrong
winlin 71015dc4a1 fix bug of aac demux, make same to ffmpeg, demux success
winlin c7e5bc0264 add ffmpeg demuxed dts/pts doc
winlin 26c24b7bdc add ts dts/pts analysis
winlin 08d745f1cf remove the flv muxer
winlin 21b962e9ff rename ts to mpegts, for github parse the *.ts as typedscript
winlin f70894d2c3 demux aac from ts and write to file.aac
winlin a0ecc5a305 finger out the PES_packet_length is 0
winlin dc7f2cff86 remove the unused h264 enums
winlin 3913e46ba5 fix bug of ts_info
winlin af5ce26746 finger out the ts audio/video package for AACADTS and H264NAL
winlin 54a1116f7a add ts analysis file
winlin 974af0605b fix protocol decode PCUC packet bug, requires 4bytes
winlin bc8828a7de update the random generater
winlin 4bba9ddcbb add ts_info doc
winlin c350a182b7 link the -lcrypto
winlin d1e20dc866 fix the global static instance error, use function to get server
winlin c79372417d parse the aac ADTS packets, add h264 doc
winlin f667351095 add aac specification, iso-13818-7
winlin 1ae03a2ba0 parse video/audio message
winlin 6b75390476 add Makefile for ts_info
winlin 6d4e4d3da2 update the ts_info, parse the PES packet
winlin b2fe7fb8a1 update ts_info, parse the PES packet dts/pts.
winlin a47a53f271 update the ts_info parse the PMT and PES header
winlin 89332789d1 update ts_info, parse header, adaption field and PAT
winlin 611d2a7e46 update ts_info, parse header, adaption field and PAT
winlin 741564b809 add reference doc from vb
winlin c621be2247 add ts_info.cpp for HLS research
winlin 732b2bbc6e add hls specification
winlin d06d83fb96 add rtmp players
winlin 8745ab542b add rtmp players
winlin ff565c4d9b fix bug of amf0 decode
winlin bf1113dad7 add log for update video/audio sequence header
winlin 687d190da1 reset the audio sample size and video frame size when unpublish
winlin 0645f5e927 calc the delta for time jitter for video
winlin 8f528ae5b2 v0.4 released. 12500 lines.
winlin b855caa045 refine handshake, pithy print clock
winlin 3669419e4c support config and reload the pithy print.
winlin 6c3b5943e9 add reload config comments for config.
winlin 0813104c6e support reload config(vhost and its detail).
winlin aef2fe9db5 support reload config(vhost and its detail).
winlin 68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1).
winlin ed3525056c support config the chunk_size.
winlin c78af697a1 support pause for live stream.
winlin c77695ce55 add comments for extended-timestamp, always send the extended-timestamp even chunk type=0x03
winlin 883b054f9d update readme.
winlin 6e62efb9e6 update readme.
winlin 751323fac8 release v0.3, 11773 lines
winlin 58d9677ddd support vhosts specified config.
winlin 9f94f891ad delete the cache when unpublish, when publish the encoder will update it
winlin a5339c2a27 refine socket buffer, append bytes to vector directly
winlin c0b6982e0d support listen multiple ports.
winlin 2aa15a1134 support nginx-style config file
winlin 8ee307b0b4 update configure, try to detect the tools
winlin a1a3a2eef9 add macro to disable the srs_trace
winlin b4427877f7 support pithy print log message specified by stage.
winlin 293399dcf5 fix bug of time jitter correcter
winlin 3aa6be8645 fix the timestamp bug. correct the audio diff by audiosamplerate
winlin 3accc969ab update the signature of server
winlin 3c8e1f8ff7 fix bug of extended-timestamp, support librtmp/ffmpeg publish
winlin 0ed8807727 support cache last gop for video
winlin 359c7da19b support flash publish
winlin 6d385f15a7 refine code, add todo command
winlin 24a54a40e8 refine code, add prefix srs
winlin 53a668e34d support h264/avc codec by rtmp complex handshake(SrsComplexHandshake)
winlin f0f4837a97 define the structs for c0c1 complex handshake
winlin e6ca039dd6 add rtmp complex handshake classes
winlin 598aaa5c98 detect the video/audio codec, only cache the h264/aac sequence header
winlin 2987a24877 add TODO for complex handshake
winlin 2ee913bd70 update comment TODO for sequence header and fast-startup caching last gop
winlin 9da31de1c1 support decode user control message. response ping automatically
winlin 0a92faf2e3 update timestamp comments
winlin b40d0467a8 time jitter detect and correct, very simple algorithm
winlin e31e3d601d time jitter detect and correct, very simple algorithm
winlin 2a346c2398 support send acknowledgement when recv message.
winlin 5d1d0ff8bb update help
winlin a0a0da5f23 release v0.1, support FMLE/FFMPEG publish, vp6 codec live streaming
winlin 54b9c5d389 support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet
winlin 444a45facd fix bug to accept FFMPEG streaming
winlin 150489af51 support ffmpeg publish
winlin 584a427c2e dispatch video/audio/data to consumers
winlin 0a0d33335a rename base message to ISrsMessage
winlin 52a454c41b rename base message to ISrsMessage
winlin d8a99dde52 rename SrsSharedMessage to SrsSharedPtrMessage
winlin cdd843a641 rename SrsMessage to SrsCommonMessage
winlin c64ed83378 add shared ptr to video/audio/data
winlin 5af377e41d add shared ptr message
winlin 940d2f02eb basic media cache framework
winlin a24d0ecf0c support decode onMetaData.
winlin ed371d6e7e support FMLE publish streaming
winlin 33c586181d support fmle publish. fix bug of rtmp chunk stream.
winlin e598616e14 fix objectEncoding bug, default to AMF0, change to AMF3 if required.
winlin 99aa8bc087 support FMLE releaseStream, FCPublish
winlin 58a54176f7 support onStatus, RtmpSampleAccess, DataStart
winlin adc382ad48 support set chunk size, PCUC 4bytes packets
winlin af5961432d support createStream and play, identity the play client
winlin 5475d0e435 support ack size.
winlin 2e590e18f4 fix bug of send rtmp message
winlin 1beee1e970 support ecma array. connect app response.
winlin 8283ed465a support encode amf0 packet, connect app response packet
winlin 57dd58d557 send set peer bandwidth packet.
winlin 2abfcee10f support set ack window size.
winlin 1047e06bf3 encode packet and send out
winlin a2d2fa1a25 log the req.
winlin bd64ae8257 refine the protocol and amf0, extract the template method as global static method
winlin 2c53134bbb connect vhost/app packet decoded.
winlin df400ef1c5 connect vhost/app packet decoded.
winlin 2886672347 amf0 object decode framework
winlin 810bb6ba38 decode amf0 string
winlin a638ebd1c6 decode the amf0 command message: connect.
winlin 63bf9e112d decode the amf0 command message: connect.
winlin 25468e4ff8 refine buffer read socket logic.
winlin 496c5ecfde add amf0 decode framework.
winlin f5672998fd expect rtmp packet which decoded from message payload
winlin bf5378434f decode chunk stream to RTMP message
winlin 2625ecc151 decode message header
winlin f730ccbf9f decode basic header
winlin 393e32ee0f add rtmp specification
winlin bd66702299 add rtmp specification
winlin 9541ac1e35 add log macro use __PRETTY_FUNCTION__ for c++
winlin 49a7cb9afb refine comments.
winlin 56e78bdf6f add comments. refine naming
winlin a323483bea add protocol stack
winlin fbe6e061c0 simple handshake(specified by rtmp protocol v1.0) success
winlin 3976a17841 add auto free. recv c0c1
winlin 0609eeb7c8 add socket rtmp and buffer. rename logs
winlin d4b6178f0f get peer ip and add rtmp class
winlin 96e1de255c close fd when delete connection object
winlin 973bea1e14 extract the rtmp connection
winlin d8a64603c0 support listen and accept framework
winlin 5b02f9c78b init st, add error code
winlin eb3b824e6c rename upp project
winlin a4c5f94b15 add copyright info
winlin 78c69016ba add srs_core.cpp
winlin 67d96fcab4 add log
winlin 7268dd15a1 add build framework