From 40eb5c0ef56bd823ef3ed4d3d8967f926c5fce55 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 10 Apr 2020 08:55:04 +0800 Subject: [PATCH] For #307, disable vappi for FFmpeg-fit --- trunk/auto/depends.sh | 9 +++++---- trunk/configure | 12 +++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 1d72c02ab..457b371a5 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -639,10 +639,11 @@ if [[ $SRS_EXPORT_LIBRTMP_PROJECT == NO && $SRS_RTC == YES ]]; then --disable-programs --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages \ --disable-avdevice --disable-avformat --disable-swscale --disable-postproc --disable-avfilter --disable-network \ --disable-dct --disable-dwt --disable-error-resilience --disable-lsp --disable-lzo --disable-faan --disable-pixelutils \ - --disable-hwaccels --disable-devices --disable-audiotoolbox --disable-videotoolbox --disable-appkit --disable-coreimage \ - --disable-avfoundation --disable-securetransport --disable-iconv --disable-lzma --disable-sdl2 --disable-everything \ - --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm --enable-decoder=libopus --enable-encoder=aac \ - --enable-encoder=opus --enable-encoder=libopus --enable-libopus && + --disable-hwaccels --disable-devices --disable-audiotoolbox --disable-videotoolbox --disable-cuda-llvm --disable-cuvid \ + --disable-d3d11va --disable-dxva2 --disable-ffnvcodec --disable-nvdec --disable-nvenc --disable-v4l2-m2m --disable-vaapi \ + --disable-vdpau --disable-appkit --disable-coreimage --disable-avfoundation --disable-securetransport --disable-iconv \ + --disable-lzma --disable-sdl2 --disable-everything --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm \ + --enable-decoder=libopus --enable-encoder=aac --enable-encoder=opus --enable-encoder=libopus --enable-libopus && make ${SRS_JOBS} && make install && cd .. && rm -rf ffmpeg && ln -sf ffmpeg-4.2-fit/${SRS_PLATFORM}/_release ffmpeg ) diff --git a/trunk/configure b/trunk/configure index 3c8e71976..ed76da4d5 100755 --- a/trunk/configure +++ b/trunk/configure @@ -444,7 +444,7 @@ mv ${SRS_WORKDIR}/${SRS_MAKEFILE} ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk # generate phony header cat << END > ${SRS_WORKDIR}/${SRS_MAKEFILE} .PHONY: default _default install install-api help clean destroy server srs_ingest_hls librtmp utest _prepare_dir $__mphonys -.PHONY: clean_srs clean_modules clean_openssl clean_nginx clean_cherrypy clean_srtp2 clean_opus +.PHONY: clean_srs clean_modules clean_openssl clean_nginx clean_cherrypy clean_srtp2 clean_opus clean_ffmpeg clean_st .PHONY: st ffmpeg # install prefix. @@ -481,6 +481,8 @@ help: @echo " clean_openssl Remove the openssl cache." @echo " clean_srtp2 Remove the libsrtp2 cache." @echo " clean_opus Remove the opus cache." + @echo " clean_ffmpeg Remove the FFmpeg cache." + @echo " clean_st Remove the ST cache." @echo "For example:" @echo " make" @echo " make help" @@ -519,6 +521,14 @@ clean_opus: (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf opus-1.3.1) @echo "Please rebuild opus by: ./configure" +clean_ffmpeg: + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf ffmpeg-4.2-fit) + @echo "Please rebuild FFmpeg by: ./configure" + +clean_st: + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf st-srs) + @echo "Please rebuild ST by: ./configure" + clean_nginx: (cd ${SRS_OBJS_DIR} && rm -rf nginx)