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

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-04-26 13:58:59 +08:00
commit 1fabe5137d
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/auto/utest.sh
View file

@ -118,7 +118,11 @@ done
# #
# depends library header files # depends library header files
for item in ${ModuleLibIncs[*]}; do for item in ${ModuleLibIncs[*]}; do
echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE} if [[ "${item:0:1}" == "/" ]]; then
echo -n "-I${item} " >> ${FILE}
else
echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
fi
done done
echo "" >> ${FILE}; echo "" >> ${FILE} echo "" >> ${FILE}; echo "" >> ${FILE}
@ -164,10 +168,10 @@ echo "" >> ${FILE}
echo "# link all depends libraries" >> ${FILE} echo "# link all depends libraries" >> ${FILE}
echo -n "DEPS_LIBRARIES_FILES = " >> ${FILE} echo -n "DEPS_LIBRARIES_FILES = " >> ${FILE}
for item in ${ModuleLibFiles[*]}; do for item in ${ModuleLibFiles[*]}; do
if [[ -f ${item} ]]; then if [[ "${item:0:1}" == "/" ]]; then
echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
else
echo -n "${item} " >> ${FILE} echo -n "${item} " >> ${FILE}
else
echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
fi fi
done done
echo "" >> ${FILE}; echo "" >> ${FILE} echo "" >> ${FILE}; echo "" >> ${FILE}

6
trunk/configure vendored
View file

@ -395,6 +395,9 @@ fi
if [[ $SRS_FFMPEG_FIT == YES ]]; then if [[ $SRS_FFMPEG_FIT == YES ]]; then
ModuleLibFiles+=("${LibFfmpegFile[*]}") ModuleLibFiles+=("${LibFfmpegFile[*]}")
fi fi
if [[ $SRS_GB28181 == YES ]]; then
ModuleLibFiles+=("${LibIconvfile[*]}")
fi
# #
for SRS_MODULE in ${SRS_MODULES[*]}; do for SRS_MODULE in ${SRS_MODULES[*]}; do
. auto/reset_module.sh && . $SRS_MODULE/config . auto/reset_module.sh && . $SRS_MODULE/config
@ -433,6 +436,9 @@ if [ $SRS_UTEST = YES ]; then
if [[ $SRS_SRT == YES ]]; then if [[ $SRS_SRT == YES ]]; then
ModuleLibFiles+=("${LibSRTfile[*]}") ModuleLibFiles+=("${LibSRTfile[*]}")
fi fi
if [[ $SRS_GB28181 == YES ]]; then
ModuleLibFiles+=("${LibIconvfile[*]}")
fi
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
if [[ $SRS_SRT == YES ]]; then if [[ $SRS_SRT == YES ]]; then
MODULE_DEPENDS+=("SRT") MODULE_DEPENDS+=("SRT")

3
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -58,6 +58,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
// @global config object for app module. // @global config object for app module.
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = new SrsConfig();
// @global Other variables.
bool _srs_in_docker = false;
/** /**
* main entrance. * main entrance.
*/ */

3
trunk/src/main/srs_main_mp4_parser.cpp
View file

@ -44,6 +44,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
// @global config object for app module. // @global config object for app module.
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = new SrsConfig();
// @global Other variables.
bool _srs_in_docker = false;
srs_error_t parse(std::string mp4_file, bool verbose) srs_error_t parse(std::string mp4_file, bool verbose)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;