胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
5e6c490b 1 parent e80abac4

add ingest compile feature

内嵌 并排对比
正在显示 2 个修改的文件 包含 21 行增加 和 2 行删除
@@ -516,6 +516,12 @@ else @@ -516,6 +516,12 @@ else
516 echo "#undef SRS_TRANSCODE" >> $SRS_AUTO_HEADERS_H 516 echo "#undef SRS_TRANSCODE" >> $SRS_AUTO_HEADERS_H
517 fi 517 fi
518 518
  519 +if [ $SRS_INGEST = YES ]; then
  520 + echo "#define SRS_INGEST" >> $SRS_AUTO_HEADERS_H
  521 +else
  522 + echo "#undef SRS_INGEST" >> $SRS_AUTO_HEADERS_H
  523 +fi
  524 +
519 ##################################################################################### 525 #####################################################################################
520 # build research code 526 # build research code
521 ##################################################################################### 527 #####################################################################################
@@ -86,6 +86,7 @@ SrsNginxSummaryColor="\${GREEN}{disabled} "; if [ $SRS_NGINX = YES ]; then SrsNg @@ -86,6 +86,7 @@ SrsNginxSummaryColor="\${GREEN}{disabled} "; if [ $SRS_NGINX = YES ]; then SrsNg
86 SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi 86 SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi
87 SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi 87 SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi
88 SrsTranscodeSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi 88 SrsTranscodeSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi
  89 +SrsIngestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_INGEST = YES ]; then SrsIngestSummaryColor="\${GREEN}"; fi
89 SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi 90 SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi
90 SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi 91 SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi
91 SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi 92 SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi
@@ -156,6 +157,8 @@ echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winl @@ -156,6 +157,8 @@ echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winl
156 echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" 157 echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}"
157 echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG\${BLACK}" 158 echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG\${BLACK}"
158 echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" 159 echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}"
  160 +echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/Ingest\${BLACK}"
  161 +echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}"
159 echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback\${BLACK}" 162 echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback\${BLACK}"
160 echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" 163 echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}"
161 echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer\${BLACK}" 164 echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer\${BLACK}"
@@ -517,9 +520,19 @@ else @@ -517,9 +520,19 @@ else
517 echo -e "${YELLOW}warning: without rtmp complex handshake support, donot support h264/aac to adobe flash player${BLACK}" 520 echo -e "${YELLOW}warning: without rtmp complex handshake support, donot support h264/aac to adobe flash player${BLACK}"
518 fi 521 fi
519 if [ $SRS_FFMPEG = YES ]; then 522 if [ $SRS_FFMPEG = YES ]; then
520 - echo -e "${GREEN}live stream transcoding over FFMPEG is enabled${BLACK}" 523 + echo -e "${GREEN}transcode/mux/ingest tool FFMPEG is enabled${BLACK}"
521 else 524 else
522 - echo -e "${YELLOW}warning: without live stream transcoding over FFMPEG support${BLACK}" 525 + echo -e "${YELLOW}warning: without transcode/mux/ingest tool FFMPEG support${BLACK}"
  526 +fi
  527 +if [ $SRS_TRANSCODE = YES ]; then
  528 + echo -e "${GREEN}transcoding RTMP stream is enabled${BLACK}"
  529 +else
  530 + echo -e "${YELLOW}warning: without transcoding RTMP stream support${BLACK}"
  531 +fi
  532 +if [ $SRS_INGEST = YES ]; then
  533 + echo -e "${GREEN}ingest file/stream/device is enabled${BLACK}"
  534 +else
  535 + echo -e "${YELLOW}warning: without ingest file/stream/device support${BLACK}"
523 fi 536 fi
524 if [ $SRS_HTTP_CALLBACK = YES ]; then 537 if [ $SRS_HTTP_CALLBACK = YES ]; then
525 echo -e "${GREEN}http hooks callback over CherryPy is enabled${BLACK}" 538 echo -e "${GREEN}http hooks callback over CherryPy is enabled${BLACK}"