Commit Graph

2084 Commits (85afb6ea6fabddbf3c3ba88a7e12318d8094caf2)

Author SHA1 Message Date
winlin ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 05d238f860 support modules.
winlin 688890cd7a refine configure, generate objs/makefile first.
winlin a29b8a7a5b refine configure, move auto headers to script.
winlin aaf87cf3d9 add srs module rule.
winlin b360fe279d remove libaacplus.
winlin 496f689de7 fix bug for libfdk aac.
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 1277968d4a refine http client, use initialize to set host and port.
winlin 2bcb4f811c refine http.
winlin 964e4be9d4 refine http request post. 2.0.132.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 4325809daf refine http
winlin 6fccfa061d refine the http request code.
winlin 025b707330 refine the http request reader.
winlin 3e394a5f06 for , set socket send buffer to smaller macro. 2.0.131
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp.
winlin 983ab8fb89 pass all utest for 2.0
winlin e7fd733dc5 fix the long long warning.
winlin 3d47fbdc5c fix build failed of utest.
winlin a47dbf7a92 for , refine code.
winlin 34d6a2ece5 for , support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129
winlin f619f174e6 add readme for ide.
winlin 5d0cb7e68f update conf for rtsp
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 8ed256b7e9 for , wait keyframe for dvr. 2.0.127
winlin 0213cc6466 for , refine dvr, support POST create dvr when publish not start. 2.0.126
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin d650118988 fix , dvr support api to start or stop. 2.0.123
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin 849e59b05d for , support http api to start dvr.
winlin c67a4fdf97 for , enable http api crossdomain for dvr api.
winlin 1445086451 for , update the metadata of flv dvr file.
winlin 7077b74d03 for , add dvr plan append.
winlin 95b4baee7c for , refine dvr code to more simple.
winlin 3d225e1bc7 refine dvr, donot append the flv header.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin a954040d29 for , rtsp parse aac from rtp packet.
winlin 0cc693a3b8 for , decode the h264 NALU from rtp.
winlin 6a64164985 for , show more info about rtp.
winlin 45c0b12958 for , finish rtsp sdp, start rtp.
winlin f14af45413 for , alloc and free rtp port.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 40fbfd8560 for , rtsp extract tcp/udp listener.
winlin 4807f7850d for , rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.
winlin 604f4cc57b for , support the rtsp options request and response.
winlin c0e50265bd for , create rtsp framework.
winlin e81e090239 for , add rtsp listener and handler.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117
winlin 1ed3e283ab implements the pat/pmt write ts header.
winlin e88c1e32ee always increasing target duration, for
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0
winlin e19ee0cb99 for , set pcr_base to dts. 2.0.114.
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114
winlin 66931a8890 try to fix hls problem, print the video packets.
winlin b8d4f68a69 try to refine hls, always flush video when reap segment.
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem.
winlin d5e3ac4e7d for , the aac profile must be object plus one. 1.0.26
winlin 4820d455d5 for , workaround to force to LC/MAIN, donot support SSR above. 2.0.113
winlin f8bdd28de6 add comments for hls m3u8, target duration may should not changed.
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char
winlin 81ea6d34ce add pdf of hls rfc, corrent the content type.
winlin 30b1759aa9 fix bug for memory hls.
winlin bdda337f33 fix aac adts bug, the frame length is 2bits.
winlin 0af6e5e829 fix bug for srs-librtmp
winlin dba983d124 for , update the config for ram hls.
winlin a23191497f fix , support hls without io(in ram). 2.0.112
winlin 89b37d3469 for , refine the conf for hls.
winlin 4d10cc9f59 for , add conf.
winlin 16afe7ddbb fix , support push MPEGTS over UDP to SRS. 2.0.111
winlin 4246be92c9 for , merge avc to codec. use queue to dequeue.
winlin 153a3a6c42 must user pithy print for mpegts print.
winlin 70c8fe13c4 for , support h264 video for push mpegts over udp. 2.0.110
winlin 66fccdbbd1 for , demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.
winlin bce78fdab6 for , add comments for elemetary stream specifed by stream_id.
winlin a384cc400a for , use udp packet handler.
winlin 35ab0ea627 for , use buffer to cache bytes, for system will split the udp packet.
winlin b38bae2a89 for , refine parse pes packet, remove the clear method.
winlin 1685cdd48e for , parse pes packet ok, ts message ok.
winlin 486277089d for , parse the PES ts packet payload.
winlin 755e61e011 update the qt project.
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108
winlin cc87992fe0 for , decode the PMT and PAT
winlin 7692e50fc2 for , calc and verify the crc32 of PAT.
winlin 52b62918d9 for , decode the PAT of PSI ts packet.
winlin 51aecb8fde for , decode the ts packet header and adaptation field.
winlin bd395904df for , the ts packet and adaptation field.
winlin aff7a1cb4d add ts packet definition for .
winlin 919a85b103 for , hls support h.264+mp3, ok for vlc. 2.0.107
winlin 2c42350489 for , http ts stream support h.264+mp3. 2.0.106
winlin aaade0f04f for , refine the pcr start at 0, dts/pts plus delay. 2.0.105
winlin 9cbc753e8e for , , refine the pcr start at 0, dts/pts plus delay. 1.0.25
winlin c9d270fbe0 refine code for , ts remux
winlin b0daf1482d update version to 1.0.24
winlin 1835957a2b for , refine pcr=dts-800ms and use dts/pts directly. 1.0.24
winlin ea85ad2e20 for , , move the ts codec to kernel ts.
winlin d22e4e86d8 update projects for rtmp renamed to protocol
winlin 711b6ca277 for , basic stream caster framework. 2.0.104
winlin 6463d22a14 for , add mpegts over udp stream caster class.
winlin 7f02bfa3a4 for , the mpegts over udp stream caster framework.
winlin 52891b491a listen and serve stream caster mpegts over udp.
winlin f9d1e1111a merge from feilong, consumer directly sleep when paused.
winlin 8ace73f30d for , use absolutely overflow to make jwplayer happy. 2.0.103
winlin 4f5cc9c403 for , use absolutely overflow to make jwplayer happy. 1.0.23
winlin 6b89ffbc1d add config section for stream caster.
winlin 73cfdea332 for , srs http server support dash vod stream over mp4 range. 2.0.103
winlin e0ee8de2fb for , srs http server support dash, flash request range in range or bytes.
winlin a4ba40952a for , rename rtmp to protocol dir.
winlin d9a012164e update vs2010 project.
winlin a647043a06 update readme and wiki url for http ts stream
winlin 2a05783d5c for , support http ts stream. 2.0.101
winlin dfe385d0c9 for , move the simple buffer to kernel.
winlin 77d78eac5c for , add http ts stream framework.
winlin 0f59073400 refine code, rename the pts to dts although both ok for audio.
winlin 913f98b902 for bug , http ts stream, move the avc codec from app to kernel.
winlin dc6299171f refine http stream code.
winlin 7d86c6d9e9 for bug , refine for fast cache of http stream.
winlin 2167a8385c update version to 3.0.101
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
winlin 7305fa6f03 update vs2010 filter
winlin f26a2a8f0e add vs2010 filters.
winlin db700a0c64 update vs solution
winlin 31efea4f33 rename srs cmake ide to jetbrains clion
winlin 664c85cf3d Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin a3607c9193 use ide dir for ides.
winlin 49330b98b3 Merge pull request from panda1986/develop
支持mp3音频编码
panda1986 797c1b0762 support all acodec. not forced to aac.
panda1986 e7d54c2ca9 Update srs_app_ffmpeg.cpp
srs develop 新增支持mp3转码后,需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
winlin bb1331cc91 update conf.
winlin b735e29d05 refine conf, add port.
winlin e5ef4c2e66 update the conf of http static and stream.
winlin 5f194bc87c merge from feilong, the crash for cosumer wait.
winlin b7b268dfbf fix , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
winlin 29a8932b49 for bug , use http stream cache for android weixin to happy.
winlin f9f2fcbb9c for , add http stream cache for audio mp3/aac stream.
winlin e6549b261c for , support http mp3 streaming
winlin d364a81d8f for , support http mp3 streaming
winlin 99bf397487 for bug , add mp3 id3 spec
winlin b04888a35d for , , support http chunked encoding
winlin 15d87537a1 for bug , support aac stream.