From: paul <paul@plutz.net>
Date: Mon, 25 May 2015 12:40:48 +0000 (+0000)
Subject: consider height *and* width when deciding whether raspi should transcode
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=77a26b975ad1dfdff620ec9156b53d6c1c032f92;p=serve0

consider height *and* width when deciding whether raspi should transcode

svn path=/trunk/; revision=50
---

diff --git a/pages/common.sh b/pages/common.sh
index 739f4ca..5e23314 100755
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -67,10 +67,10 @@ _printVideo(){
       minutes="$(($length / 60)):$(($length % 60))"
 
     rpiaddr="$(host pfostenpanne |sed -r 's;^.* ([0-9\.]+)$;\1;')"
-    rpidull="http://${rpiaddr}/?path=http://jupiter:8000/${video}"
-    rpicgi="http://${rpiaddr}/?path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
+    rpidull="http://${rpiaddr}/?player=play&path=http://jupiter:8000/${video}"
+    rpicgi="http://${rpiaddr}/?player=play&path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
 
-    [ $height -gt 480 ] && \
+    [ $height -gt 480 -a $width -gt 480 ] && \
        raspi="<a class=\"videolink alt raspi\" href=\"${rpicgi}\">RasPi</a>" \
     || raspi="<a class=\"videolink alt raspi\" href=\"${rpidull}\">RasPi</a>"
     [ $height -gt 480 ] && \