[open-allure-ds] push by jg07...@gmail.com - Replaced MP4Box with mencoder for SlideSpeech Converter for Windows on 2011-12-07 04:19 GMT

[open-al...@googlecode.com]

Revision: 16f8a7c31aec
Author: John Graves
Date: Tue Dec 6 20:16:21 2011
Log: Replaced MP4Box with mencoder for SlideSpeech Converter for
Windows
http://code.google.com/p/open-allure-ds/source/detail?r=16f8a7c31aec

Added:
/odp2wts/mencoder.exe
Modified:
/SlideSpeechInstaller.nsi
/odp2wts/SlideSpeechConverter.py
/odp2wts/exeMaker.py
/wikitospeech/SlideSpeech.py

=======================================
--- /dev/null
+++ /odp2wts/mencoder.exe Tue Dec 6 20:16:21 2011
File is too large to display a diff.
=======================================
--- /SlideSpeechInstaller.nsi Mon Dec 5 17:25:29 2011
+++ /SlideSpeechInstaller.nsi Tue Dec 6 20:16:21 2011
@@ -4,7 +4,7 @@

Var ALREADY_INSTALLED ; variable - no {} needed, just $

-!define SLIDESPEECH_VERSION "0.1.30" ; define - ${} needed
+!define SLIDESPEECH_VERSION "0.1.31" ; define - ${} needed

!define MUI_ICON "D:\open-allure-ds\odp2wts\slidespeech.ico"
!define UMUI_LEFTIMAGE_BMP "D:\open-allure-ds\odp2wts\openallure_left.bmp"
=======================================
--- /odp2wts/SlideSpeechConverter.py Mon Dec 5 17:25:29 2011
+++ /odp2wts/SlideSpeechConverter.py Tue Dec 6 20:16:21 2011
@@ -56,8 +56,9 @@
espeak
20111205 Allow for direct script and image creation from PowerPoint files
20111206 Renamed SlideSpeech Converter
+20111207 Changed to using mencoder to create .avi files for makeVid Windows
"""
-__version__ = "0.1.30"
+__version__ = "0.1.31"

import BeautifulSoup
from BeautifulSoup import BeautifulStoneSoup
@@ -912,15 +913,15 @@
subprocess.Popen(["del","win32_mklink_test"],shell=True)

f.write("echo off\ncls\n")
- f.write("if exist output.mp4 (del output.mp4)\n")
- if os.path.isfile(savePath+os.sep+"MP4Box.exe"):
- catCommand = '"'+savePath+os.sep+'MP4Box"'
- else:
- catCommand = "MP4Box"
+ f.write("if exist output.avi (del output.avi)\n")
+ catCommand = "copy /b"
for i, file in enumerate(sortedOgg):
stem, suffix = file.split(".")
# Add the slide video to the list of videos to be concatenated
- catCommand += " -cat "+stem+".mp4"
+ if i==0:
+ catCommand += " "+stem+".avi"
+ else:
+ catCommand += " + "+stem+".avi"
tenthsOfSeconds = int(math.floor(times[i]*10))
# If we are on the last slide, add enough frames
# to give audio time to finish
@@ -944,7 +945,7 @@
# Convert the images to a video of that slide with voice over
# NOTE: Little trick here -- Windows wants to substitute the batch
file name
# into %0 so we use %1 and pass %0 as the first parameter
- f.write('"'+savePath+os.sep+'ffmpeg" -i '+stem+'.mp3 -r 10
-i "'+stem+'_%15d.jpg" -ab 64k '+stem+".mp4\n")
+ f.write('"'+savePath+os.sep+'ffmpeg" -i '+stem+'.mp3 -r 10
-i "'+stem+'_%15d.jpg" -ab 64k '+stem+".avi\n")
# Delete the symlinks
for j in range(tenthsOfSeconds):
f.write("del "+stem+'_'+str(j).zfill(5)+'.jpg\n')
@@ -953,12 +954,17 @@
if ((j > 0) and (j % 900 == 0)):
f.write("del "+stem+str(j)+'.jpg\n')
# Add an output file name for the concatenation
- catCommand += " output.mp4\n"
+ catCommand += " temp.avi\n"
+
+ if os.path.isfile(savePath+os.sep+"mencoder.exe"):
+ catCommand += '"'+savePath+os.sep+'mencoder.exe" temp.avi -o
output.avi -forceidx -ovc copy -oac copy\n'
+ else:
+ catCommand += "mencoder.exe temp.avi -o output.avi -forceidx -ovc
copy -oac copy\n"
f.write(catCommand)
# Delete all the single slide videos
for file in sortedOgg:
stem, suffix = file.split(".")
- f.write('del '+stem+'.mp4\n')
+ f.write('del '+stem+'.avi\n')
f.close()

elif sys.platform.startswith("darwin"):
=======================================
--- /odp2wts/exeMaker.py Mon Dec 5 17:25:29 2011
+++ /odp2wts/exeMaker.py Tue Dec 6 20:16:21 2011
@@ -29,7 +29,7 @@
'README.txt',
'LICENSE.txt',
'lame.exe',
- 'MP4Box.exe',
+ 'mencoder.exe',
'ffmpeg.exe',
'js32.dll',
'sapi2wav.exe',
=======================================
--- /wikitospeech/SlideSpeech.py Mon Nov 28 00:38:44 2011
+++ /wikitospeech/SlideSpeech.py Tue Dec 6 20:16:21 2011
@@ -23,6 +23,7 @@
20110913 Make symbolic links from static directory to location of
script.txt png images
20111126 Titanpad in addition to iEtherpad. Jump to 0.1.26 to sync with
odp2wts (SlideSpeech)
20111128 Changed name to SlideSpeech. Revised voice.py to work under Linux.
+20111207 Sync version number with SlideSpeech Converter
"""
import cherrypy
import os.path
@@ -36,7 +37,7 @@
import sys
import voice

-__version__ = "0.1.28"
+__version__ = "0.1.31"

if not os.path.exists('static'):
os.makedirs('static')