Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#11160 - Rbutil: Make TTS and encoders run on all cores

Attached to Project: Rockbox
Opened by Delyan Kratunov (archivator) - Thursday, 01 April 2010, 01:43 GMT+2
Last edited by Dominik Wenger (Domonoky) - Friday, 04 June 2010, 23:24 GMT+2
Task Type Patches
Category Rbutil
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Rbutil SVN
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

Patch 1 makes rbutil run the encoding process in parallel, on all cores. Tested with rbspeex, should work just as well with LAME.

Patch 2 makes rbutil run the Festival and TTSExes engines on all cores (Carbon needs reworking, SAPI doesn't look thread-safe - needs testing). The patch also introduces a very basic framework for the TTS engines to report their capabilities. Tested with Festival and espeak.

Naturally, there may be bugs but I think this is more or less the final solution to the problem (aside from cosmetic changes such as moving the extra members of TalkEntry to a new substructure).

Patch 2 cannot be applied without patch 1.
   01-enc_concurrent.patch (1.8 KiB) 
 b/rbutil/rbutilqt/base/encoders.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

   02-tts_concurrent.patch (12.2 KiB) 
 b/rbutil/rbutilqt/base/talkgenerator.cpp |  123 +++++++++++++++++--------------
 b/rbutil/rbutilqt/base/talkgenerator.h   |   10 ++
 b/rbutil/rbutilqt/base/ttsbase.h         |    4 -
 b/rbutil/rbutilqt/base/ttscarbon.cpp     |    4 +
 b/rbutil/rbutilqt/base/ttscarbon.h       |    2 
 b/rbutil/rbutilqt/base/ttsexes.cpp       |    5 +
 b/rbutil/rbutilqt/base/ttsexes.h         |    1 
 b/rbutil/rbutilqt/base/ttsfestival.cpp   |    5 +
 b/rbutil/rbutilqt/base/ttsfestival.h     |    1 
 b/rbutil/rbutilqt/base/ttssapi.cpp       |    5 +
 b/rbutil/rbutilqt/base/ttssapi.h         |    1 
 11 files changed, 103 insertions(+), 58 deletions(-)

This task depends upon

Closed by  Dominik Wenger (Domonoky)
Friday, 04 June 2010, 23:24 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  Just commited it.
Comment by Delyan Kratunov (archivator) - Thursday, 01 April 2010, 01:45 GMT+2
Sorry, wrong file. Attached is the correct patch 1.
   01-enc_concurrent.patch (7.2 KiB) 
 b/rbutil/rbutilqt/base/encoders.cpp      |   10 +--
 b/rbutil/rbutilqt/base/talkgenerator.cpp |   88 ++++++++++++++++++++-----------
 b/rbutil/rbutilqt/base/talkgenerator.h   |   15 ++++-
 3 files changed, 76 insertions(+), 37 deletions(-)

Comment by Delyan Kratunov (archivator) - Monday, 05 April 2010, 20:48 GMT+2
Some cosmetic fixes. This is the final patch, really. I can't think of any more functionality to add, so... I rest my case :)
   03-enc_tts_concurrent.patch (17.3 KiB) 
 b/rbutil/rbutilqt/base/encoders.cpp      |   10 -
 b/rbutil/rbutilqt/base/talkgenerator.cpp |  201 ++++++++++++++++++-------------
 b/rbutil/rbutilqt/base/talkgenerator.h   |   26 +++-
 b/rbutil/rbutilqt/base/ttsbase.h         |   12 -
 b/rbutil/rbutilqt/base/ttscarbon.cpp     |    4 
 b/rbutil/rbutilqt/base/ttscarbon.h       |    2 
 b/rbutil/rbutilqt/base/ttsexes.cpp       |    5 
 b/rbutil/rbutilqt/base/ttsexes.h         |    1 
 b/rbutil/rbutilqt/base/ttsfestival.cpp   |    5 
 b/rbutil/rbutilqt/base/ttsfestival.h     |    1 
 b/rbutil/rbutilqt/base/ttssapi.cpp       |    5 
 b/rbutil/rbutilqt/base/ttssapi.h         |    1 
 12 files changed, 179 insertions(+), 94 deletions(-)

Comment by Delyan Kratunov (archivator) - Tuesday, 06 April 2010, 21:45 GMT+2
This version fixes some tabs and a bug with duplicated entries. I also spotted a bug where refs.generator was not set for the voicing process, so the whole app would have crashed if the voicing failed.
   04-enc_tts_concurrent.patch (17.6 KiB) 
 b/rbutil/rbutilqt/base/encoders.cpp      |   10 -
 b/rbutil/rbutilqt/base/talkgenerator.cpp |  206 ++++++++++++++++++-------------
 b/rbutil/rbutilqt/base/talkgenerator.h   |   27 +++-
 b/rbutil/rbutilqt/base/ttsbase.h         |   12 -
 b/rbutil/rbutilqt/base/ttscarbon.cpp     |    4 
 b/rbutil/rbutilqt/base/ttscarbon.h       |    2 
 b/rbutil/rbutilqt/base/ttsexes.cpp       |    5 
 b/rbutil/rbutilqt/base/ttsexes.h         |    1 
 b/rbutil/rbutilqt/base/ttsfestival.cpp   |    5 
 b/rbutil/rbutilqt/base/ttsfestival.h     |    1 
 b/rbutil/rbutilqt/base/ttssapi.cpp       |    5 
 b/rbutil/rbutilqt/base/ttssapi.h         |    1 
 12 files changed, 185 insertions(+), 94 deletions(-)

Comment by Dominik Wenger (Domonoky) - Thursday, 22 April 2010, 00:08 GMT+2
This version fixes the following problems:
- No progress Info with ttssapi. (changed waitForReadyRead to a polling loop in ttssapi::voice() )
- TTS Abort didnt work with ttssapi. (removed the waitForFinished() in Talkgenerator::abort() )

Also i think this patch needs testing with the other non-parallel TTS (TTSCarbon) before it can go in.
   05-enc_tts_concurrent.patch (17.7 KiB) 
 rbutil/rbutilqt/base/encoders.cpp      |   10 -
 rbutil/rbutilqt/base/talkgenerator.cpp |  220 +++++++++++++++++++--------------
 rbutil/rbutilqt/base/talkgenerator.h   |   27 +++-
 rbutil/rbutilqt/base/ttsbase.h         |   12 -
 rbutil/rbutilqt/base/ttscarbon.cpp     |    4 
 rbutil/rbutilqt/base/ttscarbon.h       |    2 
 rbutil/rbutilqt/base/ttsexes.cpp       |    5 
 rbutil/rbutilqt/base/ttsexes.h         |    1 
 rbutil/rbutilqt/base/ttsfestival.cpp   |    5 
 rbutil/rbutilqt/base/ttsfestival.h     |    1 
 rbutil/rbutilqt/base/ttssapi.cpp       |   13 +
 rbutil/rbutilqt/base/ttssapi.h         |    1 
 12 files changed, 197 insertions(+), 104 deletions(-)

Comment by Delyan Kratunov (archivator) - Sunday, 25 April 2010, 02:09 GMT+2
Dominik, thanks for testing. I'll be setting up a VM soon to investigate SAPI further.

I have one objection to your changes, though. The second point in your comment must surely be a bug in ttssapi? After, all, all QFutureWatcher::cancel does is to signal the QFuture to stop sending new data to the child thread (meaning, wait for the current thread to finish and stop). waitForFinished() simply makes the call synchronous, so the problem lies deeper - perhaps something is keeping the child thread alive? Did you try breaking at TalkGenerator::abort in a debugger?
Comment by Dominik Wenger (Domonoky) - Sunday, 25 April 2010, 23:39 GMT+2
I didnt try it in the debugger, but the waitForFinished call blocked the whole UI, so generation either gets executed in the main-thread or there is some other threading/signaling problem.

The function which startes the generation waits for != running,so i thought it should be safe to remove.
Comment by Dominik Riebeling (bluebrother) - Sunday, 02 May 2010, 22:56 GMT+2
Fixed building on OS X. The changes to encoders.cpp are purely related to qDebug() output, so IMO those changes can go in immediately as separate commit.

I've tried building a voice file with the patch (05) and couldn't find any issues so far (the voice file seems to work fine, at least for the rather small amount of menu entries I've checked). Haven't looked in the code yet.
   06-enc_tts_concurrent.diff (17.6 KiB) 
 rbutil/rbutilqt/base/encoders.cpp      |   10 -
 rbutil/rbutilqt/base/talkgenerator.cpp |  220 +++++++++++++++++++--------------
 rbutil/rbutilqt/base/talkgenerator.h   |   27 +++-
 rbutil/rbutilqt/base/ttsbase.h         |   12 -
 rbutil/rbutilqt/base/ttscarbon.cpp     |    4 
 rbutil/rbutilqt/base/ttscarbon.h       |    2 
 rbutil/rbutilqt/base/ttsexes.cpp       |    5 
 rbutil/rbutilqt/base/ttsexes.h         |    1 
 rbutil/rbutilqt/base/ttsfestival.cpp   |    5 
 rbutil/rbutilqt/base/ttsfestival.h     |    1 
 rbutil/rbutilqt/base/ttssapi.cpp       |   13 +
 rbutil/rbutilqt/base/ttssapi.h         |    1 
 12 files changed, 197 insertions(+), 104 deletions(-)

Loading...