http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82781
Revision: 82781
Author: dale
Date: 2011-02-25 04:20:39 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
* updated readme
* don't display backgournd image for iframes ( does not resize properly on
older browsers, should use 100% <img> instead
* remove .log files created in two pass encoding
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/README
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
Modified: trunk/extensions/TimedMediaHandler/README
===================================================================
--- trunk/extensions/TimedMediaHandler/README 2011-02-25 01:29:11 UTC (rev
82780)
+++ trunk/extensions/TimedMediaHandler/README 2011-02-25 04:20:39 UTC (rev
82781)
@@ -18,48 +18,65 @@
// TimedMediaHandler
require( "$IP/extensions/TimedMediaHandler/TimedMediaHandler.php" );
-oggThumb
-------
-We use oggvideotools for creating still images of videos, you will need a copy
on your
-server.
+Kaltura html5 player library
+-----
+TimedMediaHandler uses the Kaltura html5 player library for video playback.
-Set the oggThumb binary location with:
+For more information about the player library visit:
+http://html5video.org or
http://www.kaltura.org/project/HTML5_Video_Media_JavaScript_Library
- $wgOggThumbLocation = '/path/to/oggThumb';
-Download oggThumb from: http://dev.streamnik.de/oggvideotools.html
-
-
FFmpeg
------
-We use FFmpeg for creating still images of videos, you will need a copy on
your
-server.
+We use FFmpeg for creating still images of videos, and for transcoding webm
+videos. You will need a copy on your server.
-Some old versions of FFmpeg had a bug which made it extremely slow to seek in
-large theora videos in order to generate a thumbnail. This is fixed in the
-current version. If you are using an old version of FFmpeg and find that
-performance is extremely poor (tens of seconds) to generate thumbnails of
-theora videos that are several minutes or more in length, try applying our
-ffmpeg-bugfix.diff.
-
Download source: http://ffmpeg.mplayerhq.hu/download.html
About the bug: https://roundup.mplayerhq.hu/roundup/ffmpeg/issue159
+Static Binary /latest version/ distribution for major os
+( with webm encoder and borad decode support )
+http://firefogg.org/nightly/
+
Suggested configure line for minimal functionality:
./configure --disable-demuxers --disable-muxers --disable-decoders
--disable-encoders \
--disable-ffserver --disable-ffplay --enable-encoder=mjpeg
--enable-muxer=mjpeg \
--enable-decoder=theora --enable-demuxer=ogg --disable-network
--disable-devices \
--disable-parsers --enable-parser=vp3 --build-suffix=-still
+
+Suggested configure line for webm encoding and decoding of many formats:
+ --enable-gpl --enable-version3 --enable-postproc --enable-libvorbis
--enable-pthreads \
+ --disable-shared --disable-ffserver --disable-ffprobe --enable-postproc \
+ --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-bzlib
--enable-libtheora \
+ --enable-libspeex --enable-libvpx --disable-encoders --disable-decoder=vp8
--disable-muxers \
+
--enable-encoder='bmp,dvvideo,ffv1,ffvhuff,flac,gif,huffyuv,libdirac,libschroedinger,\
+
libtheora,libvorbis,libvpx,mjpeg,pbm,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_s16be,\
+
pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,pcm_s32le,pcm_s8,pcm_u16be,pcm_u16le,pcm_u24be,\
+
pcm_u24le,pcm_u32be,pcm_u32le,pcm_u8,pgm,pgmyuv,png,ppm,rawvideo,tiff,vorbis,zlib'
\
+
--enable-muxer='aiff,crc,dv,gif,image2,image2pipe,matroska,matroska_audio,md5,mjpeg,\
+
null,ogg,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,\
+
pcm_s32le,pcm_s8,pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_u8,rawvideo\
+ ,wav,webm,yuv4mpegpipe'
+
+
+ Some old versions of FFmpeg had a bug which made it extremely slow to seek in
+large theora videos in order to generate a thumbnail. This is fixed in the
+current version. If you are using an old version of FFmpeg and find that
+performance is extremely poor (tens of seconds) to generate thumbnails of
+theora videos that are several minutes or more in length, try applying our
+ffmpeg-bugfix.diff.
+
Set the FFmpeg binary location with:
$wgFFmpegLocation = '/path/to/ffmpeg';
after the require line in LocalSettings.php.
+
ffmpeg2theora
------
@@ -70,8 +87,22 @@
$wgffmpeg2theoraLocation = '/path/to/ffmpeg2theora';
-Download ffmpeg2theora from: http://v2v.cc/~j/ffmpeg2theora/
+Download ffmpeg2theora from: http://firefogg.org/nightly/
+
+oggThumb
+------
+
+We use oggvideotools for creating still images of videos, you will need a copy
on your
+server.
+
+Set the oggThumb binary location with:
+
+ $wgOggThumbLocation = '/path/to/oggThumb';
+
+Download oggThumb from: http://dev.streamnik.de/oggvideotools.html
+
+
Cortado
-------
@@ -89,8 +120,8 @@
PEAR File_Ogg
-------------
-I forked the PEAR File_Ogg package and improved it significantly in order to
-support this extension. I have now taken over maintainership of File_Ogg and
+Tim Starling forked the PEAR File_Ogg package and improved it significantly in
order to
+support this extension. Tim Starling has now taken over maintainership of
File_Ogg and
merged my changes into the latest release. This extension will now work with
either the bundled File_Ogg class, or a File_Ogg package from PEAR with
version 0.3.0 or greater. It is licensed under the LGPL.
@@ -100,13 +131,14 @@
As per the usual convention, the PEAR base directory (the one with PEAR.php in
it) must be in your include_path.
-Graphics
---------
-The icons play.png, pause.png, stop.png and info.png are from the Crystal
Project:
+getID3
+----------
+getID3 is used for metadata of WebM files.
- http://www.everaldo.com/crystal/
-
-They are licensed under the LGPL.
-
--- Tim Starling
+getID3() by James Heinrich <[email protected]>
+available at http://getid3.sourceforge.net
+or http://www.getid3.org
+
+getID3 code is released under the GNU GPL:
+http://www.gnu.org/copyleft/gpl.html
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-02-25 01:29:11 UTC (rev 82780)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-02-25 04:20:39 UTC (rev 82781)
@@ -60,6 +60,7 @@
// Also add the .log file ( used in two pass encoding )
// ( probably should move in-progress encodes out of web
accessible directory )
$wgExcludeFromThumbnailPurge+= array( 'log');
+
/**
* Add support for the "TimedText" NameSpace
*/
Modified: trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php
2011-02-25 01:29:11 UTC (rev 82780)
+++ trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php
2011-02-25 04:20:39 UTC (rev 82781)
@@ -70,16 +70,6 @@
echo $out->getHeadLinks($skin);
echo $out->getHeadItems();
?>
- <style>
- body {
- background-image:url('<?php echo $file->getThumbUrl( $thumbName
)?>');
- background-repeat:no-repeat;
- background-attachment:fixed;
- background-position:center;
- background-color:#000;
- background-size: 100%;
- }
- </style>
</head>
<body>
<div id="bgimage"></div>
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
===================================================================
---
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2011-02-25 01:29:11 UTC (rev 82780)
+++
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2011-02-25 04:20:39 UTC (rev 82781)
@@ -58,6 +58,10 @@
$status = $this->ffmpegEncode( $file,
$destinationFile, $options, 1 );
if( $status ){
$status = $this->ffmpegEncode( $file,
$destinationFile, $options, 2 );
+ // unlink the .log file used in two
pass encoding:
+ wfSuppressWarnings();
+ unlink( $destinationFile . '.log' );
+ wfRestoreWarnings();
}
// remove any log files
$this->removeFffmpgeLogFiles( dirname(
$destinationFile) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
