Commit Graph

2093 Commits (3b4bd194b61466a69fbdfe72c5c3b2ef3c1df4da)

Author SHA1 Message Date
wenjie.zhao 5969f72354 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 10da182853 add hls prefix of uri supported 10 years ago
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault. 10 years ago
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault. 10 years ago
winlin 9a0a8affc5 Merge pull request #337 from tufang14/develop
可能数组越界
10 years ago
winlin 685a29af83 Merge branch '2.0release' into develop 10 years ago
winlin c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 10 years ago
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook.
Pass the send_bytes and recv_bytes count to the web hook.
10 years ago
Nimrod A. Abing (on kohima) bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 10 years ago
tufang14 6cf5a6a7a9 可能数组越界
可能数组越界
10 years ago
winlin 67671e43f9 Merge branch '2.0release' into develop 10 years ago
winlin 8ee0826e9a fix build failed bug. 10 years ago
winlin 0017ee85e0 Merge branch '2.0release' into develop 10 years ago
winlin 59d9af8039 update conf 10 years ago
winlin a21243ea12 merge from 2.0 10 years ago
winlin d349a3dbda update stable version check 10 years ago
winlin 519c25a064 fork srs2 and start srs3. 3.0.0 10 years ago
winlin 636bc574af start 2.0release, 80773 lines. 10 years ago
winlin e6058c1560 update donation 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin 995b130090 for #324, refine code for hstrs, support hijack handler. 10 years ago
winlin 5c6ef6ded6 fix warning for xcode. 10 years ago
winlin 6d15d0ea99 for #324, refine code, add hstrs config. 10 years ago
winlin 74fa3ba16f fix build failed for linux. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
wenjie.zhao 643f18abe4 add hds reload supported.#328 10 years ago
winlin 984145de72 for #328, add todo for hds, check whether disabled, support reload. 10 years ago
winlin 5d12a1ab20 for #328, add hds specification. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin da56e4fbb9 for #328, fix hds compile error on mac. 10 years ago
wenjie.zhao 07d8f060eb refine annotation 10 years ago
wenjie.zhao 570c0d66bd fix path issue. 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 10 years ago
winlin 3e5821efff enable http api for x86_x64 10 years ago
winlin 3732554844 remove the xcode state. 10 years ago
winlin 1ad0c847ce fix http parse bug 10 years ago
winlin f247ac9daf fix the http parse bug. 10 years ago
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin 5370493140 add ingest to mac.dev conf. 10 years ago
winlin 24616e15b5 remove the code for xcode, not required. 10 years ago
winlin b3aed2cb59 fix the bug of configure. 10 years ago
winlin f9767c91b5 fix configure bug, refine code for stream caster. 10 years ago
winlin 6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding. 10 years ago
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18 10 years ago
winlin 0ff49fd299 for #155, debug srs on xcode. 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 20fb5f3e8e modify the colorful bash for osx. 10 years ago
winlin b0953c1d3a add comments of audio profile supported by srs. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 2e9f2753c9 for #316, add stream codec info. 2.0.135 10 years ago
winlin 885b9af122 for #310, refine code to support he/hev2, use aac object. 10 years ago
winlin 8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 10 years ago
winlin d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 10 years ago
winlin 04f3f2a8f8 for #316, add codec info to stream. 10 years ago
winlin 8bf60895a9 refine the kbps of server. 10 years ago
winlin fbbe46d272 refine the config, support directly parse file. 10 years ago
winlin b8e70f8538 support module 10 years ago
winlin ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 10 years ago
winlin 05d238f860 support modules. 10 years ago
winlin 688890cd7a refine configure, generate objs/makefile first. 10 years ago
winlin a29b8a7a5b refine configure, move auto headers to script. 10 years ago
winlin aaf87cf3d9 add srs module rule. 10 years ago
winlin b360fe279d remove libaacplus. 10 years ago
winlin 496f689de7 fix bug for libfdk aac. 10 years ago
winlin f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 10 years ago
winlin 1277968d4a refine http client, use initialize to set host and port. 10 years ago
winlin 2bcb4f811c refine http. 10 years ago
winlin 964e4be9d4 refine http request post. 2.0.132. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin 4325809daf refine http 10 years ago
winlin 6fccfa061d refine the http request code. 10 years ago
winlin 025b707330 refine the http request reader. 10 years ago
winlin 3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 10 years ago
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp. 10 years ago
winlin 983ab8fb89 pass all utest for 2.0 10 years ago
winlin e7fd733dc5 fix the long long warning. 10 years ago
winlin 3d47fbdc5c fix build failed of utest. 10 years ago
winlin a47dbf7a92 for #320, refine code. 10 years ago
winlin 34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 10 years ago
winlin f619f174e6 add readme for ide. 10 years ago
winlin 5d0cb7e68f update conf for rtsp 10 years ago
winlin 012c29e124 for #133, update the wiki. 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin a3648063d5 fix #179, support dvr http api. 2.0.123. 10 years ago
winlin d650118988 fix #179, dvr support api to start or stop. 2.0.123 10 years ago
winlin 1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 10 years ago
winlin 849e59b05d for #179, support http api to start dvr. 10 years ago
winlin c67a4fdf97 for #179, enable http api crossdomain for dvr api. 10 years ago
winlin 1445086451 for #179, update the metadata of flv dvr file. 10 years ago
winlin 7077b74d03 for #179, add dvr plan append. 10 years ago
winlin 95b4baee7c for #179, refine dvr code to more simple. 10 years ago
winlin 3d225e1bc7 refine dvr, donot append the flv header. 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago