Skip to content

Commit 593747b

Browse files
xiaozhihongxiaozhihong
authored
Merge edc291a into 3ed4aed 
2 parents 3ed4aed + edc291a commit 593747b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4437
-3367
lines changed

‎trunk/auto/depends.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,9 @@ function OSX_prepare()
253253

254254
echo "OSX detected, install tools if needed"
255255

256-
brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
257-
echo "install brew"
258-
echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
259-
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
260-
echo "install brew success"
256+
brew --version >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
257+
echo "Please install brew at https://brew.sh/"
258+
exit $ret
261259
fi
262260

263261
gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then

‎trunk/auto/options.sh

-6
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,6 @@ function apply_auto_options() {
432432
SRS_TOOL_LD=$SRS_TOOL_CC
433433
fi
434434

435-
# The SRT code in SRS requires c++11, although we build libsrt without c++11.
436-
# TODO: FIXME: Remove c++11 code in SRT of SRS.
437-
if [[ $SRS_SRT == YES ]]; then
438-
SRS_CXX11=YES
439-
fi
440-
441435
# Enable FFmpeg fit for RTC to transcode audio from AAC to OPUS, if user enabled it.
442436
if [[ $SRS_RTC == YES && $SRS_FFMPEG_FIT == RESERVED ]]; then
443437
SRS_FFMPEG_FIT=YES

‎trunk/conf/full.conf

+49-5
Original file line numberDiff line numberDiff line change
@@ -352,23 +352,67 @@ stream_caster {
352352
#############################################################################################
353353
# SRT server section
354354
#############################################################################################
355-
# @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026
355+
# @doc https://github.com/ossrs/srs/issues/1147#usage
356356
srt_server {
357357
# whether SRT server is enabled.
358358
# default: off
359359
enabled on;
360360
# The UDP listen port for SRT.
361361
listen 10080;
362362
# For detail parameters, please read wiki:
363-
# https://github.com/ossrs/srs/wiki/v4_CN_SRTParams
364-
# https://github.com/ossrs/srs/wiki/v4_EN_SRTParams
363+
# https://github.com/ossrs/srs/wiki/v5_CN_SRTParams
364+
# https://github.com/ossrs/srs/wiki/v5_EN_SRTParams
365+
366+
# The maxbw is the max bandwidth of the sender side.
367+
# -1: Means the biggest bandwidth is infinity.
368+
# 0: Means the bandwidth is determined by SRTO_INPUTBW.
369+
# >0: Means the bandwidth is the configuration value.
370+
# default: -1
365371
maxbw 1000000000;
372+
# The timeout time of the SRT connection on the sender side in ms. When SRT connects to a peer costs time
373+
# more than this config, it will be close.
374+
# default: 3000
366375
connect_timeout 4000;
367-
peerlatency 300;
368-
recvlatency 300;
376+
# The timeout time of SRT connection on the receiver side in ms. When the SRT connection is idle
377+
# more than this config, it will be close.
378+
# default: 10000
379+
peer_idle_timeout 8000;
369380
# Default app for vmix, see https://github.com/ossrs/srs/pull/1615
370381
# default: live
371382
default_app live;
383+
# The peerlatency is set by the sender side and will notify the receiver side.
384+
# default: 0
385+
peerlatency 0;
386+
# The recvlatency means latency from sender to receiver.
387+
# default: 120
388+
recvlatency 0;
389+
# This latency configuration configures both recvlatency and peerlatency to the same value.
390+
# default: 120
391+
latency 0;
392+
# The tsbpd mode means timestamp based packet delivery.
393+
# SRT sender side will pack timestamp in each packet. If this config is true,
394+
# the receiver will read the packet according to the timestamp in the head of the packet.
395+
# default: on
396+
tsbpdmode off;
397+
# The tlpkdrop means too-late Packet Drop
398+
# SRT sender side will pack timestamp in each packet, When the network is congested,
399+
# the packet will drop if latency is bigger than the configuration in both sender side and receiver side.
400+
# And on the sender side, it also will be dropped because latency is bigger than configuration.
401+
# default: on
402+
tlpktdrop off;
403+
# The send buffer size of SRT.
404+
# default: 8192 * (1500-28)
405+
sendbuf 2000000;
406+
# The recv buffer size of SRT.
407+
# default: 8192 * (1500-28)
408+
recvbuf 2000000;
409+
}
410+
411+
vhost srt.vhost.srs.com {
412+
srt {
413+
enabled on;
414+
srt_to_rtmp on;
415+
}
372416
}
373417

374418
#############################################################################################

‎trunk/conf/srt.conf

+12-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,22 @@ srt_server {
2121
listen 10080;
2222
maxbw 1000000000;
2323
connect_timeout 4000;
24-
peerlatency 300;
25-
recvlatency 300;
24+
peerlatency 0;
25+
recvlatency 0;
26+
latency 0;
27+
tsbpdmode off;
28+
tlpktdrop off;
29+
sendbuf 2000000;
30+
recvbuf 2000000;
2631
}
2732

2833
# @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026
2934
vhost __defaultVhost__ {
35+
srt {
36+
enabled on;
37+
srt_to_rtmp on;
38+
}
39+
3040
http_remux {
3141
enabled on;
3242
mount [vhost]/[app]/[stream].flv;

‎trunk/configure

+12-22
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ fi
164164

165165
# srt code path
166166
if [[ $SRS_SRT == YES ]]; then
167-
SrsSRTRoot="${SRS_WORKDIR}/src/srt"
168167
LibSRTRoot="${SRS_OBJS_DIR}/srt/include"; LibSRTfile="${SRS_OBJS_DIR}/srt/lib/libsrt.a"
169168
if [[ $SRS_SHARED_SRT == YES ]]; then LibSRTfile="-L${SRS_OBJS_DIR}/srt/lib -lsrt"; fi
170169
fi
@@ -200,7 +199,7 @@ MODULE_ID="CORE"
200199
MODULE_DEPENDS=()
201200
ModuleLibIncs=(${SRS_OBJS_DIR})
202201
MODULE_FILES=("srs_core" "srs_core_version5" "srs_core_autofree" "srs_core_performance"
203-
"srs_core_time" "srs_core_platform")
202+
"srs_core_time" "srs_core_platform" "srs_core_lock")
204203
CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh
205204
CORE_OBJS="${MODULE_OBJS[@]}"
206205
#
@@ -228,6 +227,10 @@ MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_conn" "srs_pro
228227
"srs_protocol_raw_avc" "srs_protocol_rtsp_stack" "srs_protocol_http_stack" "srs_protocol_kbps" "srs_protocol_json"
229228
"srs_protocol_format" "srs_protocol_log" "srs_protocol_st" "srs_protocol_http_client"
230229
"srs_protocol_http_conn" "srs_protocol_rtmp_conn")
230+
if [[ $SRS_SRT == YES ]]; then
231+
MODULE_FILES+=("srs_protocol_srt")
232+
ModuleLibIncs+=(${LibSRTRoot})
233+
fi
231234
if [[ $SRS_RTC == YES ]]; then
232235
MODULE_FILES+=("srs_protocol_rtc_stun")
233236
ModuleLibIncs+=(${LibSrtpRoot})
@@ -237,16 +240,6 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
237240
fi
238241
PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh
239242
PROTOCOL_OBJS="${MODULE_OBJS[@]}"
240-
#
241-
#srt protocol features.
242-
if [[ $SRS_SRT == YES ]]; then
243-
MODULE_ID="SRT"
244-
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
245-
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot} ${LibSRTRoot})
246-
MODULE_FILES=("srt_server" "srt_handle" "srt_conn" "srt_to_rtmp" "ts_demux" "srt_data" "srt_log")
247-
SRT_INCS=(${LibSRTRoot} ${SrsSRTRoot}); MODULE_DIR=${SrsSRTRoot} . auto/modules.sh
248-
SRT_OBJS="${MODULE_OBJS[@]}"
249-
fi
250243

251244
#
252245
#App Module, for SRS server only.
@@ -262,6 +255,9 @@ fi
262255
if [[ $SRS_FFMPEG_FIT == YES ]]; then
263256
ModuleLibIncs+=("${LibFfmpegRoot[*]}")
264257
fi
258+
if [[ $SRS_SRT == YES ]]; then
259+
ModuleLibIncs+=("${LibSRTRoot[*]}")
260+
fi
265261
MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_source"
266262
"srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream"
267263
"srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
@@ -273,6 +269,9 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_sourc
273269
"srs_app_caster_flv" "srs_app_latest_version" "srs_app_uuid" "srs_app_process" "srs_app_ng_exec"
274270
"srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
275271
"srs_app_coworkers" "srs_app_hybrid" "srs_app_threads")
272+
if [[ $SRS_SRT == YES ]]; then
273+
MODULE_FILES+=("srs_app_srt_server" "srs_app_srt_listener" "srs_app_srt_conn" "srs_app_srt_utility" "srs_app_srt_source")
274+
fi
276275
if [[ $SRS_RTC == YES ]]; then
277276
MODULE_FILES+=("srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_sdp"
278277
"srs_app_rtc_queue" "srs_app_rtc_server" "srs_app_rtc_source" "srs_app_rtc_api")
@@ -294,9 +293,6 @@ APP_OBJS="${MODULE_OBJS[@]}"
294293
#Server Module, for SRS only.
295294
MODULE_ID="SERVER"
296295
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
297-
if [[ $SRS_SRT == YES ]]; then
298-
MODULE_DEPENDS+=("SRT")
299-
fi
300296
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibGperfRoot} ${LibSSLRoot})
301297
if [[ $SRS_RTC == YES ]]; then
302298
ModuleLibIncs+=(${LibSrtpRoot})
@@ -306,7 +302,6 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
306302
fi
307303
if [[ $SRS_SRT == YES ]]; then
308304
ModuleLibIncs+=(${LibSRTRoot})
309-
ModuleLibIncs+=("${SrsSRTRoot[*]}")
310305
fi
311306
MODULE_FILES=("srs_main_server")
312307
SERVER_INCS="src/main"; MODULE_DIR=${SERVER_INCS} . auto/modules.sh
@@ -324,7 +319,6 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
324319
fi
325320
if [[ $SRS_SRT == YES ]]; then
326321
ModuleLibIncs+=(${LibSRTRoot})
327-
ModuleLibIncs+=("${SrsSRTRoot[*]}")
328322
fi
329323
MODULE_FILES=()
330324
DEFINES=""
@@ -370,7 +364,6 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
370364
fi
371365
if [[ $SRS_SRT == YES ]]; then
372366
ModuleLibIncs+=(${LibSRTRoot})
373-
ModuleLibIncs+=("${SrsSRTRoot[*]}")
374367
MODULE_OBJS="${MODULE_OBJS} ${SRT_OBJS[@]}"
375368
fi
376369
LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}"
@@ -416,7 +409,7 @@ if [ $SRS_UTEST = YES ]; then
416409
ModuleLibIncs+=("${LibFfmpegRoot[*]}")
417410
fi
418411
if [[ $SRS_SRT == YES ]]; then
419-
ModuleLibIncs+=("${SrsSRTRoot[*]}")
412+
ModuleLibIncs+=("${LibSRTRoot[*]}")
420413
fi
421414
ModuleLibFiles=(${LibSTfile} ${LibSSLfile})
422415
if [[ $SRS_RTC == YES ]]; then
@@ -429,9 +422,6 @@ if [ $SRS_UTEST = YES ]; then
429422
ModuleLibFiles+=("${LibSRTfile[*]}")
430423
fi
431424
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
432-
if [[ $SRS_SRT == YES ]]; then
433-
MODULE_DEPENDS+=("SRT")
434-
fi
435425
MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${SRT_OBJS[@]}"
436426
LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
437427
fi

‎trunk/ide/srs_clion/CMakeLists.txt

+10-9
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ ProcessorCount(JOBS)
2626

2727
# We should always configure SRS for switching between branches.
2828
IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
29-
EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --osx --srt=on --utest=on --jobs=${JOBS}")
29+
EXECUTE_PROCESS(
30+
COMMAND ./configure --osx --srt=on --utest=on --jobs=${JOBS}
31+
WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret)
3032
ELSE ()
31-
EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --srt=on --utest=on --jobs=${JOBS}")
33+
EXECUTE_PROCESS(
34+
COMMAND ./configure --srt=on --utest=on --jobs=${JOBS}
35+
WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret)
3236
ENDIF ()
37+
if(NOT ret EQUAL 0)
38+
message(FATAL_ERROR "FAILED: ${ret}")
39+
endif()
3340

3441
set(DEPS_LIBS ${SRS_DIR}/objs/st/libst.a
3542
${SRS_DIR}/objs/openssl/lib/libssl.a
@@ -61,19 +68,13 @@ INCLUDE_DIRECTORIES(${SRS_DIR}/objs
6168
${SRS_DIR}/src/kernel
6269
${SRS_DIR}/src/protocol
6370
${SRS_DIR}/src/app
64-
${SRS_DIR}/src/service
65-
${SRS_DIR}/src/srt)
71+
${SRS_DIR}/src/service)
6672

6773
# Common used sources for SRS and utest.
6874
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/core SOURCE_FILES)
6975
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/kernel SOURCE_FILES)
7076
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/protocol SOURCE_FILES)
7177
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/app SOURCE_FILES)
72-
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/srt SOURCE_FILES)
73-
74-
# Remove the duplicated test main for srt.
75-
# TODO: FIMXE: Remove the file directly, use utest or main or research.
76-
list(REMOVE_ITEM SOURCE_FILES ${SRS_DIR}/src/srt/ts_demux_test.cpp)
7778

7879
ADD_DEFINITIONS("-g -O0")
7980

0 commit comments

Comments
 (0)