Sfoglia il codice sorgente

fix rtmp stream execution

Alfonso Gamboa 3 anni fa
parent
commit
14c853dc35
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      SD_ROOT/wz_mini/etc/init.d/wz_user.sh
  2. 1 1
      file.chk

+ 1 - 1
SD_ROOT/wz_mini/etc/init.d/wz_user.sh

@@ -542,7 +542,7 @@ if [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] || [[ "$RTSP_HI_RES_ENABLED" == "true
 	LD_LIBRARY_PATH=/media/mmc/wz_mini/lib /media/mmc/wz_mini/bin/v4l2rtspserver $AUDIO_CH $AUDIO_FMT -U $RTSP_LOGIN:$RTSP_PASSWORD -P $RTSP_PORT $DEVICE1 $DEVICE2 &
 fi
 
-if [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] || [[ "$RTSP_HI_RES_ENABLED" == "true" ]] && [[ "$RTMP_STREAM_ENABLED" == "true" ]] &&  [[ "$RTSP_LOW_RES_ENABLE_AUDIO" == "true" ]] ||  [[ "$RTSP_HI_RES_ENABLE_AUDIO" == "true" ]]; then
+if ([[ "$RTSP_LOW_RES_ENABLED" == "true" ]] || [[ "$RTSP_HI_RES_ENABLED" == "true" ]]) && [[ "$RTMP_STREAM_ENABLED" == "true" ]] && ([[ "$RTSP_LOW_RES_ENABLE_AUDIO" == "true" ]] || [[ "$RTSP_HI_RES_ENABLE_AUDIO" == "true" ]]); then
 	if [[ "$RTMP_STREAM_DISABLE_AUDIO" == "true" ]]; then
 		RMTP_AUDIO="no_audio"
 	fi

+ 1 - 1
file.chk

@@ -3,7 +3,7 @@ d41d8cd98f00b204e9800998ecf8427e  SD_ROOT/wz_mini/mnt/.gitignore
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
 58d3a10a80422e3aa1b49b046e17db5c  SD_ROOT/wz_mini/etc/init.d/wz_cam.sh
 0f0cb8cbbf7007cda59dc684c37d185f  SD_ROOT/wz_mini/etc/init.d/v3_init.sh
-c6334010847c6e64ce0df2b8fc0e0330  SD_ROOT/wz_mini/etc/init.d/wz_user.sh
+3509a2f8b4b79ddb3fd06c6ea224f8e8  SD_ROOT/wz_mini/etc/init.d/wz_user.sh
 86082f8c1b7de18463731372bac630d1  SD_ROOT/wz_mini/etc/init.d/wz_post.sh
 e3034eac02d8eda9902ca9cf89f0a586  SD_ROOT/wz_mini/etc/inittab
 840aa9c26726201f7cffbf001bee193a  SD_ROOT/wz_mini/etc/uvc_jxf22.config