external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity
4153 commits 13 branches 107 tags 375 MiB
Commit graph

467 commits

Author SHA1 Message Date
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
77e43d1813 refine comments of aac publish for #212 2015-01-18 22:11:38 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
45724bfaec update conf for transcode. 2015-01-03 14:46:29 +08:00
winlin
07b207b7e3 remove test code for api-server. 2015-01-02 10:30:25 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
c5dd334645 fix the warning of ts_info 2014-12-01 20:54:19 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
e11fa383ca udpate the srs_bwt. 2014-11-25 11:09:28 +08:00
winlin
02778dba4c udpate the srs_bwt. 2014-11-25 11:05:45 +08:00
winlin
a2af051840 udpate the srs_bwt. 2014-11-25 10:59:38 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
d80b580c2f refine librtmp, remove the _get_ for some attribute get. 2014-11-21 16:08:29 +08:00
winlin
bb7a19636a fix the bandwidth file name bug. 2014-11-21 14:30:01 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
10bc5399ec refine librtmp api, add prefix utils for utilities. 2014-11-21 14:09:17 +08:00
winlin
b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 2014-11-21 14:03:30 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
3292136f70 update research, flv ingester, support atc time flv. 2014-11-15 15:27:19 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
bf5206d049 Revert "Revert "add test file to show the max open files."" 
This reverts commit ea70f29648.
 2014-11-11 17:02:16 +08:00
winlin
ea70f29648 Revert "add test file to show the max open files." 
This reverts commit c8673cd50e.
 2014-11-11 16:55:46 +08:00
winlin
c8673cd50e add test file to show the max open files. 2014-11-11 15:02:58 +08:00
winlin
8ab6b57612 research st, the timeout and coroutine scheduler. 2014-11-11 12:58:25 +08:00
winlin
be46e428ad research st, for bug #193, remove the code with bug, exit when fork. 2014-11-11 11:25:52 +08:00
winlin
f4dfee0e9f research st, add comments for bug #193. 2014-11-11 11:24:19 +08:00
winlin
cd09fcaf55 research st, remove all events except epoll. 2014-11-11 11:15:58 +08:00
winlin
91f6dbe479 research st, add test for setjmp and longjmp. 2014-11-10 16:50:36 +08:00
winlin
4d4e840209 research st, add jmp_flow. 2014-11-10 15:22:30 +08:00
winlin
683b01a6c9 research st, add comments about the thread cycle 2014-11-10 14:54:52 +08:00
winlin
8327a57b7e never use stack variable for setjmp 2014-11-10 14:02:49 +08:00
winlin
2c01f7e943 research st, expand MD_INIT_CONTEXT macro, the thread start. 2014-11-10 13:52:17 +08:00
winlin
8da8c49f39 research st, add comments 2014-11-10 11:49:14 +08:00
winlin
2b70212649 research st, add stack struct comments. 2014-11-10 11:47:24 +08:00
winlin
6bde1e54dc research st, add stack alloc commnets. 2014-11-10 11:10:27 +08:00
winlin
e49a868308 research st, rename variable thread to trd, for thread is a keyword. 2014-11-10 11:06:06 +08:00
winlin
ac1a4ec0a3 research st, always alloc on stack. 2014-11-10 10:21:05 +08:00
winlin
ae8b3e3c00 research st, remove the support of MD_STACK_GROWS_UP 2014-11-09 12:05:59 +08:00
winlin
340464ed56 research st, remove __ia64__ cpu support 2014-11-09 12:04:56 +08:00
winlin
a27c3dca2d research st, add gdb info for setjmp. 2014-11-09 11:56:14 +08:00
winlin
4b24ee9db3 research st, only for linux and arm/mips/i386/x86_64 cpus. 2014-11-09 11:46:32 +08:00
winlin
606fc13a03 rename the confict macro to srs_lib_trace 2014-11-08 18:37:15 +08:00
winlin
5554922820 refine librtmp tools, use srs_trace macro instead printf. 2014-11-08 14:06:40 +08:00
winlin
cf5c24af4a refine librtmp, unify all tools format and usage. 2014-11-08 14:00:59 +08:00
winlin
6de83db76e refine srs-librtmp log macro 2014-11-08 13:41:47 +08:00
winlin
f92303c764 refine all research tools, remove the public header, add log to srs_librtmp.h 2014-11-08 13:35:38 +08:00
winlin
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
0075779d38 for bug #66, refine the api to send h264 frames. 2014-11-08 10:28:59 +08:00
winlin
cd5c58ba5f for bug #66, refine the api and demo. 2014-11-08 09:21:09 +08:00
winlin
1074c8d9b2 for bug #66, use new api to directly sendout h264 raw data. 2014-11-08 09:12:52 +08:00
winlin
6407baffd5 for bug #66, output the h264 frame type. 2014-11-07 23:19:31 +08:00
winlin
72ad6894ca move the annexb decode utility to protocol. 2014-11-07 23:07:31 +08:00
winlin
bd25626f0e refine code for bug #66 2014-11-07 22:36:25 +08:00
winlin
1c237a821a add api convert h264 to rtmp packet, for bug #66 2014-11-07 22:06:30 +08:00
winlin
e4af098d06 refine code for bug #66 2014-11-07 21:16:41 +08:00
winlin
b964a6c534 update for bug #66, add the srs-librtmp sample for publish h.264 raw stream. 2014-11-07 21:06:44 +08:00
winlin
1db69b153e update the research of arm 2014-11-07 16:47:49 +08:00
winlin
0f41e0d26f research st: only support linux 2014-11-06 15:45:31 +08:00
winlin
d67454ecc2 research st: only support linux 2014-11-06 15:43:28 +08:00
winlin
5fd308c64e update code, warning when compile dev branch. 2014-11-06 15:18:10 +08:00
winlin
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +08:00
winlin
8521762cb3 research st: refine sync. 2014-11-06 14:00:27 +08:00
winlin
3377df0bea research st: refine skt. 2014-11-06 13:55:06 +08:00
winlin
22710db911 research st: refine sched. 2014-11-06 13:52:15 +08:00
winlin
f5f8e8946f research st: refine event, io and key. 2014-11-06 13:40:24 +08:00
winlin
c38a545780 reserach st: refine key.c 2014-11-06 13:17:54 +08:00
winlin
fd0c85b324 research st: refine io. 2014-11-06 13:11:34 +08:00
winlin
f8f18fffa7 research st: update test for st. 2014-11-06 12:50:27 +08:00
winlin
0f293802c8 research st: refine the md.h 2014-11-05 17:42:57 +08:00
winlin
856ba07bd3 research st: update public and common. 2014-11-05 17:22:36 +08:00
winlin
315707d726 research st: refine public 2014-11-05 17:16:15 +08:00
winlin
bba2d3dd98 research st: replace the TAB with 4spaces 2014-11-05 17:12:56 +08:00
winlin
55bd1dd95e research st: replace the TAB with 4spaces 2014-11-05 17:10:54 +08:00
winlin
0faa38dc0c research st: remove the osguess.sh 2014-11-05 17:06:18 +08:00
winlin
2dc6b7d1ea add io for st research 2014-11-05 17:01:15 +08:00
winlin
511c814ffb refs #182: rename to sync test. 2014-10-26 16:38:00 +08:00
winlin
69fdec411f refs #182: rename to sync test. 2014-10-26 16:35:12 +08:00
winlin
9aba47cbe3 refs #182: research st, add multiple threadds. 2014-10-26 14:04:31 +08:00
winlin
79ab9f05f3 refs #182: update the st, use cond and mutex. 2014-10-26 13:55:37 +08:00
winlin
388305f44c update st research. 2014-10-26 13:43:11 +08:00
winlin
fb906f0afc revert the player for bug #185. 2014-10-25 17:15:33 +08:00
winlin
6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 2014-10-25 17:12:56 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
d9b12b151c refine the makefile. 2014-10-18 13:16:17 +08:00
winlin
b65df251c3 chmod +x *.sh 2014-10-12 21:50:28 +08:00
winlin
2f388d614f rename st-1.9 to st 2014-10-12 21:31:50 +08:00
winlin
7692373e02 remove the unused files. add upp project file 2014-10-12 21:29:48 +08:00
winlin
7f4c113e57 add st-1.9 to research 2014-10-12 20:57:59 +08:00
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 2014-07-26 14:43:37 +08:00
winlin
f3e85a0063 refine the usage of csr. 2014-07-17 11:06:37 +08:00
winlin
5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 2014-07-13 20:25:36 +08:00
winlin
8984ba9d56 refine the usage of bwtc. 2014-07-13 19:28:09 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +08:00
winlin
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
e53655ee83 refine the build script 2014-07-13 13:31:24 +08:00
winlin
019b25ea30 add MIT license to bandwidth check/test as/js library. 2014-07-13 10:05:30 +08:00
winlin
3a1b3dd142 fix bandwidth bug, config item interval to float. 2014-07-12 22:22:56 +08:00
winlin
d8ed7cc968 refine the js library for bandwidth test. 2014-07-12 21:03:26 +08:00
winlin
0707c24b54 refine the js library for bandwidth test. 2014-07-12 20:56:44 +08:00
winlin
2ff88b9bcd move js to srs_bwt. 2014-07-12 20:51:57 +08:00
winlin
c319cc6a40 refine bandwidth test client, provides js and as library 2014-07-12 20:48:03 +08:00
winlin
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
1a7735182f refine the file stream, to file reader and writer. 0.9.142 2014-06-29 17:05:26 +08:00
winlin
55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 2014-06-29 10:43:53 +08:00
winlin
aad42d7941 fix ubuntu14 build warnings 2014-06-29 00:09:55 +08:00
winlin
55b99c90c7 refine detect tool, support atc stream. 2014-06-11 14:16:44 +08:00
winlin
17cb8c4550 finish the research for python-subprocess 2014-06-11 11:14:43 +08:00
winlin
b7d8be46a1 add research for usage for subprocess 2014-06-11 11:03:22 +08:00
winlin
cccc483ab3 add bytes statistic for librtmp 2014-06-10 17:39:12 +08:00
winlin
a639eb0596 fix bug of buffer assert, erase can accept any value 2014-06-10 16:06:18 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
4d9ed6f7fe refine the code, add comments to result to self interpret 2014-06-10 11:44:02 +08:00
winlin
8817823462 add rtmp detecter 2014-06-10 11:34:35 +08:00
winlin
ef6efb821c add rtmp detecter 2014-06-10 10:40:31 +08:00
winlin
48adeeb1a5 fix the demo player html text 2014-06-06 15:35:47 +08:00
winlin
e227bd3a0e remove the srs community 2014-05-31 17:47:02 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00