Browse Source

rename folder

pull/101/head
aler9 5 years ago
parent
commit
0b99a2fddc
  1. 6
      Makefile
  2. 2
      main_test.go
  3. 0
      testimages/ffmpeg/Dockerfile
  4. 0
      testimages/ffmpeg/emptyvideo.ts
  5. 0
      testimages/ffmpeg/start.sh
  6. 0
      testimages/gstreamer/Dockerfile
  7. 0
      testimages/gstreamer/emptyvideo.ts
  8. 0
      testimages/gstreamer/start.sh
  9. 0
      testimages/vlc/Dockerfile
  10. 0
      testimages/vlc/start.sh

6
Makefile

@ -49,8 +49,8 @@ test: @@ -49,8 +49,8 @@ test:
make test-nodocker
test-nodocker:
$(foreach IMG,$(shell echo test-images/*/ | xargs -n1 basename), \
docker build -q test-images/$(IMG) -t rtsp-simple-server-test-$(IMG)$(NL))
$(foreach IMG,$(shell echo testimages/*/ | xargs -n1 basename), \
docker build -q testimages/$(IMG) -t rtsp-simple-server-test-$(IMG)$(NL))
go test -race -v .
stress:
@ -80,7 +80,7 @@ paths: @@ -80,7 +80,7 @@ paths:
# runOnPublish: ffmpeg -i rtsp://localhost:8554/$$RTSP_SERVER_PATH -c copy -f mpegts myfile_$$RTSP_SERVER_PATH.ts
# readUser: test
# readPass: tast
# runOnDemand: ffmpeg -re -stream_loop -1 -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$$RTSP_SERVER_PATH
# runOnDemand: ffmpeg -re -stream_loop -1 -i testimages/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$$RTSP_SERVER_PATH
# proxied:
# source: rtsp://192.168.2.198:8554/stream

2
main_test.go

@ -481,7 +481,7 @@ func TestRunOnDemand(t *testing.T) { @@ -481,7 +481,7 @@ func TestRunOnDemand(t *testing.T) {
stdin := []byte("\n" +
"paths:\n" +
" all:\n" +
" runOnDemand: ffmpeg -hide_banner -loglevel error -re -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$RTSP_SERVER_PATH\n")
" runOnDemand: ffmpeg -hide_banner -loglevel error -re -i testimages/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$RTSP_SERVER_PATH\n")
p1, err := newProgram([]string{"stdin"}, bytes.NewBuffer(stdin))
require.NoError(t, err)
defer p1.close()

0
test-images/ffmpeg/Dockerfile → testimages/ffmpeg/Dockerfile

0
test-images/ffmpeg/emptyvideo.ts → testimages/ffmpeg/emptyvideo.ts

0
test-images/ffmpeg/start.sh → testimages/ffmpeg/start.sh

0
test-images/gstreamer/Dockerfile → testimages/gstreamer/Dockerfile

0
test-images/gstreamer/emptyvideo.ts → testimages/gstreamer/emptyvideo.ts

0
test-images/gstreamer/start.sh → testimages/gstreamer/start.sh

0
test-images/vlc/Dockerfile → testimages/vlc/Dockerfile

0
test-images/vlc/start.sh → testimages/vlc/start.sh

Loading…
Cancel
Save