This is the bug/patch tracker for Rockbox. Click here for more information.
Quick links: Bugs · Patches · Rockbox frontpage
FS#8162 - Core speex decoder and voice for SWCODEC targets
Attached to Project:
Rockbox
Opened by Michael Sevakis (MikeS) - Thursday, 15 November 2007, 21:48 GMT+2
Last edited by Michael Sevakis (MikeS) - Sunday, 18 November 2007, 18:21 GMT+2
Opened by Michael Sevakis (MikeS) - Thursday, 15 November 2007, 21:48 GMT+2
Last edited by Michael Sevakis (MikeS) - Sunday, 18 November 2007, 18:21 GMT+2
|
DetailsThis changes the suppoted voice format from MPEG audio to Speex and moves the decoder to the core which simplifies the playback engine greatly and factors voice away from playback.c.
core-speex-voice-codec.diff
(93.8 KiB)
tools/voice.pl | 12 tools/configure | 72 -- apps/codecs.c | 4 apps/codecs.h | 4 apps/pcmbuf.c | 124 ++- apps/pcmbuf.h | 6 apps/dsp.c | 290 ++++---- apps/talk.c | 2 apps/dsp.h | 26 apps/playback.c | 854 +------------------------ apps/voice_thread.c | 402 +++++++++++ apps/plugin.c | 3 apps/voice_thread.h | 33 apps/SOURCES | 1 apps/codecs/libspeex/bits.c | 4 apps/codecs/libspeex/exc_10_32_table.c | 3 apps/codecs/libspeex/exc_20_32_table.c | 3 apps/codecs/libspeex/exc_8_128_table.c | 3 apps/codecs/libspeex/exc_5_256_table.c | 3 apps/codecs/libspeex/exc_5_64_table.c | 3 apps/codecs/libspeex/exc_10_16_table.c | 3 firmware/export/audio.h | 14 firmware/SOURCES | 3 firmware/target/arm/memswap128-arm.S | 44 - firmware/target/coldfire/memswap128-coldfire.S | 50 - firmware/common/memswap128.c | 44 - 26 files changed, 772 insertions(+), 1238 deletions(-) |
This task depends upon
Closed by Michael Sevakis (MikeS)
Sunday, 18 November 2007, 18:21 GMT+2
Reason for closing: Accepted
Additional comments about closing: New format is now used as of r15668
Sunday, 18 November 2007, 18:21 GMT+2
Reason for closing: Accepted
Additional comments about closing: New format is now used as of r15668
However, there seems to be lots of unrelated changes as well, like renaming of types etc. Were these really necessary for the voice to work?
Anyway, I think this should be committed ASAP, provided that this doesn't in any way affect the Archos players, that still need voice files in MP3 format.
No effect on Archos. That's the idea.
BTW, what about setting up the daily voice as speex? Shouldn't that be ready to go along with a full tools patch so this gets done in one felled swoop?
EDIT: The needed version change in voicefont.c was also missing thanks to an "svn revert" on /tools. Included here.
than rbspeexenc?
Would it be possible to summarize what it is rbspeexenc does differently
vs the standard speexenc?
There probably needs to be a special case when the voice is generated
with espeak: it's 22.05KHz, and speexenc appears to prefer it resampled
to 16KHz.
The voice files I was using were made with eSpeak + rbspeexenc. rbspeexenc outputs raw speex data with no ogg or other container and is required for encoding. It will also be able to resample it to the proper rate (but won't convert stereo to mono). I recorded some talk clips at 44kHz, encoded them with it and had no trouble with them playing in the file browser.
By the way, which patch did you use? I've tested on four of my targets and, well, it's the same code for all of them. Basically a sure shot to it have work if everything was encoded properly.