Commit Graph

378 Commits (c4a510b83488d456abdd9edcf000697382d98bec)

Author SHA1 Message Date
winlin 8862ec1988 merge from srs2 10 years ago
winlin a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 10 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 9ead08725d use kernel utility int2str and float2str 10 years ago
winlin 6efd2dd27e add load balance round robin for brokers. 10 years ago
winlin 4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 10 years ago
winlin dadfe101b4 rename SrsBitStream to SrsBitBuffer 10 years ago
winlin 0e52fc6d5b rename SrsStream to SrsBuffer 10 years ago
winlin ca3577e11b rename temp to stream 10 years ago
winlin f33d736442 rename kernel stream to buffer 10 years ago
winlin a4f51564db rename kernel stream to buffer 10 years ago
winlin 495f575ac3 rename kernel buffer to temp 10 years ago
winlin ac2b03a3ed rename srs_kernel_buffer to temp 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin 8107e5f9a6 for #319, raw api support set the ff_log_dir 10 years ago
winlin 06c7ae62ee for #319, refine the error code for RAW APi. 10 years ago
winlin 1b1a2a1e63 fix #471, api response the width and height. 3.0.2 10 years ago
synote 9b01aad220 fix bug for build failure when configure with --log-info
wrong use of size in SrsStream::initialize of  srs_kernel_stream.cpp
10 years ago
winlin d921d59e57 for #319, support HTTP RAW API reload. 10 years ago
winlin 1e0481a2d0 for #319, support signal to persistence config 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 94641c812b fix #442, support kickoff client. 10 years ago
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 10 years ago
winlin 7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 10 years ago
winlin ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 10 years ago
lovacat e8c0ca7af0 fix #442: HTTP API kickoff client. 10 years ago
winlin bfe0f97edd refine params nameing and SrsStream. 10 years ago
winlin 8d86eb6516 refine code naming or comments. 10 years ago
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
winlin 438914c481 fix #433, fix the sps parse bug. 2.0.176 10 years ago
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch 10 years ago
winlin f347099fd1 for memory leak detect, move the payload create to message. 10 years ago
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 10 years ago
winlin 8b3bd5b4b9 add srs memory watcher. 10 years ago
winlin ec24533955 use smaller value for publish timeout. 10 years ago
winlin a1dd734318 fix #421, drop video for unkown RTMP header. 10 years ago
winlin 03d951c0fb fix the audio or video pid generate bug. 10 years ago
winlin db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin e5461d2df9 refine code 10 years ago
winlin d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 10 years ago
winlin 8a9dbaefb7 use cache for flv tag header. 10 years ago
winlin 960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 10 years ago
winlin 069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 10 years ago
winlin 46a81372e7 fix #398, set recv timeout for http connection. 10 years ago
winlin 5d7b0edccc merge from bravo code, fix some warnings. 10 years ago
winlin 77ee2400df fix the unicode to ascii 10 years ago
winlin ba6c3132e3 refine code, use decoder to parse flv stream 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 d19dfa528e abs overflow also plus the deviation, for pure audio hls. 10 years ago
winlin a28eec89b0 support ingest hls with m3u8 in m3u8. 10 years ago
winlin ba6736839b support hls ingest, fix the bugs. 10 years ago
winlin 1f93fb3399 refine hls notify, support timeout. 10 years ago
winlin d8988da0ea refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin 23b310971e guess again when annexb change to ibmf. 10 years ago
winlin 546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 10 years ago
winlin 6e2d756e1b fix the bug of h.264 bit stream demux. 10 years ago
winlin 61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 10 years ago
winlin 77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 10 years ago
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 10 years ago
winlin e458305f81 add utc time format. 10 years ago
winlin cd682ae4be update donations. fix hls path bug. 10 years ago
winlin 01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0. 10 years ago
winlin 896983c1dc refine the aac codec enum name 10 years ago
winlin 1401f2e0ab ignore when sps/pps consumed all frame. 10 years ago
winlin e818f36316 fix #360, fix build bug for centos7. 10 years ago
winlin f69fa7273b fix #302, remove the thread unsafe code, no static. 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 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
wenjie.zhao d4198ee8ba add hds supported. 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 db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 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 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin e7fd733dc5 fix the long long warning. 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 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 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
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin a954040d29 for #133, rtsp parse aac from rtp packet. 10 years ago
winlin 0cc693a3b8 for #133, decode the h264 NALU from rtp. 10 years ago
winlin 4807f7850d for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64. 10 years ago
winlin 604f4cc57b for #133, support the rtsp options request and response. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 10 years ago
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117 10 years ago
winlin 1ed3e283ab implements the pat/pmt write ts header. 10 years ago
winlin e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 10 years ago
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 10 years ago
winlin 66931a8890 try to fix hls problem, print the video packets. 10 years ago
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 10 years ago
winlin 4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 10 years ago
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 10 years ago
winlin 4246be92c9 for #250, merge avc to codec. use queue to dequeue. 10 years ago
winlin 70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 10 years ago
winlin 66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 10 years ago
winlin bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 10 years ago
winlin b38bae2a89 for #250, refine parse pes packet, remove the clear method. 10 years ago
winlin 1685cdd48e for #250, parse pes packet ok, ts message ok. 10 years ago
winlin 486277089d for #250, parse the PES ts packet payload. 10 years ago
winlin 755e61e011 update the qt project. 10 years ago
winlin cc87992fe0 for #250, decode the PMT and PAT 10 years ago
winlin 7692e50fc2 for #250, calc and verify the crc32 of PAT. 10 years ago
winlin 52b62918d9 for #250, decode the PAT of PSI ts packet. 10 years ago
winlin 51aecb8fde for #250, decode the ts packet header and adaptation field. 10 years ago
winlin bd395904df for #250, the ts packet and adaptation field. 10 years ago
winlin aff7a1cb4d add ts packet definition for #250. 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 10 years ago
winlin c9d270fbe0 refine code for #250, ts remux 10 years ago
winlin ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin dfe385d0c9 for #293, move the simple buffer to kernel. 10 years ago
winlin 77d78eac5c for #293, add http ts stream framework. 10 years ago
winlin 913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 10 years ago
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 10 years ago
winlin e6549b261c for #293, support http mp3 streaming 10 years ago
winlin 99bf397487 for bug #293, add mp3 id3 spec 10 years ago
winlin 15d87537a1 for bug #293, support aac stream. 10 years ago
winlin 3244c083c7 for bug #293, support http aac stream 10 years ago
winlin 7674524c31 for #239, empty the aac encoder 10 years ago
winlin c0233542bf for #293, add aac encoder for http aac stream. 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin a1f887f46f refine code, move onMetaData to consts. 10 years ago
winlin 5661fc2676 refine dvr and rtmp dump, write the original data. 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 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 bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 10 years ago