From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 18 Jul 2018 15:40:47 +0000 (+0000)
Subject: fix #2143 @0:10
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=88b139075717480aad78404228bb3a48d11e9ce6;p=cubeextranet.git

fix #2143 @0:10
---

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index beaa3fc97..7eded7b9a 100644
--- a/fluidbook/tools/webvideo
+++ b/fluidbook/tools/webvideo
@@ -7,9 +7,8 @@ mp4w=$3
 mp4h=$4
 jpg=$2/$filename.jpg
 mp4=$2/$filename.mp4
-ogv=$2/$filename.ogv
-webm=$2/$filename.webm
 
+echo 'jpg1'
 if [ ! -f $jpg ]
 then
 	echo
@@ -21,6 +20,8 @@ then
 	/usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:04 -t 00:00:01 -f image2 $jpg
 fi
 
+
+echo 'jpg2'
 if [ ! -f $jpg ]
 then
 	echo
@@ -32,6 +33,8 @@ then
 	/usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:00 -t 00:00:01 -f image2 $jpg
 fi
 
+echo 'mp4'
+
 if [ ! -f $mp4 ] && [ extension != "mp4" ]
 then
 	echo 'making mp4'
@@ -55,7 +58,6 @@ then
 	-refs 5 \
 	-flags +loop+mv4 \
 	-partitions +parti4x4+parti8x8+partp4x4+partp8x8 \
-	-flags2 +mixed_refs \
 	-me_range 16 \
 	-g 250 \
 	-keyint_min 25 \
@@ -67,37 +69,4 @@ then
 	-ar 44100 \
 	-r 13 \
 	$mp4
-fi
-
-if [ ! -f $webm ]
-then
-	echo
-	echo
-	echo 'making webm'
-	echo
-	echo
-	/usr/local/bin/ffmpeg -i $1 \
-	-keyint_min 0 \
-	-g 250 \
-	-skip_threshold 0 \
-	-qmin 1 \
-	-qmax 51 \
-	-vcodec libvpx \
-	-b 614400 \
-	-acodec libvorbis \
-	-ar 44100 \
-	-ac 2 \
-	-ab 64k \
-	-y $webm
-fi
-
-
-if [ ! -f $ogv ]
-then
-	echo
-	echo
-	echo 'making ogv'
-	echo
-	echo
-	avconv  -i $1 -c:v libtheora -q:v 5 -c:a libvorbis -q:a 5 -y $ogv
 fi
\ No newline at end of file
diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index 15d58bc92..a614bce31 100644
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -9,7 +9,7 @@ class wsTools {
 			$dir = dirname($file);
 		}
 
-		$videos = array('mp4', 'webm', 'ogv', 'jpg');
+		$videos = array('mp4', 'jpg');
 
 		if (is_string($format)) {
 			if ($format == 'none') {