From 7f8df6f21fe217d35411ede1eaeab6564db39a38 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 11 Mar 2021 08:15:20 +0800 Subject: [PATCH] Build: Refine script for SRTP. Because we have upgraded to openssl-1.1.1d and libsrtp-2.3, so it's able to enable ASM for SRTP for not only openssl-1.0, because libsrtp-2.3 fixed the capacity bug. --- trunk/auto/depends.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 23ec86081..9033ef7e3 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -552,18 +552,6 @@ fi ##################################################################################### # srtp ##################################################################################### -# For openssl-1.1.*, we should disable SRTP ASM, because SRTP only works with openssl-1.0.* -if [[ $SRS_SRTP_ASM == YES ]]; then - echo " #include " > ${SRS_OBJS}/_tmp_srtp_asm_detect.c - echo " #if OPENSSL_VERSION_NUMBER >= 0x10100000L // v1.1.x " >> ${SRS_OBJS}/_tmp_srtp_asm_detect.c - echo " #error \"SRTP only works with openssl-1.0.*\" " >> ${SRS_OBJS}/_tmp_srtp_asm_detect.c - echo " #endif " >> ${SRS_OBJS}/_tmp_srtp_asm_detect.c - ${SRS_TOOL_CC} -c ${SRS_OBJS}/_tmp_srtp_asm_detect.c -I${SRS_OBJS}/openssl/include -o /dev/null >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - SRS_SRTP_ASM=NO && echo "Warning: Disable SRTP-ASM optimization, please update docker"; - fi - rm -f ${SRS_OBJS}/_tmp_srtp_asm_detect.c -fi; SRTP_CONFIG="echo SRTP without openssl(ASM) optimization" && SRTP_OPTIONS="" # If use ASM for SRTP, we enable openssl(with ASM). if [[ $SRS_SRTP_ASM == YES ]]; then