external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

SRT: Support debug and run with CLion. v4.0.249

Browse source
This commit is contained in:
winlin 2022-03-17 08:42:44 +08:00
parent ab81696102
commit c5cc79ee6f
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.run/srt.run.xml Normal file
View file

@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="srt" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="-c conf/srt.conf" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" WORKING_DIR="file://$CMakeCurrentBuildDir$/../../../" PASS_PARENT_ENVS_2="true" PROJECT_NAME="srs" TARGET_NAME="srs" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="srs" RUN_TARGET_NAME="srs">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
</component>

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 4.0 Changelog ## SRS 4.0 Changelog
* v4.0, 2022-03-17, SRT: Support debug and run with CLion. v4.0.249
* v4.0, 2022-03-15, Merge [#2966](https://github.com/ossrs/srs/pull/2966): Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248 * v4.0, 2022-03-15, Merge [#2966](https://github.com/ossrs/srs/pull/2966): Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
* v4.0, 2022-03-07, RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 * v4.0, 2022-03-07, RTC: Identify the WebRTC publisher in param for hooks. v4.0.247
* v4.0, 2022-03-07, SRT: Append vhost to stream, not app. v4.0.246 * v4.0, 2022-03-07, SRT: Append vhost to stream, not app. v4.0.246

14
trunk/ide/srs_clion/CMakeLists.txt
View file

@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(srs CXX) project(srs CXX)
set (CMAKE_CXX_STANDARD 11)
########################################################### ###########################################################
execute_process( execute_process(
@ -16,7 +17,7 @@ ProcessorCount(JOBS)
# We should always configure SRS for switching between branches. # We should always configure SRS for switching between branches.
IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --osx --jobs=${JOBS}") EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --osx --srt=on --jobs=${JOBS}")
ELSE () ELSE ()
EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --jobs=${JOBS}") EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --jobs=${JOBS}")
ENDIF () ENDIF ()
@ -28,7 +29,8 @@ set(DEPS_LIBS ${SRS_DIR}/objs/st/libst.a
${SRS_DIR}/objs/ffmpeg/lib/libavcodec.a ${SRS_DIR}/objs/ffmpeg/lib/libavcodec.a
${SRS_DIR}/objs/ffmpeg/lib/libavutil.a ${SRS_DIR}/objs/ffmpeg/lib/libavutil.a
${SRS_DIR}/objs/opus/lib/libopus.a ${SRS_DIR}/objs/opus/lib/libopus.a
${SRS_DIR}/objs/ffmpeg/lib/libswresample.a) ${SRS_DIR}/objs/ffmpeg/lib/libswresample.a
${SRS_DIR}/objs/srt/lib/libsrt.a)
foreach(DEPS_LIB ${DEPS_LIBS}) foreach(DEPS_LIB ${DEPS_LIBS})
IF (NOT EXISTS ${DEPS_LIB}) IF (NOT EXISTS ${DEPS_LIB})
MESSAGE(FATAL_ERROR "${DEPS_LIB} not found") MESSAGE(FATAL_ERROR "${DEPS_LIB} not found")
@ -45,17 +47,23 @@ INCLUDE_DIRECTORIES(${SRS_DIR}/objs
${SRS_DIR}/objs/srtp2/include ${SRS_DIR}/objs/srtp2/include
${SRS_DIR}/objs/opus/include ${SRS_DIR}/objs/opus/include
${SRS_DIR}/objs/ffmpeg/include ${SRS_DIR}/objs/ffmpeg/include
${SRS_DIR}/objs/srt/include
${SRS_DIR}/src/core ${SRS_DIR}/src/core
${SRS_DIR}/src/kernel ${SRS_DIR}/src/kernel
${SRS_DIR}/src/protocol ${SRS_DIR}/src/protocol
${SRS_DIR}/src/app ${SRS_DIR}/src/app
${SRS_DIR}/src/service) ${SRS_DIR}/src/service
${SRS_DIR}/src/srt)
set(SOURCE_FILES ${SRS_DIR}/src/main/srs_main_server.cpp) set(SOURCE_FILES ${SRS_DIR}/src/main/srs_main_server.cpp)
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/core SOURCE_FILES) AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/core SOURCE_FILES)
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/kernel SOURCE_FILES) AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/kernel SOURCE_FILES)
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/protocol SOURCE_FILES) AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/protocol SOURCE_FILES)
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/app SOURCE_FILES) AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/app SOURCE_FILES)
AUX_SOURCE_DIRECTORY(${SRS_DIR}/src/srt SOURCE_FILES)
# Remove the duplicated main.
list(REMOVE_ITEM SOURCE_FILES ${SRS_DIR}/src/srt/ts_demux_test.cpp)
ADD_DEFINITIONS("-g -O0") ADD_DEFINITIONS("-g -O0")

2
trunk/src/core/srs_core_version4.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 248 #define VERSION_REVISION 249
#endif #endif