Rockbox

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

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#9160 - Use Tremor IMDCT for WMA

Attached to Project: Rockbox
Opened by MichaelGiacomelli (saratoga) - Sunday, 06 July 2008, 20:50 GMT+2
Last edited by MichaelGiacomelli (saratoga) - Friday, 18 July 2008, 03:24 GMT+2
Task Type Patches
Category Codecs
Status Closed
Assigned To No-one
Player Type SW-codec
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

The Tremor IMDCT is much, much faster then the WMA (and almost certainly the FAAD) one. This patch copies the Tremor IMDCT over to libwma with minor changes to remove it's connection to Vorbis.

The resulting decoder sounds correct on the Sim and ARM, while being 4MHz faster on PP5024.

I have not tested it on Coldfire, but expect some speedup and hopefully no reduction in quality.

   wmatremorimdct.patch (97 KiB) 
 apps/codecs/libwma/asm_mcf5249.h |  327 +++++++++++++++++++++++
 apps/codecs/libwma/misc.h        |  291 ++++++++++++++++++++
 apps/codecs/libwma/SOURCES       |    6 
 apps/codecs/libwma/wmadec.h      |    8 
 apps/codecs/libwma/mdct_arm.S    |  429 ++++++++++++++++++++++++++++++
 apps/codecs/libwma/mdct2.c       |  520 +++++++++++++++++++++++++++++++++++++
 apps/codecs/libwma/wmadeci.c     |   19 +
 apps/codecs/libwma/mdct2.h       |   85 ++++++
 apps/codecs/libwma/asm_arm.h     |  343 ++++++++++++++++++++++++
 apps/codecs/libwma/mdct_lookup.h |  544 +++++++++++++++++++++++++++++++++++++++
 10 files changed, 2565 insertions(+), 7 deletions(-)

This task depends upon

Closed by  MichaelGiacomelli (saratoga)
Friday, 18 July 2008, 03:24 GMT+2
Reason for closing:  Accepted
Comment by MichaelGiacomelli (saratoga) - Sunday, 06 July 2008, 21:59 GMT+2
Coldfire results from IRC:

<PaulJam> saratoga: without the patch: 249,25% and with the patch: 298,75%
<PaulJam> saratoga: 128kbps (it is one of the windows example music songs)

Also, updated patch to not produce a warning. Output should be identical. If no one finds any glitches, I will try to clean this up and commit it sometime this week or next, then look into adding it to AAC.
   wmatremorimdct.patch (97 KiB) 
 apps/codecs/libwma/asm_mcf5249.h |  327 +++++++++++++++++++++++
 apps/codecs/libwma/misc.h        |  291 ++++++++++++++++++++
 apps/codecs/libwma/SOURCES       |    6 
 apps/codecs/libwma/wmadec.h      |    8 
 apps/codecs/libwma/mdct_arm.S    |  429 ++++++++++++++++++++++++++++++
 apps/codecs/libwma/mdct2.c       |  520 +++++++++++++++++++++++++++++++++++++
 apps/codecs/libwma/wmadeci.c     |   19 +
 apps/codecs/libwma/mdct2.h       |   85 ++++++
 apps/codecs/libwma/asm_arm.h     |  343 ++++++++++++++++++++++++
 apps/codecs/libwma/mdct_lookup.h |  544 +++++++++++++++++++++++++++++++++++++++
 10 files changed, 2565 insertions(+), 7 deletions(-)

Comment by Thom Johansen (preglow) - Monday, 07 July 2008, 12:43 GMT+2
Have you actually tested to see if the output is identical?
Comment by PaulJam (PaulJam) - Monday, 07 July 2008, 14:03 GMT+2
Hi,

i just used the "write WAV" functionality of the test_codec plugin and did an ABX test using Foobar2000 to compare the output with and without the patch.
And the volume of the output with the patch applied is noticeably lower in direct comparison to the output without the patch.
Comment by Thom Johansen (preglow) - Monday, 07 July 2008, 15:04 GMT+2
Sounds like a wrong fixed point format is used somewhere.
Comment by MichaelGiacomelli (saratoga) - Wednesday, 09 July 2008, 01:26 GMT+2
Heres an updated patch.

Gives me more or less identical output (<-140dB RMS error) meaning that resolution remains well above 16 bits. We probably lost a bit of accuracy since the fixed point format in Tremor and libwma are mismatched, but I don't see much sense in rewriting the IMDCT in ARM ASM just to save some accuracy above the 16th bit.

However, this does not rule out the possibility of clipping on loud samples, so any testing is appreciated.

Edit: Sorry, patch had some other junk in it related to Tremor. Should be fixed now.
   wmatremorimdct3.patch (98.4 KiB) 
 apps/plugins/SOURCES             |    1 
 apps/codecs/libwma/asm_mcf5249.h |  327 +++++++++++++++++++++++
 apps/codecs/libwma/misc.h        |  291 ++++++++++++++++++++
 apps/codecs/libwma/SOURCES       |    6 
 apps/codecs/libwma/wmadec.h      |    8 
 apps/codecs/libwma/mdct_arm.S    |  429 ++++++++++++++++++++++++++++++
 apps/codecs/libwma/mdct2.c       |  520 +++++++++++++++++++++++++++++++++++++
 apps/codecs/libwma/wmadeci.c     |   19 +
 apps/codecs/libwma/mdct2.h       |   85 ++++++
 apps/codecs/libwma/asm_arm.h     |  343 ++++++++++++++++++++++++
 apps/codecs/libwma/mdct_lookup.h |  544 +++++++++++++++++++++++++++++++++++++++
 apps/codecs/wma.c                |    6 
 12 files changed, 2569 insertions(+), 10 deletions(-)

Comment by Magnus Holmgren (learman) - Wednesday, 09 July 2008, 23:20 GMT+2
From what I've read, an FFT-based IMDCT would be even faster, and that is what FAAD uses, as far as I can tell (though it might not be well optimized for our targets). Wouldn't it be better to try to optimize and use that one? Still, a nice speed-up for WMA.
Comment by MichaelGiacomelli (saratoga) - Wednesday, 09 July 2008, 23:47 GMT+2
The old IMDCT was also FFT based, but substantially slower then the Tremor one even ignoring ASM optimization. A faster FFT algorithm that was optimized for the minimum number of multiplies at the expense of adds would have been faster, but I don't know how much so. Unfortunately, few fixed point FFT implementations exist, and designing fast ones is a nontrivial task.

Regarding choice of algorithm, I've actually seen claims that both methods are fastest, so I tend to think there is not a huge difference.
Comment by MichaelGiacomelli (saratoga) - Sunday, 13 July 2008, 21:57 GMT+2
Corrected lowered volume on files using noise coding.
Removed some unneeded fixed point functions left over from the ffmpeg imdct.
   wmatremorimdct4.patch (102.9 KiB) 
 apps/codecs/libwma/asm_mcf5249.h |  327 +++++++++++++++++++++++
 apps/codecs/libwma/misc.h        |  291 ++++++++++++++++++++
 apps/codecs/libwma/SOURCES       |    6 
 apps/codecs/libwma/wmadec.h      |    8 
 apps/codecs/libwma/mdct_arm.S    |  429 ++++++++++++++++++++++++++++++
 apps/codecs/libwma/wmafixed.h    |   64 ----
 apps/codecs/libwma/wmadeci.c     |   35 +-
 apps/codecs/libwma/mdct2.c       |  520 +++++++++++++++++++++++++++++++++++++
 apps/codecs/libwma/mdct2.h       |   85 ++++++
 apps/codecs/libwma/asm_arm.h     |  343 ++++++++++++++++++++++++
 apps/codecs/libwma/mdct_lookup.h |  544 +++++++++++++++++++++++++++++++++++++++
 apps/codecs/wma.c                |    6 
 12 files changed, 2577 insertions(+), 81 deletions(-)

Comment by Andree Buschmann (Buschel) - Thursday, 17 July 2008, 07:41 GMT+2
I would say -> go for svn. Because

a) the speed increase is significant
b) it seems you already measured a very low RMS error
c) you won't get much feedback on possible errors here

Good job!
Comment by Thom Johansen (preglow) - Thursday, 17 July 2008, 11:13 GMT+2
Go for it!

Loading...