no stream_loop flag for anything other than mp4 and local inputs
parent
77271dd4e7
commit
6c198b07e0
|
@ -1501,7 +1501,7 @@ s.createInputMap = function(e,number,input){
|
||||||
//input - probe size
|
//input - probe size
|
||||||
if(input.probesize&&input.probesize!==''){x.cust_input+=' -probesize '+input.probesize}
|
if(input.probesize&&input.probesize!==''){x.cust_input+=' -probesize '+input.probesize}
|
||||||
//input - stream loop (good for static files/lists)
|
//input - stream loop (good for static files/lists)
|
||||||
if(input.stream_loop==='1'){x.cust_input+=' -stream_loop -1'}
|
if(input.stream_loop === '1'){x.cust_input+=' -stream_loop -1'}
|
||||||
//input - fps
|
//input - fps
|
||||||
if(x.cust_input.indexOf('-r ')===-1&&input.sfps&&input.sfps!==''){
|
if(x.cust_input.indexOf('-r ')===-1&&input.sfps&&input.sfps!==''){
|
||||||
input.sfps=parseFloat(input.sfps);
|
input.sfps=parseFloat(input.sfps);
|
||||||
|
@ -1944,7 +1944,7 @@ s.ffmpeg = function(e){
|
||||||
//input - probe size
|
//input - probe size
|
||||||
if(e.details.probesize&&e.details.probesize!==''){x.cust_input+=' -probesize '+e.details.probesize};
|
if(e.details.probesize&&e.details.probesize!==''){x.cust_input+=' -probesize '+e.details.probesize};
|
||||||
//input - stream loop (good for static files/lists)
|
//input - stream loop (good for static files/lists)
|
||||||
if(e.details.stream_loop==='1'){x.cust_input+=' -stream_loop -1'};
|
if(e.details.stream_loop === '1' && (e.type === 'mp4' || e.type === 'local')){x.cust_input+=' -stream_loop -1'};
|
||||||
//input
|
//input
|
||||||
if(e.details.cust_input.indexOf('-fflags') === -1){x.cust_input+=' -fflags +igndts'}
|
if(e.details.cust_input.indexOf('-fflags') === -1){x.cust_input+=' -fflags +igndts'}
|
||||||
switch(e.type){
|
switch(e.type){
|
||||||
|
|
|
@ -2,6 +2,39 @@
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo "-- Installing Python Yolo Plugin for Shinobi --"
|
echo "-- Installing Python Yolo Plugin for Shinobi --"
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
|
echo "-----------------------------------"
|
||||||
|
if [ ! -d "weights" ]; then
|
||||||
|
echo "Downloading yolov3 weights..."
|
||||||
|
mkdir weights
|
||||||
|
wget -O weights/yolov3.weights https://pjreddie.com/media/files/yolov3.weights
|
||||||
|
else
|
||||||
|
echo "yolov3 weights found..."
|
||||||
|
fi
|
||||||
|
echo "-----------------------------------"
|
||||||
|
if [ ! -d "cfg" ]; then
|
||||||
|
echo "Downloading yolov3 cfg"
|
||||||
|
mkdir cfg
|
||||||
|
wget -O cfg/coco.data https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/coco.data
|
||||||
|
wget -O cfg/yolov3.cfg https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3.cfg
|
||||||
|
else
|
||||||
|
echo "yolov3 cfg found..."
|
||||||
|
fi
|
||||||
|
echo "-----------------------------------"
|
||||||
|
if [ ! -d "data" ]; then
|
||||||
|
echo "Downloading yolov3 data"
|
||||||
|
mkdir data
|
||||||
|
wget -O data/coco.names https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names
|
||||||
|
else
|
||||||
|
echo "yolov3 data found..."
|
||||||
|
fi
|
||||||
|
echo "-----------------------------------"
|
||||||
|
if [ ! -e "./conf.json" ]; then
|
||||||
|
echo "Creating conf.json"
|
||||||
|
sudo cp conf.sample.json conf.json
|
||||||
|
else
|
||||||
|
echo "conf.json already exists..."
|
||||||
|
fi
|
||||||
|
echo "-----------------------------------"
|
||||||
sudo apt update -y
|
sudo apt update -y
|
||||||
sudo apt-get install libxml2-dev libxslt-dev libxslt1-dev zlib1g-dev -y
|
sudo apt-get install libxml2-dev libxslt-dev libxslt1-dev zlib1g-dev -y
|
||||||
if ! [ -x "$(command -v python3)" ]; then
|
if ! [ -x "$(command -v python3)" ]; then
|
||||||
|
@ -52,6 +85,7 @@ echo "Getting new pip..."
|
||||||
pip3 install --upgrade pip
|
pip3 install --upgrade pip
|
||||||
pip install --user --upgrade pip
|
pip install --user --upgrade pip
|
||||||
echo "Smoking pips..."
|
echo "Smoking pips..."
|
||||||
|
pip3 install flask_socketio
|
||||||
pip3 install flask
|
pip3 install flask
|
||||||
pip3 install numpy
|
pip3 install numpy
|
||||||
export PATH=/usr/local/cuda/bin:$PATH
|
export PATH=/usr/local/cuda/bin:$PATH
|
||||||
|
@ -74,38 +108,5 @@ pip3 install .
|
||||||
apt remove libpython-all-dev python-all python-all-dev python-asn1crypto python-cffi-backend python-crypto python-cryptography python-dbus python-enum34 python-gi python-idna python-ipaddress python-keyring python-keyrings.alt python-pkg-resources python-secretstorage python-setuptools python-six python-wheel python-xdg -y
|
apt remove libpython-all-dev python-all python-all-dev python-asn1crypto python-cffi-backend python-crypto python-cryptography python-dbus python-enum34 python-gi python-idna python-ipaddress python-keyring python-keyrings.alt python-pkg-resources python-secretstorage python-setuptools python-six python-wheel python-xdg -y
|
||||||
echo "Done Installing Darknet..."
|
echo "Done Installing Darknet..."
|
||||||
export PATH=/opt/darknet:$PATH
|
export PATH=/opt/darknet:$PATH
|
||||||
echo "-----------------------------------"
|
|
||||||
if [ ! -d "weights" ]; then
|
|
||||||
echo "Downloading yolov3 weights..."
|
|
||||||
mkdir weights
|
|
||||||
wget -O weights/yolov3.weights https://pjreddie.com/media/files/yolov3.weights
|
|
||||||
else
|
|
||||||
echo "yolov3 weights found..."
|
|
||||||
fi
|
|
||||||
echo "-----------------------------------"
|
|
||||||
if [ ! -d "cfg" ]; then
|
|
||||||
echo "Downloading yolov3 cfg"
|
|
||||||
mkdir cfg
|
|
||||||
wget -O cfg/coco.data https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/coco.data
|
|
||||||
wget -O cfg/yolov3.cfg https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3.cfg
|
|
||||||
else
|
|
||||||
echo "yolov3 cfg found..."
|
|
||||||
fi
|
|
||||||
echo "-----------------------------------"
|
|
||||||
if [ ! -d "data" ]; then
|
|
||||||
echo "Downloading yolov3 data"
|
|
||||||
mkdir data
|
|
||||||
wget -O data/coco.names https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names
|
|
||||||
else
|
|
||||||
echo "yolov3 data found..."
|
|
||||||
fi
|
|
||||||
echo "-----------------------------------"
|
|
||||||
if [ ! -e "./conf.json" ]; then
|
|
||||||
echo "Creating conf.json"
|
|
||||||
sudo cp conf.sample.json conf.json
|
|
||||||
else
|
|
||||||
echo "conf.json already exists..."
|
|
||||||
fi
|
|
||||||
echo "-----------------------------------"
|
|
||||||
echo "Start the plugin with pm2 like so :"
|
echo "Start the plugin with pm2 like so :"
|
||||||
echo "pm2 start shinobi-python-yolo.js"
|
echo "pm2 start shinobi-python-yolo.js"
|
|
@ -208,7 +208,7 @@
|
||||||
<div><input class="form-control" detail="probesize"></div>
|
<div><input class="form-control" detail="probesize"></div>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group h_t_input h_t_mp4">
|
<div class="form-group h_t_input h_t_mp4 h_t_local">
|
||||||
<label><div><span><%-lang["Loop Stream"]%></span></div>
|
<label><div><span><%-lang["Loop Stream"]%></span></div>
|
||||||
<div><select class="form-control" detail="stream_loop">
|
<div><select class="form-control" detail="stream_loop">
|
||||||
<option value="0" selected><%-lang.No%></option>
|
<option value="0" selected><%-lang.No%></option>
|
||||||
|
|
Loading…
Reference in New Issue