Commit Graph

529 Commits (34e913c58fad5ca89868c823162680fa757bc13e)

Author SHA1 Message Date
winlin cb0c7dcf2e fix the bitrate bug(in Bps), use enhanced microphone. 11 years ago
wenjiegit c7cd726f1b merge upstream 11 years ago
wenjiegit 00fb37a831 merge upstream 11 years ago
wenjiegit 3753e8c5f1 merge upstream 11 years ago
winlin 5636fc7ca2 update ui, remove the collaps of local video. 11 years ago
winlin 47e173bf24 refine the build result. 11 years ago
winlin 2cefe1a9bb refine the script, add build/run/stop 11 years ago
winlin 1783e1f764 refine js, move the consts to the head of srs.js 11 years ago
winlin 46eb1ebd6b refine the srs js player and publisher, add private object 11 years ago
winlin 116129d1c6 refine the pages, use this(means the player object) in the callback 11 years ago
winlin 6b99a749ea refine the chat, use players_pub_rtmp without hls and gopcache, low latecy 11 years ago
winlin 0846f05e6a add scripts 11 years ago
winlin 8e95227ada update ui version 11 years ago
winlin 12586f793c update reame 11 years ago
winlin 6875b6f5f2 support chat room, meeting. 11 years ago
winlin e9a88e6b43 remove the wizard control, too complex 11 years ago
winlin 593d16446e add bandwidth workflow 11 years ago
winlin 908f0d87e9 add bandwidth workflow 11 years ago
winlin 084ad79534 refine the bandwidth test 11 years ago
winlin 9455181790 merge from wenjie, support banwidth test. 11 years ago
winlin bad6f0d3a8 revert the copyrigh, only when commit feature, add the copyright field 11 years ago
winlin dfb3e117f8 add contributor to core.hpp 11 years ago
winlin 725ff8e5a5 merge from wenjie: support set chunk size at vhost level 11 years ago
winlin 309322fd5c update the bootstrap wizard, use v2 11 years ago
winlin 2bc4bd8913 update the publisher, to auto prompt the dialog to get the publisher. 11 years ago
winlin b628b5e7a4 fix bug of dar and fs size. 11 years ago
winlin 4c325261f7 add low latecy player 11 years ago
winlin dd5aa36ba6 add low latecy player 11 years ago
winlin 01a02d2eff refine the tips of ui 11 years ago
winlin 4b74435e89 fix bug of resolve vhost, must strip then get from config. 11 years ago
winlin 96f9a40ca3 update version of ui 11 years ago
winlin f70d9b101f update version of ui 11 years ago
winlin ee79f4a52f update the conf, add demo.srs.com, add players and players_pub, add __defaultVhost__ for rtmp 11 years ago
winlin 632255f08f update the signature, when connect to server, parse the response. 11 years ago
winlin cb55f23363 update the publish link 11 years ago
winlin ec29cc0925 refine the publish url. 11 years ago
winlin 825215f7e5 add primary button, refine readme. 11 years ago
winlin a744308e97 use version to anti swf cache. 11 years ago
winlin 0967ec5e2f use version to anti swf cache. 11 years ago
winlin 4a31ac3e25 filter the first non-virtual camera 11 years ago
winlin e9ec22e66e use timestamp to stream 11 years ago
winlin a6e2f19a0f support publish 11 years ago
wenjiegit 9a70ce7865 add bandcheck code and modified srs code for merge 11 years ago
wenjiegit adb169eaf1 add bandcheck code and modified srs code for merge 11 years ago
winlin 85515f05d3 rename the title 11 years ago
winlin 7a21427b10 override the default nginx page. jump to players page. 11 years ago
winlin 66ea34c514 refine the ui buffer effect 11 years ago
winlin 821e7e01df refine the ui buffer effect 11 years ago
winlin 65a5f4d460 refine ui, unify the player size 11 years ago
winlin 21c6001210 add buffer time and play time display 11 years ago
winlin 065cbbe4aa add fullscreen event and rescale 11 years ago
winlin 02f46d6fcc update the srs player, set the DAR. 11 years ago
winlin 190540683a update the srs player, set the DAR. 11 years ago
winlin 11cd5c640f update the srs player, set the DAR. 11 years ago
winlin b5c17e2338 update the srs player, set the DAR. 11 years ago
winlin 42ec5f19fc update the srs player, set the DAR. 11 years ago
winlin 5bfb561f89 add srs player 11 years ago
winlin 40c1298476 add srs player 11 years ago
winlin 6beff7cf54 fix build script bug, create nginx/html/live dir 11 years ago
winlin 609a8fa472 update depends script 11 years ago
winlin 764aa9b40a refine the build script 11 years ago
winlin f019eb303c add crossdomain.xml 11 years ago
winlin 0c08942fec update the ui, add hls player 11 years ago
winlin 6e4795ee5c extract the srs.js 11 years ago
winlin ff4b28f4d4 extract the srs.js 11 years ago
winlin 4400fc8d0b add srs_publisher 11 years ago
winlin 1c04e35924 refine the ui, add osmf/jwplayer 11 years ago
winlin 5e9915bd15 add players to nginx 11 years ago
winlin c4477cd64f add players to nginx 11 years ago
winlin 9080c2e559 ensure the HLS(ts) is continous when republish stream. 11 years ago
winlin e262147e81 fix the hls reload bug, feed it the sequence header. 11 years ago
winlin 27255a3e7a refine protocol, use int64_t timestamp for ts and jitter. 11 years ago
winlin ce4928cef6 support set the live queue length(in seconds), drop when full. 11 years ago
winlin 5836ffd2d4 refine the forwarder, use srs message queue 11 years ago
winlin c47f07c69a refine the consumer, use srs message queue to shrink message when overflow. 11 years ago
winlin b4093bfbe4 support set live queue length 11 years ago
winlin 270041b225 fix the forwarder reconnect bug, feed it the sequence header. 11 years ago
winlin c7ec6f511c fix the script error 11 years ago
winlin 63cec6f967 update readme 11 years ago
winlin d911c85a12 add todo for the reload 11 years ago
winlin b3ef28f831 fix bug of get hls enabled config 11 years ago
winlin fb67f91167 support reload the hls/forwarder/transcoder 11 years ago
winlin aaba290c1d add reload readme. 11 years ago
winlin b90b64954e support reload the forwarder 11 years ago
winlin 7622878979 support reload the gop_cache 11 years ago
winlin 2f397d0460 support reload the gop_cache 11 years ago
winlin e2bb38c483 support reload the removed vhost 11 years ago
winlin f016914ac1 rename SrsReloadHandler to ISrsReloadHandler 11 years ago
winlin 010b7a7595 refine config. 11 years ago
winlin 5b29d0ec42 refine the config 11 years ago
winlin 3dd7156f0d refine the config buffer. 11 years ago
winlin ac5ccbc77e refine the thread model for the retry threads 11 years ago
wenjiegit 94fb022ef9 merge srs.conf 11 years ago
wenjiegit c87e55a2cc merged master 11 years ago
wenjiegit 25caf5db36 for merge 11 years ago
wenjie 6e9f375606 +server support band check +every vhost can have it's own chunk size 11 years ago
winlin 6329284b39 add todo for the bug of forwarder 11 years ago
winlin 7baa53a8d6 add todo for memory increase when forwarder server failed. 11 years ago
winlin ff9c434eb9 add todo for memory increase when forwarder server failed. 11 years ago
winlin 66048cebbb add todo for source 11 years ago
winlin ae18c388c1 fix bug of build script on centos 11 years ago
winlin 5d349882bb update build script for ubuntu 11 years ago
winlin 86e30ec2c9 update build script for ubuntu 11 years ago
winlin bb90881489 auto install depends software for ubuntu or centos. 11 years ago
winlin 5d50bdc3fc update build ffmpeg script bug for ubuntu, remove the opencl from x264 11 years ago
winlin 8887754b17 change version to 0.9 dev 11 years ago
winlin c618229487 regression test ok 11 years ago
winlin 3fd3ac5a11 support http hooks: on_connect/close/publish/unpublish/play/stop. 11 years ago
winlin 889ad9238b support http hooks: on_connect/close/publish/unpublish/play/stop. 11 years ago
winlin 3d4474f620 support multiple http hooks for a event. 11 years ago
winlin 2887cda176 support multiple http hooks for a event. 11 years ago
winlin 30099dfa09 support multiple http hooks for a event. 11 years ago
winlin 9f3139c5c3 add comments for api server 11 years ago
winlin a478452f57 support http callback hooks: on_connect 11 years ago
winlin 65fde21e6c add http client 11 years ago
winlin bb22c3b5cd add http library, support in build script 11 years ago
winlin 3600be9796 add http callback in config 11 years ago
winlin d3cee00b3b add cherrypy api server 11 years ago
winlin 4b9eabdf01 udpate files. 11 years ago
winlin 263213d8b6 update version, add build date 11 years ago
winlin 3b09f9bea9 support audio transcode only, speex/mp3 to aac 11 years ago
winlin 2d592d177d refine the signals of ffmpeg. 11 years ago
winlin 71895a4da6 fix the ffmpeg kill bug, wait until ffmpeg quit. 11 years ago
winlin cab88dfe70 hls support multiple publish/unpublish. disable hls when not support 11 years ago
winlin 679e851f07 support max_connections, drop if exceed. 11 years ago
winlin 4827777035 fix the build ffmpeg script bug, add yasm to path when build 11 years ago
winlin 86b1f3349a fix bug of forward, erase msgs when error 11 years ago
winlin 89c0170850 fix bug of forward, earse the forwarded msgs. 11 years ago
winlin 8c5661b9ff fix bug of hls muxer, support close/open/flush even muxer is closed. 11 years ago
winlin 6207a2f19e fix the rewind bug, support republish by restart the ffmpeg encoder. 11 years ago
winlin b9440df745 add encoder/hls pithy print 11 years ago
winlin 464d78b762 add todo for ffmpeg 11 years ago
winlin 113731dd6b reap the transcode process 11 years ago
winlin b5bba29768 refine hls, extract ts cache for ts cache audio and flush once 11 years ago
winlin 1c2f5052dd refine the hls muxer module 11 years ago
winlin b4eb38c86b refine hls code, reorder classes. 11 years ago
winlin d6897205c7 add todo for protocol 11 years ago
winlin a2e6e6718e fix the m3u8 crash bug, simplify it 11 years ago
winlin 2b0bef18ed add todo for forward 11 years ago
winlin 09f9811a97 fix the hls crash bug 11 years ago
winlin 6f0bba9856 add todo: cycle all process, reap the exited 11 years ago
winlin 2695e4d0c6 fix bug of core 11 years ago
winlin 6af0794bab support dead-loop detect for forwarder and transcoder. 11 years ago
winlin e4ea965a3a update conf 11 years ago
winlin 9d65cd1c9f change server name to demo, dev used for development vhost 11 years ago
winlin 35676920be convert to unix format 11 years ago
winlin 18028ad4cb update readme 11 years ago
winlin bf18a3ac96 change demo video to 200kbps 11 years ago
winlin bbf7b9bb01 disable the forward for bug. update the steps 11 years ago
winlin 41fcda1d86 use hosts to play stream 11 years ago
winlin 5502344e85 add forward sample 11 years ago
winlin 5cc1ad6da8 add drawtext filter sample 11 years ago
winlin 1da09e5ffb add sample video 11 years ago
winlin a7c83b1aee support ffmpeg filter 11 years ago
winlin 9a0d8855d8 support ffmpeg filter 11 years ago
winlin f85b70966c rename global username and email 11 years ago
winlin 951cd08f1f refine the params 11 years ago
winlin 407801b8a6 add ffempty 11 years ago
winlin b88596b6dc update readme 11 years ago
winlin 601a69aa70 update readme 11 years ago
winlin 52e6115f9a update readme 11 years ago
winlin 525af4599f support live stream transcoding by ffmpeg. 11 years ago
winlin ee18b9f537 add ffempty 11 years ago
winlin 2be9ef2a8b add research empty ffmpeg 11 years ago
winlin 06278176dd add research empty ffmpeg 11 years ago
winlin 80a81b1661 parse ffmpeg params 11 years ago
winlin ce15f4bce3 update encoder framework 11 years ago
winlin 8d91561ca0 add ffmpeg transcoding framework 11 years ago
winlin b1466c8883 fix build ffmpeg bug, add -ldl compile option 11 years ago
winlin 129244aafa change x264 from 10bit to 8bit 11 years ago
winlin a086e2bbfa add transcoding params to config 11 years ago
winlin 57064237d0 rename author to contributor 11 years ago
winlin 9a582b0e4a refine the configure 11 years ago
winlin ad618702aa add ffmpeg build script 11 years ago
winlin 041ce8f18f add ffmpeg build script 11 years ago
winlin e4840d4480 add ffmpeg build script 11 years ago
winlin 14c2585cc3 add build ffmpeg script 11 years ago
winlin df53681a07 add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2. 11 years ago
winlin 93fec0997f add ffmpeg2.1 11 years ago
winlin 790294f437 add authors 11 years ago
winlin 28572b009a remove the clock msg from log 11 years ago
winlin 5d69236bff convert to unix format 11 years ago
winlin db405b7e0e support forward stream to origin/edge 11 years ago
winlin f656087d74 add forward framework 11 years ago
winlin 2fa7610f9c add rtmp client 11 years ago
winlin 844718c99b refine the forwarder 11 years ago
winlin 1f8bb0e935 add forward st thread 11 years ago
winlin f09d457644 add forward framework 11 years ago
winlin c76043f95b add ccache zip 11 years ago
winlin eddef96479 add +x for build ccache script 11 years ago
winlin 3515af9dff add tools 11 years ago
winlin de95bf74b1 refine source, extract gop cache, add srs forwarder. 11 years ago
winlin 023e23bc82 add performance test 11 years ago
winlin ecebedfed2 refine code 11 years ago
winlin af5e7f002f fix the memory leak error 11 years ago
winlin 005f821441 fix bug of hls conf detect 11 years ago
winlin 3877ab0ff2 fix bug of hls conf detect 11 years ago
winlin a26c28334e update readme 11 years ago
winlin 1653e444dd add comments for auto ptr message 11 years ago
winlin 90af450d63 add todo for response client detail error 11 years ago