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

3851 commits

Author SHA1 Message Date
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 2019-04-06 16:10:33 +08:00
winlin
23a2d8eefd Support HTTP-FLV params. 3.0.46 2019-04-06 15:42:24 +08:00
winlin
a8781aee3e For #1304, Default HSTRS to on. 2.0.264 2019-04-06 15:35:12 +08:00
winlin
a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 2019-04-05 19:54:32 +08:00
winlin
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
b9750baa52 For #1339, Support HTTP-FLV params. 2019-04-05 18:44:50 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00
YLX
ab833943e1 fix: support parse flv query params to http callback (#1339) 2019-04-05 15:44:00 +08:00
winlin
251f19718e CI: Cover kernel mp4 print box 2019-02-07 22:49:41 +08:00
winlin
f7b2ee4cc9 CI: Cover kernel utility 2019-02-07 20:58:33 +08:00
winlin
a8408de972 CI: Cover kernel mp4 2019-02-05 20:15:32 +08:00
winlin
a0ba17b397 CI: Cover kernel ts 2019-02-05 16:49:29 +08:00
winlin
073d42ca7d CI: Refine hls ts context writer 2019-02-05 16:26:43 +08:00
winlin
36c41715e7 CI: Cover kernel ts 2019-02-05 09:57:06 +08:00
winlin
8eccfeceb9 CI: Cover kernel ts 2019-02-05 08:33:29 +08:00
winlin
3f59c7885e CI: Cover kernel ts 2019-02-04 16:12:37 +08:00
winlin
4187fa0068 CI: Cover kernel utility 2019-02-04 15:11:41 +08:00
winlin
572ce5ccff CI: Cover kernel mp3 2019-02-04 14:24:31 +08:00
winlin
39541b51a1 CI: Cover all kernel log 2019-02-04 13:41:09 +08:00
winlin
492db1a904 CI: Cover kernel flv 2019-02-04 13:15:11 +08:00
winlin
2fec88b769 CI: Fix kernel file case failed. 2019-02-04 12:54:31 +08:00
winlin
ec16e53802 CI: Cover kernel file 2019-02-04 12:48:56 +08:00
winlin
3064b941d5 CI: Cover kernel codec av frame and format 2019-02-04 12:05:07 +08:00
winlin
2bdba63b0b CI: Cover kernel codec 2019-02-03 22:21:52 +08:00
winlin
c2a938473a CI: Cover kernel codec 2019-02-03 22:03:15 +08:00
winlin
1df1d84766 CI: Cover kernel LB round robin 2019-02-03 21:23:06 +08:00
winlin
5b311a06b7 CI: Verify kernel aac write ADTS packet 2019-02-03 21:14:14 +08:00
winlin
917cb4a299 CI: Cover all kernel aac 2019-02-03 20:58:04 +08:00
winlin
2ae3440128 CI: Cover all kernel error 2019-02-03 12:56:29 +08:00
winlin
3cd3739433 CI: Cover all kernel error 2019-02-03 12:51:48 +08:00
winlin
8c9857ff6f CI: Remove macros for utest 2019-02-03 12:38:07 +08:00
winlin
bfeea72eac CI: Cover all kernel buffer 2019-02-03 12:28:18 +08:00
winlin
a2b0767874 Fix build failed. 2019-02-03 09:38:20 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
a25efa3764 CI: Update codecov badge 2019-02-02 21:51:08 +08:00
winlin
7243d8e7b8 CI: Support codecov 2019-02-02 21:42:03 +08:00
winlin
b4619e3393 Kbps: Remove the union for kbps slice 2019-02-02 18:20:19 +08:00
winlin
98706f793e Support Opus audio-level 2019-01-17 16:01:43 +08:00
winlin
f1b1f78c4e Parse Opus for tools 2019-01-17 11:35:15 +08:00
winlin
e77b570636 Add codec OPUS/HEVC to FLV 2019-01-17 09:24:17 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
66198b6f78 Add utest for RTMP protocol 2019-01-01 21:05:52 +08:00
winlin
a2d6566019 Add kernel utility utest 2019-01-01 20:19:44 +08:00
winlin
6e44aa4a4f Cover Kbps statistic 2019-01-01 18:22:11 +08:00
winlin
6e9c7dd11e Add utest for SrsKbps as RAW statistics 2019-01-01 17:44:39 +08:00
winlin
6234905532 Refactor ISrsKbpsDelta 2019-01-01 17:36:27 +08:00
winlin
dcebf8a31f Refine kbps 2019-01-01 14:04:50 +08:00
winlin
aef838338c Add utest for kbps connections 2018-12-23 21:19:17 +08:00
winlin
c26b475bae Refine kbps, stub wall clock 2018-12-23 20:47:17 +08:00
winlin
4c40370986 Refine kbps more testable 2018-12-23 20:30:12 +08:00
winlin
16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 2018-12-23 20:08:04 +08:00
winlin
6e75993e7f Change public virtual to virtual public 2018-12-23 19:54:08 +08:00
winlin
5d959661e7 No sudoer 2018-12-22 20:51:57 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
1dc95cba78 Always enable SRS_Ingest 2018-12-22 20:31:47 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
c6844527fb Always enable SRS_SSL 2018-12-22 20:23:39 +08:00
winlin
e4e6dd2169 Always enable SRS_SSL 2018-12-22 20:08:42 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
8e294709b0 Always enable SRS_STAT 2018-12-22 19:58:36 +08:00
winlin
71f1ccbf90 Always enable SRS_HLS 2018-12-22 19:54:10 +08:00
winlin
f003ba9a29 Always enable SRS_DVR 2018-12-22 19:50:57 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
0626bc5982 Use openssl in docker 2018-12-10 14:27:55 +08:00
winlin
432a575c7a Use docker for #1274 and #1250 2018-12-10 00:07:38 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +08:00
winlin
f1ab8fecac Fix build warning 2018-12-09 22:48:47 +08:00
winlin
ef3e35f173 Fix build warning 2018-12-09 21:04:43 +08:00
winlin
4d157f2148 Fix build warning 2018-12-09 21:00:38 +08:00
winlin
dcc2a73e7a Refine kernel aac 2018-12-09 20:58:40 +08:00
winlin
572a2806c1 Refine utest 2018-12-09 20:36:31 +08:00
winlin
a8be5f8f27 Allow OSX for utest 2018-12-09 19:41:59 +08:00
winlin
f2a93755c2 Allow OSX for utest 2018-12-09 19:39:36 +08:00
winlin
f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 2018-12-01 20:21:35 +08:00
winlin
acaae0d5c9 Update SRS3 2018-11-27 21:45:57 +08:00
winlin
ba4ef34d27 Merge 2.0release 2018-11-27 21:24:51 +08:00
Steven Liu
78cf3d4b58 upgrade x264 and ffmpeg to newest version (#1274) 
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2018-11-27 21:17:42 +08:00
winlin
ff82ca1233 Merge branch 2.0release into 3.0release 2018-11-11 16:24:09 +08:00
winlin
99430d2edb For #1250, Not support macOS 10.14 2018-11-11 16:24:00 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
winlin
99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 2018-11-11 13:33:47 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
winlin
b2066cbf68 #1263, Fix string trim bug. 2.0.259 2018-11-11 13:30:12 +08:00
MakarovYaroslav
a2480a6c94 fix bug with for loop (#1263) 2018-11-11 13:27:33 +08:00
winlin
39f1629168 Merge from SRS2 2018-10-28 14:24:18 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
63ac93a642 Merge #1236 from 2.0release 2018-10-08 07:22:21 +08:00
winlin
a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 2018-10-08 07:16:07 +08:00
RocFang
768fe68ca3 fix st_usleep param from us to ms. (#1236) 
fix st_usleep param from us to ms.
 2018-10-08 07:14:14 +08:00
winlin
3f009937ee Merge #1237 from 2.0release 2018-10-08 07:10:29 +08:00
winlin
9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 2018-10-08 07:09:31 +08:00
Mirko Velic
70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 2018-10-08 07:01:49 +08:00
winlin
8e55ef4b60 Refine code 2018-08-26 14:29:45 +08:00
winlin
1e2cca4712 For #1093, Refine HLS encryption wiki 2018-08-25 21:59:56 +08:00
winlin
5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 2018-08-25 21:17:33 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
522fba99aa Merge branch 3.0release into harlanc-3.0release 2018-08-25 18:12:39 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
winlin
74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release 2018-08-25 12:43:52 +08:00
winlin
1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 2018-08-25 12:20:52 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 2018-08-15 07:37:12 +08:00
Harlan
bf12a45274 add configuration instructions for hls encryption 2018-08-12 14:18:05 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
winlin
a9b5d65ca7 For #1202, Support auth_key param for srs player 2018-08-12 11:52:18 +08:00
winlin
728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 2018-08-12 10:46:06 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 2018-08-11 19:23:51 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
928c6ab091 For #1181, Add utest 2018-08-11 13:16:59 +08:00
winlin
01d8bba455 For #1181, Refine code to write utest 2018-08-11 12:33:03 +08:00
winlin
6cea551c64 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:12:40 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00
winlin
03ac48f8fa Merge 2.0, for FLV latency 2018-08-05 20:25:28 +08:00
winlin
c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 2018-08-05 20:23:17 +08:00
winlin
580c94c8c0 Refine code 2018-08-05 18:58:23 +08:00
winlin
31945c244d For #1110, Refine code. 2018-08-05 11:09:48 +08:00
winlin
455a060fa5 Merge 2.0 2018-08-05 10:52:37 +08:00
winlin
ee43fc92ae For #1110, Refine conf 2018-08-05 10:47:01 +08:00
winlin
ae99131512 Fix #1087, Ignore iface without address. 3.0.37 2018-08-05 10:41:31 +08:00
winlin
82699ff616 Refine code for librtmp 2018-08-05 10:39:52 +08:00
winlin
29b74c7220 For #1110, Support params in http callback. 3.0.36 2018-08-04 19:51:04 +08:00
winlin
85d3a5001c For #1110, Support params in http callback. 2.0.251 2018-08-04 19:36:42 +08:00
winlin
68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 2018-08-02 09:17:49 +08:00
winlin
09dbda5b18 For #1031, SRS forwarder support douyu.com. 2018-08-02 07:24:08 +08:00
winlin
a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 2018-08-02 07:14:06 +08:00
winlin
586899a010 For #1031, SRS edge support douyu.com. 2.0.250 2018-08-02 06:59:57 +08:00
winlin
41c6e833b9 Replace hex to string to match MIT license. 3.0.33 2018-07-22 18:47:38 +08:00
winlin
84f81983aa Replace base64 to match MIT license. 3.0.32 2018-07-22 17:56:38 +08:00
winlin
0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 2018-07-22 15:21:05 +08:00
winlin
e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 2018-07-21 20:58:20 +08:00
winlin
dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code 2018-07-21 19:09:32 +08:00
winlin
608c88b8f2 Merge 2.0release 2018-07-21 17:52:12 +08:00
winlin
6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 2018-07-21 17:49:46 +08:00
winlin
551863a7ed Refine code 2018-07-21 17:34:31 +08:00
winlin
693194dffe Merge 2.0release 2018-07-18 19:26:53 +08:00
winlin
d27db215df For #1176, should not close fd when success. 2018-07-18 19:21:29 +08:00
winlin
e4742ddac7 Merge 2.0release 2018-07-17 13:59:51 +08:00
winlin
2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 2018-07-17 13:44:01 +08:00
Hui Zhang (huzhang2)
01ed485cf3 fix #1172 #1173 #1174 #1175 
security scan report issue
 2018-07-17 10:03:13 +08:00
Harlan
e9cb8210fc fix default value error 2018-05-15 11:20:52 +08:00
Harlan
45a57acbb4 fix bug 2018-04-06 10:05:13 +08:00
Harlan
43ebd5958d fix bug that only one stream can be encrypted.. 2018-04-03 22:00:32 +08:00
winlin
dba44c7c3f Merge branch 'develop' into 3.0release 2018-03-25 20:00:33 +08:00
xialixin
bb4e16ae3c fix create dir success result check (#1080) 2018-03-25 17:48:07 +08:00
xialixin
aaf2905a9d add: hls configuration adds [duration] variable (#1083) 2018-03-25 17:47:37 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
0d78b908a7 Fix client tools resolve dns failed bug 2018-03-20 19:50:46 +08:00
winlin
449c632e49 For #464: Add example for origin cluster 2018-03-03 10:01:01 +08:00
winlin
bd797ad385 Fix utest build failed for ::atoi 2018-03-03 09:33:15 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
winlin
0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 2018-02-28 13:37:30 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +08:00
winlin
4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 2018-02-16 16:40:48 +08:00
winlin
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +08:00
winlin
2f09ec4353 For #464, refine result of origin cluster api 2018-02-16 14:13:14 +08:00
winlin
92f2bcd878 For #464, support config origin cluster 2018-02-16 10:31:19 +08:00
winlin
55c96192e2 For #464, refine code 2018-02-16 10:19:48 +08:00
winlin
ec362b2774 For #464, query origin info and ip addresses 2018-02-16 09:37:31 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
d0fbf44d18 For #464, support config for origin cluster. 2018-02-14 21:52:40 +08:00
winlin
db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 2018-02-13 09:05:01 +08:00
winlin
a2cefe4dbd For #1059, show more information from stream 2018-02-13 09:02:46 +08:00
winlin
681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:57 +08:00
winlin
366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:14 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
juntaoliu
a6871052af set tcp keepalive for tcp socket (#1045) 2018-01-07 17:03:13 +08:00
winlin
82457cda4b Change date from 2017 to 2018 2018-01-07 11:00:58 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
d9e37d2f54 Merge branch '2.0release' into 3.0release 2018-01-04 13:49:55 +08:00
RocFang
d22d7afd83 update init.d file (#1039) 2018-01-04 13:45:56 +08:00
winlin
5730bf8e43 Fix #913, support complex error. 3.0.26 2018-01-01 23:03:42 +08:00
winlin
b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 2018-01-01 23:01:13 +08:00
RocFang
015e76cb3f Update configure (#1033) 
allow user to add some specific flags.
 2018-01-01 22:57:44 +08:00
winlin
922a8f3a5c For #988, refine code. 2018-01-01 22:45:22 +08:00
winlin
823dc2df21 Refine help 2018-01-01 22:44:48 +08:00
Thomas Dreibholz
feaae341b9 IPv6 support (for 3.0 release) (#988) 
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
 2018-01-01 22:43:58 +08:00
winlin
db08f1586c For #913, APP support complex error. 2018-01-01 22:32:54 +08:00
winlin
e2c1f58674 For #913, APP support complex error. 2018-01-01 21:20:57 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
aebbbadf42 For #913, Service support complex error. 2018-01-01 11:41:15 +08:00
winlin
15aea686c3 For #913, KAFKA, RTSP support complex error. 2018-01-01 10:30:31 +08:00
winlin
70a20ffadb For #913, RTMP support complex error. 2018-01-01 09:38:22 +08:00
winlin
60accb6e54 For #913, AMF0 and RTMP support complex error. 2017-12-31 20:52:04 +08:00
winlin
204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 2017-12-31 12:11:48 +08:00
winlin
9802dc326e For #913, source support complex error 2017-09-23 22:12:33 +08:00
winlin
abcaba33ee For #913: TS/HLS/MPEGTS support complex error 2017-09-22 21:50:54 +08:00
winlin
20a42599f3 For #913, http callback use complex error 2017-09-22 19:54:50 +08:00
winlin
fd91df9411 For #913, reload use complex error 2017-09-22 16:14:30 +08:00
ME_Kun_Han
3744606c9b fix bug: parsing Exp-Golomb codes failed (#978) 2017-09-19 18:57:37 +08:00
winlin
baa55f14b9 Change stable release to SRS2 2017-08-19 20:19:35 +08:00
winlin
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +08:00
winlin
661eb8b37c For #913, use complex error for reload utc time 2017-07-29 20:02:38 +08:00
winlin
5c9a12e72a For #913, use complex error for listener 2017-07-29 12:45:17 +08:00
winlin
71dd3f3137 For #913, use complex error for server handler. 2017-07-18 20:24:07 +08:00
winlin
e135ab59d9 Fix the utest failed for chunk_size 2017-06-28 09:44:10 +08:00
winlin
6d4315fc3c Disable valgrind by default 2017-06-28 09:08:19 +08:00
winlin
0ad4b65a56 Disable valgrind for osx. 2017-06-13 16:20:00 +08:00
winlin
b3825c4021 Fix warnings 2017-06-13 16:10:46 +08:00
winlin
9db2a04c3b For #913, coroutine support complex error. 2017-06-11 18:44:20 +08:00
winlin
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +08:00
winlin
860aac3e50 For #913, config reload and persistence 2017-06-11 09:54:09 +08:00
winlin
7cac35a289 For #913, source cycle error 2017-06-11 09:40:07 +08:00
winlin
7275fd5397 Fix #916, build failed for headers for error. 2017-06-11 09:03:29 +08:00
winlin
a20e2c3ef6 For #913, refine server utility 2017-06-10 15:20:48 +08:00
winlin
ca9f0bdb1e For #913, refine server initialize st 2017-06-10 14:29:41 +08:00
winlin
4e4091231e Refine object create in server. 2017-06-10 14:19:10 +08:00
winlin
372a9e5cb3 Fix #915, string ends with 2017-06-10 08:42:42 +08:00
winlin
93710c7489 For #913, refine the error mechanism 2017-06-09 13:29:23 +08:00
winlin
bb200b5d2d For #913, add complex error. 2017-06-09 11:50:35 +08:00
winlin
58521751c3 Fix #299, support experimental MPEG-DASH. 3.0.25 2017-06-04 19:56:29 +08:00
winlin
69374c8d6d For #299, use format for v/a sequence header. 2017-06-04 19:35:52 +08:00
winlin
9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 2017-06-04 19:13:56 +08:00
winlin
0e9e1792fe For #299, write fMP4 for DASH. 2017-06-04 15:10:35 +08:00
winlin
baed1cc043 For #821, support parse dash video segment 2017-06-03 23:12:54 +08:00
winlin
8cc3ab2fa2 For #821, print mdat and udat 2017-06-03 19:00:19 +08:00
winlin
beae090d67 Refine logger header 2017-05-31 13:52:21 +08:00
winlin
4f6f8a8244 Fix verbose bug, for #821 2017-05-30 19:42:20 +08:00
winlin
6c64297264 Fix #821, support MP4 file parser. 3.0.24 2017-05-30 19:40:03 +08:00
winlin
12a55cd0c2 Fix build failed. 2017-05-30 09:58:14 +08:00
winlin
86f3bd7a0f Fix build failed. 2017-05-30 09:57:57 +08:00
winlin
121eadbc07 Fix build failed. 2017-05-30 09:54:38 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
6993ac226f For #906, #902, use coroutine for reusable2 thread 2017-05-29 20:49:29 +08:00
winlin
ea9a5f26d9 For #906, #902, use coroutine for reusable thread 2017-05-29 20:33:32 +08:00
winlin
2ed2513f08 For #906, #902, use coroutine for one cycle thread 2017-05-29 19:45:19 +08:00
winlin
b21f92f97a For #906, #902, remove the thread start and stop event 2017-05-29 18:42:36 +08:00
winlin
3ffb0980f5 For #906, #902, use connection manager to remove connection 2017-05-29 18:34:41 +08:00
winlin
44f542f77f For #906, #902, replace the endless thread with coroutine 2017-05-29 17:56:26 +08:00
winlin
fc380fe48d For #906, #902, refine thread object. 2017-05-29 17:19:06 +08:00
winlin
5792c462b8 Merge branch 'develop' into 3.0release 2017-05-29 12:17:25 +08:00
winlin
c4966484e1 For #893, #899, merge SRS2 2017-05-29 12:17:16 +08:00
winlin
e8cb2e6be4 Merge #899 to fix #893, ts PES ext length. 2.0.243 2017-05-29 12:15:04 +08:00
OtterWa
d1bd6993c5 fix ts decode (#899) 2017-05-29 12:11:42 +08:00
winlin
1e3550a52c For #821, Parse basic mp4 boxes. 2017-05-21 19:41:15 +08:00
HungMingWu
234904c206 Refine Refine Refine kernel/ts code (#891) 2017-05-21 09:09:58 +08:00
winlin
dd1cca45cc Remove non-exists conf file. 2017-05-18 14:00:04 +08:00
winlin
eaccbd0f85 Support print MP4 box. 2017-05-14 22:16:15 +08:00
winlin
fe43a31d06 Parse all mp4 boxes 2017-05-13 22:37:46 +08:00
winlin
366d6bcb82 Refine code 2017-05-13 21:47:20 +08:00
xialixin
92c8c0505d Fix the timebase bug, change from us to ms. (#876) 
* fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL)

* fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)

* fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)
 2017-05-13 09:21:02 +08:00
HungMingWu
e8ea27088a Refine Refine kernel/ts code (#881) 2017-05-13 09:19:19 +08:00
HungMingWu
815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874) 
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
 2017-05-06 14:05:22 +08:00
winlin
a58874178b Fix merge build failed. 2017-05-01 16:49:09 +08:00
winlin
f97260be1d Merge SRS2 2017-05-01 16:44:14 +08:00
winlin
a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 2017-05-01 16:39:59 +08:00
walkermi
79e4f9f3a0 fixed compile error when add --log-info (#860) 
* Update srs_app_server.cpp

fixed compile error when add --log-info

* Update srs_app_mpegts_udp.cpp

fixed compile error when add --log-info
 2017-04-30 12:29:37 +08:00
winlin
ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 2017-04-30 12:03:31 +08:00
HungMingWu
98d4b6ae11 Refine srs_kernel_codec audio & video config code (#854) 2017-04-24 10:08:57 +08:00
winlin
c97f2233a2 Merge SRS2 for #851 2017-04-23 21:00:06 +08:00
winlin
ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 2017-04-23 20:55:51 +08:00
winlin
9a2a6ab95f Merge SRS2 2017-04-18 11:42:11 +08:00
winlin
5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 2017-04-18 11:41:09 +08:00
winlin
bcd24126c5 Update comments for HLS 2017-04-16 21:43:30 +08:00
winlin
a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 2017-04-16 21:33:39 +08:00
winlin
6ee85aea83 Refine mp4, extract mp4 box reader. 2017-04-16 20:46:04 +08:00
winlin
c9bed5a8bf Refine mp4 codec for mdat. 2017-04-16 20:16:11 +08:00
winlin
18d9f6c8f1 Fix build failed. 2017-04-16 15:54:30 +08:00
winlin
1054b0a90f Merge SRS2 2017-04-15 20:46:00 +08:00
winlin
33a0abdeff Fix #844, support Haivision encoder. 2.0.238 2017-04-15 20:44:02 +08:00
winlin
d6e28bde69 Merge from SRS2. 2017-04-15 17:09:50 +08:00
HungMingWu
14acc59a19 Refine kernel/mp4 code (#823) 2017-04-15 17:05:05 +08:00
winlin
1c139d8fd8 Merge #846, fix fd leak for FLV stream caster. 2.0.237 2017-04-15 16:59:36 +08:00
haofz
52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 2017-04-15 16:56:28 +08:00
winlin
8d35585c13 Merge #841, avoid the duplicated sps/pps in ts. 2.0.236 2017-04-15 16:54:42 +08:00
ME_Kun_Han
bd2a1f9d3c fixed bug: video rendering in hls stream generates only vertical parttern (#841) 2017-04-15 16:49:02 +08:00
winlin
33375db401 Merge from SRS2, for #834 2017-04-09 18:52:21 +08:00
winlin
b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 2017-04-09 18:45:42 +08:00
winlin
8b7566a007 Refine code 2017-03-26 18:30:33 +08:00
winlin
032107dbf0 Refine hls ingester 2017-03-26 17:18:34 +08:00
winlin
609605a50b Fix #820, extract service for modules. 3.0.21 2017-03-26 17:05:50 +08:00
winlin
b75a3fad4e For #820, fix ubuntu build failed. 2017-03-26 16:48:43 +08:00
winlin
362b5788cd For #820, fix warnings 2017-03-26 16:45:00 +08:00
winlin
7d618fed43 For #820, fix utest failed. 2017-03-26 14:25:08 +08:00
winlin
e3526c0cf6 For #820, modules use service only. 2017-03-26 13:40:39 +08:00
winlin
ff822b55cd For #820, extract service module. 2017-03-26 10:16:21 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
62b7204514 Refine code, add mp4 parser module 2017-03-25 15:40:28 +08:00
winlin
c648fd27bf Refine code 2017-03-25 13:07:09 +08:00
winlin
2980e7d3ef For #813, refine code. 2017-03-25 12:52:54 +08:00
Chengdong Zhang
8ad934a8a4 srs_info use not available variable (#813) 
srs_info use not available variable.
Variable has been removed or changed.
 2017-03-24 23:42:37 -05:00
winlin
9ab5e6a916 For #299, fix bug of fragment url 2017-03-19 12:49:58 +08:00
winlin
c71e8fa947 For #299, fragment reap workflow 2017-03-19 12:30:02 +08:00
winlin
721a8457c2 For #299, Refine init mp4, use fragment 2017-03-19 12:29:38 +08:00
winlin
8d679a6f9a For #299, use fragment for dvr FLV/MP4 2017-03-18 21:41:01 +08:00
winlin
da4c390d69 For #299, extract fragment and fragment window for hls 2017-03-18 21:29:08 +08:00
winlin
6da6e0511d For #803, should refine code. 2017-03-11 16:28:18 +08:00
Chengdong Zhang
a6eebacc99 Streams API is not correct. (#800) 
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
 2017-03-11 16:21:33 +08:00
“winlin”
1b26536253 Add SIP RFC 2017-03-06 15:15:26 +08:00
“winlin”
a48fdd9f03 Add ICE RFC 2017-03-06 15:11:02 +08:00
winlin
ce034c3556 Refine docs, add TURN/STUN rfc. 2017-03-06 10:19:19 +08:00
winlin
3ec9df6578 For #299, A/V init mp4 are fine. 2017-03-05 18:44:37 +08:00
winlin
886930c22a For #299, refine the comments. 2017-03-05 14:17:39 +08:00
winlin
14765c2ba5 For #790, play or publish is not neccessary for bandwidth test. 2017-03-04 14:46:48 +08:00
ME_Kun_Han
3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790) 2017-03-04 14:44:34 +08:00
winlin
8ab43b3e78 Fix #794, refine the comments. 2017-03-04 14:29:17 +08:00
winlin
308c6fee18 Fix #786, simply don't reuse object. 3.0.20 2017-03-02 16:43:06 +08:00
winlin
7680ac04ad Refine srs-librtmp 2017-03-01 18:09:07 +08:00
winlin
1743899a23 Refine code 2017-03-01 13:49:50 +08:00
winlin
16cde27a1e Remove MacOS compile option, for it's on use. It's caused by paralell make 2017-03-01 12:39:42 +08:00
winlin
121a2e5886 For #110, refine thread object. 3.0.19 2017-03-01 12:28:32 +08:00
winlin
44014683e1 Refine thread. 2017-03-01 12:23:44 +08:00
winlin
5bec6a4fdd Refine srs-librtmp 2017-03-01 12:03:49 +08:00
winlin
011b693235 Update srs-librtmp, set errno to ret when failed. 2017-03-01 11:00:54 +08:00
winlin
72c4ae4a8c Refine srs-librtmp API, change print to format 2017-03-01 10:52:57 +08:00
winlin
ad87bd7cf2 Refine configure 2017-03-01 09:21:20 +08:00
winlin
68a5407b3a Remove using of connect_app2. 2017-02-28 20:35:56 +08:00
winlin
26c20db2b3 Fix parse srs version bug 2017-02-28 20:03:46 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
af73e8ee65 Add log functions for srs-librtmp 2017-02-28 16:19:54 +08:00
winlin
ca43bfe6d9 Fix build failed, for srs librtmp API changed. 2017-02-28 14:54:53 +08:00
winlin
cdfded6a74 Support disable valgrind 2017-02-28 14:47:00 +08:00
winlin
89a5fa69d1 Refine srs-librtmp, set the schema, rather that connect app3 2017-02-28 14:07:14 +08:00
winlin
4e96c443d8 Change the bool to int for C 2017-02-27 17:39:29 +08:00
winlin
747d6f2f52 For #299, write legal MPD, fix CORS. 2017-02-26 21:45:08 +08:00
winlin
8ab727f3c5 For #299, write MPD file. 2017-02-26 20:40:33 +08:00
winlin
3903d2a8e3 For #730, remove the test code. 2.0.234 2017-02-25 20:24:18 +08:00
HungMingWu
a6582c6208 Disable openssl thread support to prevent ubuntu linking pthread error 2017-02-25 09:47:29 +00:00
winlin
764cf245e9 For #774, build librtmp exmaples failed for -lpthread 2017-02-25 12:13:12 +08:00
winlin
ac0e27b936 For #774, refine code style 2017-02-25 12:10:41 +08:00
HungMingWu
01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 2017-02-25 12:06:39 +08:00
winlin
695ceeab48 Refine code for #777 2017-02-25 11:30:25 +08:00
Chengdong Zhang
a3df4e3bfb Fix #744 http callback set a wrong default port (#777) 
* Add port verify

Code is more robust

* Verify port

Verify port

* Change hard code to defined.

Change hard code to defined.
 2017-02-25 11:28:59 +08:00
winlin
d786d61685 Merge branch '2.0release' into develop 2017-02-25 11:21:56 +08:00
winlin
0059b1cf7a For #783, use directly free to replace auto free 2017-02-25 11:18:54 +08:00
ljx0305
b0d16840b5 fix Repeated release (#783) 
fix  Repeated release
 2017-02-25 11:15:27 +08:00
winlin
cee9d736a4 for #299, refine code. 2017-02-19 22:03:51 +08:00
winlin
ede1c34a25 for #299, refine the signature of api for hls/dash 2017-02-19 21:48:32 +08:00
HungMingWu
33d6274217 Replace ffmpeg version from 2.1.1 to 3.2.4 2017-02-13 23:29:39 +08:00
winlin
2fcd3972c1 for #299, refine the encoder object name 2017-02-12 21:50:02 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
d612a21bad for #299, refine audio codec object name 2017-02-12 20:46:24 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
7fd221ef63 Always enable DVR 2017-02-11 17:27:40 +08:00
winlin
b0789c54e4 Update HLS wiki to v3 2017-02-11 14:28:40 +08:00
winlin
8e5d4dc73d always enable http and hls 2017-02-11 13:29:53 +08:00
winlin
11e8fe5bc0 refine options, remove rtmp-hls 2017-02-11 12:45:49 +08:00
winlin
477414106a add dash files. 2017-02-11 12:30:21 +08:00
winlin
5fec59ace2 merge from srs2, fix #503 2017-02-09 14:33:56 +08:00
winlin
99bffea328 fix #503, disable utilities when reload a source. 2.0.233 2017-02-09 14:29:57 +08:00
winlin
15570d93ce change conf to console without daemon. 2017-02-09 14:17:36 +08:00
winlin
90ff579a83 add gitignore. 2017-02-09 13:56:04 +08:00
winlin
afbc3443f3 fix #738, support DVR general mp4. 3.0.17 2017-02-07 21:56:20 +08:00
winlin
3209ad29e0 for #738, refine code for DVR mp4. 2017-02-06 20:58:52 +08:00
winlin
0a054cd6bd for #738, remove the dvr plan append for it's no use 2017-02-06 20:22:07 +08:00
winlin
8c01f52372 for #738, refine the dvr segmenter. 2017-02-06 18:33:26 +08:00
winlin
31191f2650 for #738, support srs ingest mp4 2017-02-05 21:22:07 +08:00
winlin
4fe79a1025 for #738, fix the audio sample offset error. 2017-02-05 20:27:37 +08:00
winlin
733252dc21 for #738, remove test code 2017-02-05 09:23:38 +08:00
winlin
733ba73d54 for #738, write mp4 samples. 2017-02-05 09:15:46 +08:00
winlin
e24674e9cf for #738, refine build mp4 samples from moov. 2017-02-04 22:45:52 +08:00
winlin
3025aebf42 for #738, mp4 build samples from moov. 2017-02-04 22:25:03 +08:00
winlin
253ac40312 for #738, parse avcc/sps/pps/asc from mp4. 2017-02-04 14:57:07 +08:00
winlin
9d21a8bb33 for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov). 2017-02-03 22:49:19 +08:00
winlin
bbee16e4db for #738, parse moov, get the h.264/avcC and aac/asc 2017-02-03 21:03:26 +08:00
winlin
e8eb050bf2 update readme 2017-02-03 14:57:28 +08:00
winlin
ac7ee10b60 fix #751,#756, refine code 2017-02-03 11:56:02 +08:00
Chengdong Zhang
80540e4dc1 change TAB space 
change TAB space for line 794
 2017-02-03 10:58:32 +08:00
eagle-zhang
7b02e3543f Clients Api support start and count 
Clients Api support start and count
line 794~810 && line 830
 2017-02-03 10:49:06 +08:00
winlin
7ee1df33d1 for #738, parse mp4 udta(user data) box. 2017-02-02 22:20:33 +08:00
winlin
ffe0a4426d for #738, parse mp4 moov boxes. 2017-02-02 22:02:39 +08:00
winlin
96f2e18d3a for #738, demux the aac mp4a and esds 2017-02-02 19:05:08 +08:00
winlin
128a1fd3db for #738, decode mp4 video track boxes. 2017-02-02 15:10:11 +08:00
winlin
5a84b6ca94 for #738, complete all mp4 boxes codec. 2017-02-02 12:36:48 +08:00
winlin
2ad265bd5a for #738, implements boxes codec 2017-02-01 21:57:32 +08:00
winlin
b6bb3f2446 fix c99 build failed. 2017-01-31 22:17:27 +08:00
winlin
858951da49 for #738, add srs ingest mp4 2017-01-31 21:36:51 +08:00
winlin
34a8eb6113 for #738, add srs ingest mp4 tool 2017-01-31 20:43:48 +08:00
winlin
33ba6cdee2 change utest when demuxer use io interface. 2017-01-30 20:58:32 +08:00
winlin
01d401c270 for #738, refine flv codec to use io interface. 2017-01-30 20:12:36 +08:00
winlin
d3bb8b6a86 for #742, refine the io interfaces. 2017-01-30 19:59:59 +08:00
winlin
eaa222f034 for #742, refine the file reader and writer interface. 2017-01-30 19:35:04 +08:00
winlin
bb5bd0ee1c include for uintxx_t 2017-01-30 17:38:30 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
011ac4f6a9 for #738, add mp4 demuxer to librtmp 2017-01-30 17:19:07 +08:00
winlin
3f3e98e9db for #738, major boxes from isom 2017-01-29 17:16:20 +08:00
winlin
8588a10775 Merge branch '2.0release' into develop 2017-01-29 17:15:43 +08:00
winlin
a37a14377a fix the example dvr config file error 2017-01-29 17:15:17 +08:00
winlin
b09183010b for #738, add isom boxes. 2017-01-29 15:45:27 +08:00
winlin
ca02aaa7b3 for #738, add doc, moov box. 2017-01-28 19:32:43 +08:00
winlin
6b6ac9a054 for #738, add box and fullbox. 2017-01-27 20:54:05 +08:00
winlin
91a3989372 for #738, add mp4 demuxer files to kernel. 2017-01-27 11:27:02 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +08:00
winlin
e8353cba3b for #299, add mp4 and dash doc. 2017-01-26 16:53:30 +08:00
winlin
38a683fe14 disable glibc memory check 2017-01-23 18:06:30 +08:00
winlin
7057bb1ef5 for #742, always enable http utilities. 2017-01-23 17:55:52 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
79def81792 for #742, refine the rtmp conn, use info as data cluster. 2017-01-23 17:12:04 +08:00
winlin
39aee2b318 for #742, fix publish recv thread bug. 2017-01-23 16:44:42 +08:00
winlin
954bb186c1 identify the flash and fmle for recv thread. 2017-01-23 16:43:43 +08:00
winlin
4583a63789 for #742, refine code for recv thread. 2017-01-23 16:38:23 +08:00
winlin
a07986f4ee for #742, refine code 2017-01-22 17:07:55 +08:00
winlin
5c959fc781 merge from srs2, for kbps free io 2017-01-22 13:16:05 +08:00
winlin
6706bda42c for #752, release the io then free it for kbps. 2.0.232 2017-01-22 13:12:56 +08:00
winlin
a3ea83f504 directly free the transport, not need to close for maybe NULL 2017-01-20 12:11:52 +08:00
winlin
99c13fb1c1 convert ms to us for st 2017-01-19 15:51:55 +08:00
winlin
7bfb648bd8 refine the meta cache name 2017-01-19 15:51:34 +08:00
winlin
4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 2017-01-19 12:38:55 +08:00
winlin
8acb99f96c refine comments for librtmp 2017-01-18 16:59:19 +08:00
winlin
c5fcc15989 update the date info 2017-01-18 16:41:47 +08:00
winlin
0e6f7e66f0 add srs_rtmp_free_packet for srs-librtmp 2017-01-18 16:31:41 +08:00
winlin
7acc3aca16 refine hijack io for srslibrtmp 2017-01-18 16:23:59 +08:00
winlin
e8c48ac8f8 merge srs2, use specific error code for dns resolve 2017-01-18 16:05:33 +08:00
winlin
60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 2017-01-18 16:03:57 +08:00
winlin
310032d8d8 merge srs2, timestamp overflow for ATC. 2017-01-18 11:48:31 +08:00
winlin
d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 2017-01-18 11:47:43 +08:00
winlin
2ef1ef06e9 increase the nb_samples because some large video may overflow. 2017-01-18 11:11:36 +08:00
cenxinwei
762d7a8884 fix publish_normal_timeout 配置读取错误 2017-01-17 15:11:40 +08:00
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
dca9749f37 for #742, refine the object live cycle. 3.0.15 2017-01-17 10:44:13 +08:00
winlin
f4c0af8bfc refine code remove dup api for #742 2017-01-16 16:20:34 +08:00
winlin
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00
winlin
750f4413c8 merge srs2 for #536 2017-01-16 12:47:48 +08:00
winlin
142a9733b2 refine encoder code for #536. 2017-01-16 12:42:25 +08:00
winlin
ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 2017-01-11 17:43:29 +08:00
winlin
e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 2017-01-11 17:42:34 +08:00
winlin
f92db0f87e merge srs2 for kbps 2017-01-11 11:46:50 +08:00
winlin
6a8c232c5b fix #588, kbps interface error. 2.0.228 2017-01-11 11:37:26 +08:00
winlin
c58dbe4d14 fix #588, kbps interface error. 2.0.228 2017-01-11 11:22:16 +08:00
winlin
7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 2017-01-11 09:45:22 +08:00
winlin
7bbb3bae42 merge srs2 2017-01-11 09:33:26 +08:00
winlin
e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 2017-01-11 09:25:48 +08:00
Himer
afa704bca5 Update srs_app_source.cpp 
enabled 为true才进行转发实例创建
 2017-01-10 21:16:49 +08:00
winlin
db231f6d37 refine hls html5 video template. 2017-01-10 18:43:36 +08:00
winlin
087a596a63 refine hls html5 video template. 2017-01-10 18:43:10 +08:00
winlin
df983cc9ec fix typo 2017-01-10 18:14:06 +08:00
winlin
a1ae48f4ac Merge branch '2.0release' into develop 2017-01-10 18:07:52 +08:00
winlin
6fbda2ae3f for #635, refine hls open/close gop. 2017-01-10 18:07:46 +08:00
winlin
07871a442e fix typo 2017-01-10 17:18:22 +08:00
winlin
ae1920e91a Merge branch '2.0release' into develop 2017-01-10 17:17:31 +08:00
winlin
4104f25069 for #635, support IDR and NonIDR(open-gop). 2017-01-10 17:17:23 +08:00
winlin
1dd877c0d6 merge srs2 2017-01-10 11:17:37 +08:00
winlin
c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 2017-01-10 11:14:20 +08:00
winlin
d49f195bbf fix #734, log format error. 2017-01-10 09:36:51 +08:00
winlin
c46e925be5 add utest for avc uev 2017-01-09 18:14:25 +08:00
winlin
b7dd764920 update gitignore 2017-01-09 15:17:08 +08:00
winlin
10a0c6c10c update for srs3 2017-01-06 17:55:06 +08:00
winlin
1b1ae00910 fix #727, install valgrind-devel 2017-01-06 17:51:07 +08:00
winlin
517812dbe2 remove test code for #730 2017-01-06 15:19:27 +08:00
winlin
1b175b1107 for #730, support config in/out ack size. 3.0.13 2017-01-06 14:57:54 +08:00
winlin
bbbc40f9c2 Merge branch '2.0release' into develop 2017-01-06 14:32:07 +08:00
winlin
aa2b7afb44 refine code, print protocol level info. 2017-01-06 14:32:01 +08:00