From 2a2a2ba2f6092b0b68a7de0ccc798062682487f4 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 2 Aug 2013 21:35:13 +0100
Subject: added basic suport for embedding (html5) videos

---
 conf/mime.conf                |   3 ++
 inc/parser/xhtml.php          |  66 +++++++++++++++++++++++++++++++++++++++---
 lib/images/fileicons/mp4.png  | Bin 0 -> 740 bytes
 lib/images/fileicons/ogv.png  | Bin 0 -> 740 bytes
 lib/images/fileicons/webm.png | Bin 0 -> 740 bytes
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 lib/images/fileicons/mp4.png
 create mode 100644 lib/images/fileicons/ogv.png
 create mode 100644 lib/images/fileicons/webm.png

diff --git a/conf/mime.conf b/conf/mime.conf
index 381b93f86..2a50fab10 100644
--- a/conf/mime.conf
+++ b/conf/mime.conf
@@ -13,6 +13,9 @@ swf     application/x-shockwave-flash
 mp3     audio/mpeg
 ogg     audio/ogg
 wav     audio/wav
+webm    video/webm
+ogv     video/ogg
+mp4     video/mp4
 
 tgz     !application/octet-stream
 tar     !application/x-gtar
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 84a999e56..747f0e8a0 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -795,8 +795,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         list($ext,$mime,$dl) = mimetype($src,false);
         if(substr($mime,0,5) == 'image' && $render){
             $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
-        }elseif($mime == 'application/x-shockwave-flash' && $render){
-            // don't link flash movies
+        }elseif(($mime == 'application/x-shockwave-flash' || substr($mime,0,5) == 'video') && $render){
+            // don't link movies
             $noLink = true;
         }else{
             // add file icons
@@ -831,8 +831,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if(substr($mime,0,5) == 'image' && $render){
             // link only jpeg images
             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
-        }elseif($mime == 'application/x-shockwave-flash' && $render){
-            // don't link flash movies
+        }elseif(($mime == 'application/x-shockwave-flash' || substr($mime,0,5) == 'video') && $render){
+            // don't link movies
             $noLink = true;
         }else{
             // add file icons
@@ -1093,6 +1093,28 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
             $ret .= ' />';
 
+        }elseif(substr($mime,0,5) == 'video'){
+
+            // first get the $title
+            if (!is_null($title)) {
+                $title  = $this->_xmlEntities($title);
+            }
+            if (!$title) {
+                // just show the sourcename
+                $title = $this->_xmlEntities(utf8_basename(noNS($src)));
+            }
+            if (!$render) {
+                // if the video is not supposed to be rendered
+                // return the title of the video
+                return $title;
+            }
+
+            $att = array();
+            $att['class'] = "media$align";
+
+            //add video(s)
+            $ret .= $this->_video($src, $title, $mime, $width, $height, $att);
+
         }elseif($mime == 'application/x-shockwave-flash'){
             if (!$render) {
                 // if the flash is not supposed to be rendered
@@ -1226,6 +1248,42 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
 
+    /**
+     * Embed video(s) in HTML
+     *
+     * @author Anika Henke <anika@selfthinker.org>
+     *
+     * @param string $src      - ID of video to embed
+     * @param string $title    - title of the video
+     * @param string $mime     - mimetype of the video
+     * @param int $width       - width of the video in pixels
+     * @param int $height      - height of the video in pixels
+     * @param array $atts      - additional attributes for the <video> tag
+     */
+    function _video($src,$title,$mime,$width,$height,$atts=null){
+
+        // prepare width and height
+        if(is_null($atts)) $atts = array();
+        $atts['width']  = (int) $width;
+        $atts['height'] = (int) $height;
+        if(!$atts['width'])  $atts['width']  = 320;
+        if(!$atts['height']) $atts['height'] = 240;
+
+        $url = ml($src,array('cache'=>$cache),true,'&');
+
+        // @todo: add poster
+        $this->doc .= '<video '.buildAttributes($atts).' controls="controls">'.NL;
+        // @todo: foreach all extensions
+        $this->doc .= '<source src="'.hsc($url).'" />'.NL;
+
+        // alternative content
+        // @todo: foreach all extensions
+        $this->internalmedia($src, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+
+        // finish
+        $this->doc .= '</video>'.NL;
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 :
diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png
new file mode 100644
index 000000000..b89fc5299
Binary files /dev/null and b/lib/images/fileicons/mp4.png differ
diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png
new file mode 100644
index 000000000..b89fc5299
Binary files /dev/null and b/lib/images/fileicons/ogv.png differ
diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png
new file mode 100644
index 000000000..b89fc5299
Binary files /dev/null and b/lib/images/fileicons/webm.png differ
-- 
cgit v1.2.3


From 3d7a9e0a1cba0b173b6b03f5c88a8eb975286cc7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 2 Aug 2013 23:13:41 +0100
Subject: Add several alternative formats to video for better browser
 compatibility

All .webm, .ogv and .mp4 files with the same filename are automatically
chosen as alternative sources when only one of them is mentioned in the
media syntax.
---
 inc/media.php        | 29 +++++++++++++++++++++++++++++
 inc/parser/xhtml.php | 30 +++++++++++++++++++++++-------
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index c76f2986c..c1dafe2a3 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -2132,4 +2132,33 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
     return $okay;
 }
 
+/**
+ * Return other media files with the same base name
+ * but a different extension.
+ *
+ * @param string $src  - ID of media file
+ * @param array $exts  - alternative extensions to find other files for
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function media_alternativefiles($src, $exts){
+
+    $files = array();
+    list($srcExt, $srcMime) = mimetype($src);
+    $filebase = substr($src, 0, -1 * (strlen($srcExt)+1));
+
+    foreach($exts as $ext) {
+        $fileid = $filebase.'.'.$ext;
+        $file = mediaFN($fileid);
+        if(file_exists($file)) {
+            $files[$ext] = $fileid;
+        }
+    }
+    // if original wasn't any of $exts, return only original
+    if (empty($files)) {
+        $files[$srcExt] = $src;
+    }
+    return $files;
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 747f0e8a0..bb5f6a4d2 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1095,9 +1095,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         }elseif(substr($mime,0,5) == 'video'){
 
+            $origTitle = '';
             // first get the $title
             if (!is_null($title)) {
                 $title  = $this->_xmlEntities($title);
+                $origTitle = $title;
             }
             if (!$title) {
                 // just show the sourcename
@@ -1113,7 +1115,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $att['class'] = "media$align";
 
             //add video(s)
-            $ret .= $this->_video($src, $title, $mime, $width, $height, $att);
+            $ret .= $this->_video($src, $origTitle, $mime, $width, $height, $att);
 
         }elseif($mime == 'application/x-shockwave-flash'){
             if (!$render) {
@@ -1269,16 +1271,30 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if(!$atts['width'])  $atts['width']  = 320;
         if(!$atts['height']) $atts['height'] = 240;
 
-        $url = ml($src,array('cache'=>$cache),true,'&');
+        // prepare alternative formats
+        $extensions = array('webm', 'ogv', 'mp4');
+        $types['webm'] = 'video/webm; codecs="vp8, vorbis"';
+        $types['ogv'] = 'video/ogg; codecs="theora, vorbis"';
+        // mp4 would be 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', but Android doesn't like it
+        $types['mp4'] = '';
+        $alternatives = media_alternativefiles($src, $extensions);
 
         // @todo: add poster
         $this->doc .= '<video '.buildAttributes($atts).' controls="controls">'.NL;
-        // @todo: foreach all extensions
-        $this->doc .= '<source src="'.hsc($url).'" />'.NL;
+        foreach($alternatives as $ext => $file) {
+            $url = ml($file,array('cache'=>$cache),true,'&');
+            $type = $types[$ext];
+            if (!$title) {
+                $title = $this->_xmlEntities(utf8_basename(noNS($file)));
+            }
 
-        // alternative content
-        // @todo: foreach all extensions
-        $this->internalmedia($src, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+            $this->doc .= '<source src="'.hsc($url).'"';
+            if (!empty($type)) $this->doc .= ' type=\''.$type.'\'';
+            $this->doc .= ' />'.NL;
+
+            // alternative content
+            $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+        }
 
         // finish
         $this->doc .= '</video>'.NL;
-- 
cgit v1.2.3


From 99f943f68e3a6bd43d9b5b90f39e058ee2acfa9d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 2 Aug 2013 23:53:28 +0100
Subject: added poster attribute to video if jpg or png with same file name
 exists

---
 inc/media.php        | 12 ++++++++----
 inc/parser/xhtml.php | 10 ++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index c1dafe2a3..6d0615a3c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -2136,12 +2136,13 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
  * Return other media files with the same base name
  * but a different extension.
  *
- * @param string $src  - ID of media file
- * @param array $exts  - alternative extensions to find other files for
+ * @param string $src       - ID of media file
+ * @param array $exts       - alternative extensions to find other files for
+ * @param boolean $onlyone  - set if only one result should be returned (and not the original)
  *
  * @author Anika Henke <anika@selfthinker.org>
  */
-function media_alternativefiles($src, $exts){
+function media_alternativefiles($src, $exts, $onlyone=false){
 
     $files = array();
     list($srcExt, $srcMime) = mimetype($src);
@@ -2152,10 +2153,13 @@ function media_alternativefiles($src, $exts){
         $file = mediaFN($fileid);
         if(file_exists($file)) {
             $files[$ext] = $fileid;
+            if ($onlyone) {
+                return $files;
+            }
         }
     }
     // if original wasn't any of $exts, return only original
-    if (empty($files)) {
+    if (empty($files) && !$onlyone) {
         $files[$srcExt] = $src;
     }
     return $files;
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index bb5f6a4d2..8b7405402 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1278,9 +1278,15 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         // mp4 would be 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', but Android doesn't like it
         $types['mp4'] = '';
         $alternatives = media_alternativefiles($src, $extensions);
+        $poster = media_alternativefiles($src, array('jpg', 'png'), true);
+        $posterUrl = '';
+        if (!empty($poster)) {
+            $posterUrl = ml(reset($poster),array('cache'=>$cache),true,'&');
+        }
 
-        // @todo: add poster
-        $this->doc .= '<video '.buildAttributes($atts).' controls="controls">'.NL;
+        $this->doc .= '<video '.buildAttributes($atts).' controls="controls"';
+        if ($posterUrl) $this->doc .= ' poster="'.$posterUrl.'"';
+        $this->doc .= '>'.NL;
         foreach($alternatives as $ext => $file) {
             $url = ml($file,array('cache'=>$cache),true,'&');
             $type = $types[$ext];
-- 
cgit v1.2.3


From 79e53fe5a44293a82486c7228deb6d435768bc04 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 14:34:17 +0100
Subject: improved code for videos (restrict to 3 mimetypes, removed codec info
 from type attribute)

---
 inc/media.php        | 15 ++++-----------
 inc/parser/xhtml.php | 30 ++++++++++--------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index 6d0615a3c..437a8d75f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -2134,15 +2134,14 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
 
 /**
  * Return other media files with the same base name
- * but a different extension.
+ * but different extensions.
  *
  * @param string $src       - ID of media file
  * @param array $exts       - alternative extensions to find other files for
- * @param boolean $onlyone  - set if only one result should be returned (and not the original)
  *
  * @author Anika Henke <anika@selfthinker.org>
  */
-function media_alternativefiles($src, $exts, $onlyone=false){
+function media_alternativefiles($src, $exts){
 
     $files = array();
     list($srcExt, $srcMime) = mimetype($src);
@@ -2152,16 +2151,10 @@ function media_alternativefiles($src, $exts, $onlyone=false){
         $fileid = $filebase.'.'.$ext;
         $file = mediaFN($fileid);
         if(file_exists($file)) {
-            $files[$ext] = $fileid;
-            if ($onlyone) {
-                return $files;
-            }
+            list($fileExt, $fileMime) = mimetype($file);
+            $files[$fileMime] = $fileid;
         }
     }
-    // if original wasn't any of $exts, return only original
-    if (empty($files) && !$onlyone) {
-        $files[$srcExt] = $src;
-    }
     return $files;
 }
 
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 8b7405402..b1bfaae5d 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1093,13 +1093,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
             $ret .= ' />';
 
-        }elseif(substr($mime,0,5) == 'video'){
-
-            $origTitle = '';
+        }elseif($mime == 'video/webm' || $mime == 'video/ogg' || $mime == 'video/mp4' ){
             // first get the $title
             if (!is_null($title)) {
                 $title  = $this->_xmlEntities($title);
-                $origTitle = $title;
             }
             if (!$title) {
                 // just show the sourcename
@@ -1115,7 +1112,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $att['class'] = "media$align";
 
             //add video(s)
-            $ret .= $this->_video($src, $origTitle, $mime, $width, $height, $att);
+            $ret .= $this->_video($src, $width, $height, $att);
 
         }elseif($mime == 'application/x-shockwave-flash'){
             if (!$render) {
@@ -1262,7 +1259,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @param int $height      - height of the video in pixels
      * @param array $atts      - additional attributes for the <video> tag
      */
-    function _video($src,$title,$mime,$width,$height,$atts=null){
+    function _video($src,$width,$height,$atts=null){
 
         // prepare width and height
         if(is_null($atts)) $atts = array();
@@ -1273,10 +1270,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         // prepare alternative formats
         $extensions = array('webm', 'ogv', 'mp4');
-        $types['webm'] = 'video/webm; codecs="vp8, vorbis"';
-        $types['ogv'] = 'video/ogg; codecs="theora, vorbis"';
-        // mp4 would be 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', but Android doesn't like it
-        $types['mp4'] = '';
         $alternatives = media_alternativefiles($src, $extensions);
         $poster = media_alternativefiles($src, array('jpg', 'png'), true);
         $posterUrl = '';
@@ -1284,21 +1277,18 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $posterUrl = ml(reset($poster),array('cache'=>$cache),true,'&');
         }
 
+        // open video tag
         $this->doc .= '<video '.buildAttributes($atts).' controls="controls"';
         if ($posterUrl) $this->doc .= ' poster="'.$posterUrl.'"';
         $this->doc .= '>'.NL;
-        foreach($alternatives as $ext => $file) {
-            $url = ml($file,array('cache'=>$cache),true,'&');
-            $type = $types[$ext];
-            if (!$title) {
-                $title = $this->_xmlEntities(utf8_basename(noNS($file)));
-            }
 
-            $this->doc .= '<source src="'.hsc($url).'"';
-            if (!empty($type)) $this->doc .= ' type=\''.$type.'\'';
-            $this->doc .= ' />'.NL;
+        // output source for each alternative video format
+        foreach($alternatives as $mime => $file) {
+            $url = ml($file,array('cache'=>$cache),true,'&');
+            $title = $this->_xmlEntities(utf8_basename(noNS($file)));
 
-            // alternative content
+            $this->doc .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
+            // alternative content (just a link to the file)
             $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
         }
 
-- 
cgit v1.2.3


From b44a5dce182bb65063dd1868e92954520e8fab88 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 16:56:16 +0100
Subject: added support for html5 audio

Similar to videos, all .ogg, .mp3 and .wav files with the same filename are automatically chosen as alternative sources when only one of them is mentioned in the media syntax.
---
 inc/parser/xhtml.php | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index b1bfaae5d..c6e5a8e22 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1114,6 +1114,27 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             //add video(s)
             $ret .= $this->_video($src, $width, $height, $att);
 
+        }elseif($mime == 'audio/ogg' || $mime == 'audio/mpeg' || $mime == 'audio/wav' ){
+            // first get the $title
+            if (!is_null($title)) {
+                $title  = $this->_xmlEntities($title);
+            }
+            if (!$title) {
+                // just show the sourcename
+                $title = $this->_xmlEntities(utf8_basename(noNS($src)));
+            }
+            if (!$render) {
+                // if the video is not supposed to be rendered
+                // return the title of the video
+                return $title;
+            }
+
+            $att = array();
+            $att['class'] = "media$align";
+
+            //add audio
+            $ret .= $this->_audio($src, $att);
+
         }elseif($mime == 'application/x-shockwave-flash'){
             if (!$render) {
                 // if the flash is not supposed to be rendered
@@ -1253,8 +1274,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @author Anika Henke <anika@selfthinker.org>
      *
      * @param string $src      - ID of video to embed
-     * @param string $title    - title of the video
-     * @param string $mime     - mimetype of the video
      * @param int $width       - width of the video in pixels
      * @param int $height      - height of the video in pixels
      * @param array $atts      - additional attributes for the <video> tag
@@ -1296,6 +1315,37 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= '</video>'.NL;
     }
 
+    /**
+     * Embed audio in HTML
+     *
+     * @author Anika Henke <anika@selfthinker.org>
+     *
+     * @param string $src      - ID of audio to embed
+     * @param array $atts      - additional attributes for the <video> tag
+     */
+    function _audio($src,$atts=null){
+
+        // prepare alternative formats
+        $extensions = array('ogg', 'mp3', 'wav');
+        $alternatives = media_alternativefiles($src, $extensions);
+
+        // open audio tag
+        $this->doc .= '<audio '.buildAttributes($atts).' controls="controls">'.NL;
+
+        // output source for each alternative audio format
+        foreach($alternatives as $mime => $file) {
+            $url = ml($file,array('cache'=>$cache),true,'&');
+            $title = $this->_xmlEntities(utf8_basename(noNS($file)));
+
+            $this->doc .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
+            // alternative content (just a link to the file)
+            $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+        }
+
+        // finish
+        $this->doc .= '</audio>'.NL;
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 6d4af72aa6e7a34b426f494eedb8a93cf2ce097a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 4 Aug 2013 09:08:02 +0100
Subject: fixed typo

---
 inc/parser/xhtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index c6e5a8e22..05472db1d 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1321,7 +1321,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @author Anika Henke <anika@selfthinker.org>
      *
      * @param string $src      - ID of audio to embed
-     * @param array $atts      - additional attributes for the <video> tag
+     * @param array $atts      - additional attributes for the <audio> tag
      */
     function _audio($src,$atts=null){
 
-- 
cgit v1.2.3


From f50634f0c2d6669655b684449d5a6ef44e5ca3f1 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 4 Aug 2013 10:35:00 +0100
Subject: refactored audio/video code, removed wrong link around audio

---
 inc/media.php        | 31 +++++++++++++++++++++++++++++++
 inc/parser/xhtml.php | 45 ++++++++++++++++++++++++++++-----------------
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index 437a8d75f..5c84bed4b 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -2138,6 +2138,7 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
  *
  * @param string $src       - ID of media file
  * @param array $exts       - alternative extensions to find other files for
+ * @return array            - mime type => file ID
  *
  * @author Anika Henke <anika@selfthinker.org>
  */
@@ -2158,4 +2159,34 @@ function media_alternativefiles($src, $exts){
     return $files;
 }
 
+/**
+ * Check if video/audio is supported to be embedded.
+ *
+ * @param string $src       - mimetype of media file
+ * @param string $type      - type of media files to check ('video', 'audio', or none)
+ * @return boolean
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function media_supportedav($mime, $type=NULL){
+    $supportedAudio = array(
+        'ogg' => 'audio/ogg',
+        'mp3' => 'audio/mpeg',
+        'wav' => 'audio/wav',
+    );
+    $supportedVideo = array(
+        'webm' => 'video/webm',
+        'ogv' => 'video/ogg',
+        'mp4' => 'video/mp4',
+    );
+    if ($type == 'audio') {
+        $supportedAv = $supportedAudio;
+    } elseif ($type == 'video') {
+        $supportedAv = $supportedVideo;
+    } else {
+        $supportedAv = array_merge($supportedAudio, $supportedVideo);
+    }
+    return in_array($mime, $supportedAv);
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 05472db1d..32aa99a1b 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -783,7 +783,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     function internalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
-                            $height=NULL, $cache=NULL, $linking=NULL) {
+                            $height=NULL, $cache=NULL, $linking=NULL, $return=NULL) {
         global $ID;
         list($src,$hash) = explode('#',$src,2);
         resolve_mediaid(getNS($ID),$src, $exists);
@@ -795,7 +795,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         list($ext,$mime,$dl) = mimetype($src,false);
         if(substr($mime,0,5) == 'image' && $render){
             $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
-        }elseif(($mime == 'application/x-shockwave-flash' || substr($mime,0,5) == 'video') && $render){
+        }elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render){
             // don't link movies
             $noLink = true;
         }else{
@@ -814,8 +814,13 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
 
         //output formatted
-        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
-        else $this->doc .= $this->_formatLink($link);
+        if ($return) {
+            if ($linking == 'nolink' || $noLink) return $link['name'];
+            else return $this->_formatLink($link);
+        } else {
+            if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+            else $this->doc .= $this->_formatLink($link);
+        }
     }
 
     function externalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
@@ -831,7 +836,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if(substr($mime,0,5) == 'image' && $render){
             // link only jpeg images
             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
-        }elseif(($mime == 'application/x-shockwave-flash' || substr($mime,0,5) == 'video') && $render){
+        }elseif(($mime == 'application/x-shockwave-flash' || media_supportedav($mime)) && $render){
             // don't link movies
             $noLink = true;
         }else{
@@ -1093,7 +1098,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
             $ret .= ' />';
 
-        }elseif($mime == 'video/webm' || $mime == 'video/ogg' || $mime == 'video/mp4' ){
+        }elseif(media_supportedav($mime, 'video')){
             // first get the $title
             if (!is_null($title)) {
                 $title  = $this->_xmlEntities($title);
@@ -1114,7 +1119,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             //add video(s)
             $ret .= $this->_video($src, $width, $height, $att);
 
-        }elseif($mime == 'audio/ogg' || $mime == 'audio/mpeg' || $mime == 'audio/wav' ){
+        }elseif(media_supportedav($mime, 'audio')){
             // first get the $title
             if (!is_null($title)) {
                 $title  = $this->_xmlEntities($title);
@@ -1277,6 +1282,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @param int $width       - width of the video in pixels
      * @param int $height      - height of the video in pixels
      * @param array $atts      - additional attributes for the <video> tag
+     * @return string
      */
     function _video($src,$width,$height,$atts=null){
 
@@ -1296,23 +1302,25 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $posterUrl = ml(reset($poster),array('cache'=>$cache),true,'&');
         }
 
+        $out = '';
         // open video tag
-        $this->doc .= '<video '.buildAttributes($atts).' controls="controls"';
-        if ($posterUrl) $this->doc .= ' poster="'.$posterUrl.'"';
-        $this->doc .= '>'.NL;
+        $out .= '<video '.buildAttributes($atts).' controls="controls"';
+        if ($posterUrl) $out .= ' poster="'.$posterUrl.'"';
+        $out .= '>'.NL;
 
         // output source for each alternative video format
         foreach($alternatives as $mime => $file) {
             $url = ml($file,array('cache'=>$cache),true,'&');
             $title = $this->_xmlEntities(utf8_basename(noNS($file)));
 
-            $this->doc .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
+            $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+            $out .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
         }
 
         // finish
-        $this->doc .= '</video>'.NL;
+        $out .= '</video>'.NL;
+        return $out;
     }
 
     /**
@@ -1322,6 +1330,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * @param string $src      - ID of audio to embed
      * @param array $atts      - additional attributes for the <audio> tag
+     * @return string
      */
     function _audio($src,$atts=null){
 
@@ -1329,21 +1338,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $extensions = array('ogg', 'mp3', 'wav');
         $alternatives = media_alternativefiles($src, $extensions);
 
+        $out = '';
         // open audio tag
-        $this->doc .= '<audio '.buildAttributes($atts).' controls="controls">'.NL;
+        $out .= '<audio '.buildAttributes($atts).' controls="controls">'.NL;
 
         // output source for each alternative audio format
         foreach($alternatives as $mime => $file) {
             $url = ml($file,array('cache'=>$cache),true,'&');
             $title = $this->_xmlEntities(utf8_basename(noNS($file)));
 
-            $this->doc .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
+            $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly');
+            $out .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
         }
 
         // finish
-        $this->doc .= '</audio>'.NL;
+        $out .= '</audio>'.NL;
+        return $out;
     }
 
 }
-- 
cgit v1.2.3


From d637819dca760b20f6e53e5847a92d08d8d15b8c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 4 Aug 2013 10:36:50 +0100
Subject: added spacing below video and audio elements

Note: The spacing will now show as too much as long as the paragraph bug
is not fixed
---
 lib/tpl/dokuwiki/css/basic.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index ba263f4c5..ef278c939 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -93,6 +93,8 @@ pre,
 table,
 hr,
 blockquote,
+video,
+audio,
 figure,
 details,
 fieldset,
-- 
cgit v1.2.3


From 3641199a253e8f92f378f03926af80724ef04146 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 2 Feb 2014 14:42:47 +0000
Subject: fixed html errors in video and audio rendering

---
 inc/parser/xhtml.php            | 10 +++++++---
 lib/tpl/dokuwiki/css/basic.less |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5fca1bf45..80701cd2e 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1302,8 +1302,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $out = '';
         // open video tag
         $out .= '<video '.buildAttributes($atts).' controls="controls"';
-        if ($posterUrl) $out .= ' poster="'.$posterUrl.'"';
+        if ($posterUrl) $out .= ' poster="'.hsc($posterUrl).'"';
         $out .= '>'.NL;
+        $fallback = '';
 
         // output source for each alternative video format
         foreach($alternatives as $mime => $file) {
@@ -1312,10 +1313,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
             $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $out .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
+            $fallback .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
         }
 
         // finish
+        $out .= $fallback;
         $out .= '</video>'.NL;
         return $out;
     }
@@ -1338,6 +1340,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $out = '';
         // open audio tag
         $out .= '<audio '.buildAttributes($atts).' controls="controls">'.NL;
+        $fallback = '';
 
         // output source for each alternative audio format
         foreach($alternatives as $mime => $file) {
@@ -1346,10 +1349,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
             $out .= '<source src="'.hsc($url).'" type="'.$mime.'" />'.NL;
             // alternative content (just a link to the file)
-            $out .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
+            $fallback .= $this->internalmedia($file, $title, NULL, NULL, NULL, $cache=NULL, $linking='linkonly', $return=true);
         }
 
         // finish
+        $out .= $fallback;
         $out .= '</audio>'.NL;
         return $out;
     }
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index 636923192..c296185e9 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -93,8 +93,6 @@ pre,
 table,
 hr,
 blockquote,
-video,
-audio,
 figure,
 details,
 fieldset,
@@ -103,7 +101,9 @@ address {
     padding: 0;
 }
 
-div {
+div,
+video,
+audio {
     margin: 0;
     padding: 0;
 }
-- 
cgit v1.2.3