diff --git a/trunk/.gitignore b/trunk/.gitignore index a1968d930..8c4b60d35 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -1,32 +1,32 @@ -*.conf -doc/frozen*.flv -doc/kungfupanda*.flv -doc/time*.flv -html -ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcshareddata/ -ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/ -ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/ -research/aac/ .idea/ -research/api-server/static-dir/mse -research/bat/ -research/big/ -research/bitch/ -research/bott/ -research/cgo/ -research/dns/ -research/empty/ -research/golang/golang -research/golang/temp.flv -research/librtmp/720p.h264.raw -research/librtmp/test.h264 -research/licenser/ -research/players/fls_player/ -research/players/mic/ -research/proxy/ -research/redis-ocluster/ -research/rtmfp/ -research/snap/ -research/speex/ -test/ +/*.conf +/doc/frozen*.flv +/doc/kungfupanda*.flv +/doc/time*.flv +/html +/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcshareddata/ +/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/ +/ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/ +/research/aac/ +/research/api-server/static-dir/mse +/research/bat/ +/research/big/ +/research/bitch/ +/research/bott/ +/research/cgo/ +/research/dns/ +/research/empty/ +/research/golang/golang +/research/golang/temp.flv +/research/librtmp/720p.h264.raw +/research/librtmp/test.h264 +/research/licenser/ +/research/players/fls_player/ +/research/players/mic/ +/research/proxy/ +/research/redis-ocluster/ +/research/rtmfp/ +/research/snap/ +/research/speex/ +/test/ diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 16fafff4e..1b9625bbd 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -1230,6 +1230,10 @@ vhost transcode.ingest.srs.com { ffmpeg ./objs/ffmpeg/bin/ffmpeg; engine { enabled off; + perfile { + re; + rtsp_transport tcp; + } iformat flv; vfilter { i ./doc/ffmpeg-logo.png; diff --git a/trunk/conf/ingest.rtsp.conf b/trunk/conf/ingest.rtsp.conf new file mode 100644 index 000000000..c89d7b5e1 --- /dev/null +++ b/trunk/conf/ingest.rtsp.conf @@ -0,0 +1,26 @@ +# use ffmpeg to ingest file/stream/device to SRS +# @see https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest +# @see full.conf for detail config. + +listen 1935; +max_connections 1000; +vhost __defaultVhost__ { + ingest { + enabled on; + input { + type stream; + url rtsp://admin:12345678@192.168.2.21:554/Streaming/Channels/501?transportmode=unicast; + } + ffmpeg ./objs/ffmpeg/bin/ffmpeg; + engine { + enabled on; + perfile { + rtsp_transport tcp; + } + vcodec copy; + acodec copy; + output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/livestream; + } + } +} +