Commit Graph

544 Commits (dd9a9b05d10c8facea1731df8a03a12ad87607c6)

Author SHA1 Message Date
winlin 1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 9 years ago
winlin 33a282e576 support snapshot by http hooks for #152. 9 years ago
winlin 3ab0ccaa27 Merge branch '2.0release' into develop 9 years ago
winlin 7cdcf41d26 refine the api server 9 years ago
winlin 4e88262512 merge from srs2 to check cpus. 9 years ago
winlin cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 9 years ago
winlin b78781707e update the srs player 10 years ago
winlin 5073a6fa08 merge from srs2 10 years ago
没——问题 e8680527c3 allow domain *
在使用时,srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
10 years ago
没——问题 c548ab5019 function set_srs_player_url(url, params)
在实际环境中,player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
10 years ago
winlin b25c45c643 refine srs player, support set the bufferTimeMax. 10 years ago
winlin dd21eee7f0 srs player show current time and url 10 years ago
winlin dfecfb65b1 support fluency and stream empty count 10 years ago
winlin fcd2d3d445 refine code for link generation from rtmp url. 10 years ago
winlin fe87bf1b61 support generate link page for rtmp url 10 years ago
winlin 018af55d65 refine the demo pages, move scripts after body. 10 years ago
winlin 170ad05148 add gfps and nb_packets 10 years ago
winlin e7714cd445 add packets interval in ms to set the right send_min_interval 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp. 10 years ago
winlin 93a1d097dc update jwplayer to support play HTTP flv. 10 years ago
winlin ac13817aae update donation 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin dbcd7d883b add script check_hls_backup.sh to research hls. 10 years ago
winlin 23b978c0bb merge from github 10 years ago
winlin 8fbc6526bb for #383, refine code to support mix correct algorithm. 10 years ago
winlin 0000c945ea refine the proxy api server. 10 years ago
winlin fe1886aa08 add proxy for hls 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin bd77f995bf ignore the unknown flv tag. 10 years ago
winlin 64b065e450 for hls callback, add duration of ts. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin 97442c56b6 enhance hls in floor mode. 10 years ago
winlin 76c1957260 enhance hls, increase piece one by one. 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 10 years ago
winlin f247ac9daf fix the http parse bug. 10 years ago
winlin 1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 10 years ago
winlin 1685cdd48e for #250, parse pes packet ok, ts message ok. 10 years ago
winlin 77e43d1813 refine comments of aac publish for #212 10 years ago
winlin a1f887f46f refine code, move onMetaData to consts. 10 years ago
winlin 04aa6f8296 drop script data except the onMetaData packet. 10 years ago
winlin 44f5efda21 refine the print info. 10 years ago
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg. 10 years ago
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin 45724bfaec update conf for transcode. 10 years ago
winlin 07b207b7e3 remove test code for api-server. 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin d171a26758 disable gop cache when not h.264. fix some warning. 10 years ago
winlin c5dd334645 fix the warning of ts_info 10 years ago
winlin ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 10 years ago
winlin e11fa383ca udpate the srs_bwt. 10 years ago
winlin 02778dba4c udpate the srs_bwt. 10 years ago
winlin a2af051840 udpate the srs_bwt. 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 3d97048c3a fix bug #217, add reuse conn to play different player. 10 years ago
winlin d80b580c2f refine librtmp, remove the _get_ for some attribute get. 10 years ago
winlin bb7a19636a fix the bandwidth file name bug. 10 years ago
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 10 years ago
winlin 10bc5399ec refine librtmp api, add prefix utils for utilities. 10 years ago
winlin b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 10 years ago
winlin d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 10 years ago
winlin a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 10 years ago
winlin 2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 10 years ago
winlin 278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 10 years ago
winlin 3292136f70 update research, flv ingester, support atc time flv. 10 years ago
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 10 years ago
winlin 0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 10 years ago
winlin 77cf885d8c add comments for #161 10 years ago
winlin bf5206d049 Revert "Revert "add test file to show the max open files.""
This reverts commit ea70f29648.
10 years ago
winlin ea70f29648 Revert "add test file to show the max open files."
This reverts commit c8673cd50e.
10 years ago
winlin c8673cd50e add test file to show the max open files. 10 years ago
winlin 8ab6b57612 research st, the timeout and coroutine scheduler. 10 years ago
winlin be46e428ad research st, for bug #193, remove the code with bug, exit when fork. 10 years ago
winlin f4dfee0e9f research st, add comments for bug #193. 10 years ago
winlin cd09fcaf55 research st, remove all events except epoll. 10 years ago
winlin 91f6dbe479 research st, add test for setjmp and longjmp. 10 years ago
winlin 4d4e840209 research st, add jmp_flow. 10 years ago
winlin 683b01a6c9 research st, add comments about the thread cycle 10 years ago
winlin 8327a57b7e never use stack variable for setjmp 10 years ago
winlin 2c01f7e943 research st, expand MD_INIT_CONTEXT macro, the thread start. 10 years ago
winlin 8da8c49f39 research st, add comments 10 years ago
winlin 2b70212649 research st, add stack struct comments. 10 years ago
winlin 6bde1e54dc research st, add stack alloc commnets. 10 years ago
winlin e49a868308 research st, rename variable thread to trd, for thread is a keyword. 10 years ago
winlin ac1a4ec0a3 research st, always alloc on stack. 10 years ago
winlin ae8b3e3c00 research st, remove the support of MD_STACK_GROWS_UP 10 years ago
winlin 340464ed56 research st, remove __ia64__ cpu support 10 years ago
winlin a27c3dca2d research st, add gdb info for setjmp. 10 years ago
winlin 4b24ee9db3 research st, only for linux and arm/mips/i386/x86_64 cpus. 10 years ago
winlin 606fc13a03 rename the confict macro to srs_lib_trace 10 years ago
winlin 5554922820 refine librtmp tools, use srs_trace macro instead printf. 10 years ago
winlin cf5c24af4a refine librtmp, unify all tools format and usage. 10 years ago
winlin 6de83db76e refine srs-librtmp log macro 10 years ago
winlin f92303c764 refine all research tools, remove the public header, add log to srs_librtmp.h 10 years ago
winlin 3358570be6 refine for bug#66, implements the usage. 10 years ago
winlin 0075779d38 for bug #66, refine the api to send h264 frames. 10 years ago
winlin cd5c58ba5f for bug #66, refine the api and demo. 10 years ago
winlin 1074c8d9b2 for bug #66, use new api to directly sendout h264 raw data. 10 years ago
winlin 6407baffd5 for bug #66, output the h264 frame type. 10 years ago
winlin 72ad6894ca move the annexb decode utility to protocol. 10 years ago
winlin bd25626f0e refine code for bug #66 10 years ago
winlin 1c237a821a add api convert h264 to rtmp packet, for bug #66 10 years ago
winlin e4af098d06 refine code for bug #66 10 years ago
winlin b964a6c534 update for bug #66, add the srs-librtmp sample for publish h.264 raw stream. 10 years ago
winlin 1db69b153e update the research of arm 10 years ago
winlin 0f41e0d26f research st: only support linux 10 years ago
winlin d67454ecc2 research st: only support linux 10 years ago
winlin 5fd308c64e update code, warning when compile dev branch. 10 years ago
winlin fa53250202 refine the macro, use int as version type. 2.0.8 10 years ago
winlin 8521762cb3 research st: refine sync. 10 years ago
winlin 3377df0bea research st: refine skt. 10 years ago
winlin 22710db911 research st: refine sched. 10 years ago
winlin f5f8e8946f research st: refine event, io and key. 10 years ago
winlin c38a545780 reserach st: refine key.c 10 years ago
winlin fd0c85b324 research st: refine io. 10 years ago
winlin f8f18fffa7 research st: update test for st. 10 years ago
winlin 0f293802c8 research st: refine the md.h 10 years ago
winlin 856ba07bd3 research st: update public and common. 10 years ago
winlin 315707d726 research st: refine public 10 years ago
winlin bba2d3dd98 research st: replace the TAB with 4spaces 10 years ago
winlin 55bd1dd95e research st: replace the TAB with 4spaces 10 years ago
winlin 0faa38dc0c research st: remove the osguess.sh 10 years ago
winlin 2dc6b7d1ea add io for st research 10 years ago
winlin 511c814ffb refs #182: rename to sync test. 10 years ago
winlin 69fdec411f refs #182: rename to sync test. 10 years ago
winlin 9aba47cbe3 refs #182: research st, add multiple threadds. 10 years ago
winlin 79ab9f05f3 refs #182: update the st, use cond and mutex. 10 years ago
winlin 388305f44c update st research. 10 years ago
winlin fb906f0afc revert the player for bug #185. 10 years ago
winlin 6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 10 years ago
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 10 years ago
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 10 years ago
winlin d24e2fd0cc remove supports for OSX. 2.0.1. 10 years ago
winlin d9b12b151c refine the makefile. 10 years ago
winlin b65df251c3 chmod +x *.sh 10 years ago
winlin 2f388d614f rename st-1.9 to st 10 years ago
winlin 7692373e02 remove the unused files. add upp project file 10 years ago
winlin 7f4c113e57 add st-1.9 to research 10 years ago
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin 7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 11 years ago
winlin f3e85a0063 refine the usage of csr. 11 years ago
winlin 5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 11 years ago
winlin 8984ba9d56 refine the usage of bwtc. 11 years ago
winlin 9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 11 years ago
winlin cc62d254f0 add librtmp bandwidth check/test client. 11 years ago
winlin e53655ee83 refine the build script 11 years ago
winlin 019b25ea30 add MIT license to bandwidth check/test as/js library. 11 years ago
winlin 3a1b3dd142 fix bandwidth bug, config item interval to float. 11 years ago
winlin d8ed7cc968 refine the js library for bandwidth test. 11 years ago
winlin 0707c24b54 refine the js library for bandwidth test. 11 years ago
winlin 2ff88b9bcd move js to srs_bwt. 11 years ago
winlin c319cc6a40 refine bandwidth test client, provides js and as library 11 years ago
winlin a888e52df1 donot mix the read and write for librtmp 11 years ago
winlin 1a7735182f refine the file stream, to file reader and writer. 0.9.142 11 years ago
winlin 55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 11 years ago
winlin aad42d7941 fix ubuntu14 build warnings 11 years ago
winlin 55b99c90c7 refine detect tool, support atc stream. 11 years ago
winlin 17cb8c4550 finish the research for python-subprocess 11 years ago
winlin b7d8be46a1 add research for usage for subprocess 11 years ago
winlin cccc483ab3 add bytes statistic for librtmp 11 years ago
winlin a639eb0596 fix bug of buffer assert, erase can accept any value 11 years ago
winlin d48d739fa7 fix bug of detect rtmp, add error code 11 years ago
winlin 4d9ed6f7fe refine the code, add comments to result to self interpret 11 years ago
winlin 8817823462 add rtmp detecter 11 years ago
winlin ef6efb821c add rtmp detecter 11 years ago
winlin 48adeeb1a5 fix the demo player html text 11 years ago
winlin e227bd3a0e remove the srs community 11 years ago
winlin 5273509554 refine log, to 0.9.123 11 years ago
winlin 7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 11 years ago
winlin 22968c85df supprt inject flv 11 years ago
winlin 4970664e37 move codec to kernel. 11 years ago
winlin 608083d42f add flv injecter, add flv codec to librtmp. 11 years ago
winlin 009de72a01 fix research bug, rename srs_freepa to srs_freep 11 years ago
winlin 6de81fdb1c refine fast id tracer 11 years ago
winlin 384687a36d add server ip to flash client. 11 years ago
winlin e39eed6519 add SrsPid and SrsId to client response, add pid to log 11 years ago
winlin 5ff1ce7cba for bug #87, response the server SrsId to flash. 11 years ago
winlin 14f0a2e046 for bug #88, add timeout for connect. 11 years ago
winlin 93c9c55fb9 remove the complex handshake of librtmp. refine makefile of librtmp tools 11 years ago
winlin b13bd70c86 http streaming support flv start index. 11 years ago
winlin cf7b6f25f6 add srs community 11 years ago
winlin bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 11 years ago
winlin 69eb935505 fix bug of flv parser, librtmp amf0 library 11 years ago
winlin d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 11 years ago
winlin f37faf7236 update librtmp, add amf0 parse functions 11 years ago
winlin 2a8db3ab83 refine the re of ingest flv, re cleanup always sleep 11 years ago
winlin 1d6b096ce9 adjust the deviation. 11 years ago
winlin 2265173c4d donot install tools when ffmpeg is not open, 0.9.108 11 years ago
winlin 7c804277b2 add heatbeat url, add stream for api-server 11 years ago
winlin 07fbd58f39 update api server, add meiyi demo streams. 11 years ago
winlin add64533e3 add donation user chen.chen 11 years ago