This is the bug/patch tracker for Rockbox. Click here for more information.
Quick links: Bugs · Patches · Rockbox frontpage
FS#11079 - musepack sv8 support
Attached to Project:
Rockbox
Opened by Andree Buschmann (Buschel) - Friday, 05 March 2010, 21:18 GMT+2
Last edited by Andree Buschmann (Buschel) - Sunday, 07 March 2010, 21:30 GMT+2
Opened by Andree Buschmann (Buschel) - Friday, 05 March 2010, 21:18 GMT+2
Last edited by Andree Buschmann (Buschel) - Sunday, 07 March 2010, 21:30 GMT+2
|
DetailsThis patch exchanges the current svn musepack decoder against the current official decoder from musepack.net (r458). With this patch musepack sv8 is supported in addition to svn's sv7 -- including playback and seek. For better performance r458 was merged against rockbox svn to use the already highly optimized filterbanks.
Remarks: 1) Building with this patch will throw several warnings. I am working on this. 2) Tested on pcsim and arm. Results on coldfire are still needed, appreciated and helpful. 3) Decoding is still slower than svn for now (arm svn ~22MHz, arm patched ~27MHz). 4) The metadata check does still use dummy results for sv8 streams. sv7 and sv8 streams for testing can be found at http://samples.mplayerhq.hu/A-codecs/musepack/ 
mpc_sv8_v01.patch
(275 KiB)
apps/metadata/mpc.c | 4 apps/plugins/SOURCES | 3 apps/codecs/libmusepack/config_types.h | 51 apps/codecs/libmusepack/mpc_decoder.c | 1976 ++++++----------------------- apps/codecs/libmusepack/AUTHORS | 2 apps/codecs/libmusepack/reader.h | 66 apps/codecs/libmusepack/mpc_types.h | 149 ++ apps/codecs/libmusepack/mpcdec_math.h | 239 +++ apps/codecs/libmusepack/decoder.h | 120 - apps/codecs/libmusepack/crc32.c | 56 apps/codecs/libmusepack/musepack.h | 163 -- apps/codecs/libmusepack/requant.c | 95 - apps/codecs/libmusepack/mpc_bits_reader.c | 179 ++ apps/codecs/libmusepack/requant.h | 36 apps/codecs/libmusepack/mpc_bits_reader.h | 149 ++ apps/codecs/libmusepack/config-mpc.h | 105 - apps/codecs/libmusepack/synth_filter_arm.S | 2 apps/codecs/libmusepack/mpcmath.h | 155 ++ apps/codecs/libmusepack/math.h | 237 --- apps/codecs/libmusepack/mpcdec.h | 172 ++ apps/codecs/libmusepack/SOURCES | 7 apps/codecs/libmusepack/datatypes.h | 38 apps/codecs/libmusepack/ChangeLog | 28 apps/codecs/libmusepack/streaminfo.c | 376 ++--- apps/codecs/libmusepack/minimax.h | 57 apps/codecs/libmusepack/mpc_config.h | 50 apps/codecs/libmusepack/synth_filter.c | 12 apps/codecs/libmusepack/huffsv46.c | 75 - apps/codecs/libmusepack/streaminfo.h | 89 - apps/codecs/libmusepack/README | 8 apps/codecs/libmusepack/internal.h | 89 - apps/codecs/libmusepack/mpc_demux.c | 665 +++++++++ apps/codecs/libmusepack/README.rockbox | 27 apps/codecs/libmusepack/huffman.c | 358 +++++ apps/codecs/libmusepack/mainpage.h | 38 apps/codecs/libmusepack/huffsv7.c | 81 - apps/codecs/libmusepack/idtag.c | 83 - apps/codecs/libmusepack/huffman.h | 56 apps/codecs/mpc.c | 109 - 39 files changed, 3231 insertions(+), 2974 deletions(-) |
This task depends upon
Closed by Andree Buschmann (Buschel)
Sunday, 07 March 2010, 21:30 GMT+2
Reason for closing: Accepted
Additional comments about closing: Committed with r25057.
Sunday, 07 March 2010, 21:30 GMT+2
Reason for closing: Accepted
Additional comments about closing: Committed with r25057.
- removed tabs
- removed compile warnings (3 warnings were inserted as reminder)
- put some more stuff to iram
Speed on iPod Video is decent now: 22.6 MHz.
Speed on other targets will need some more work as a major data structure could not been moved to iram yet.
- reformated lots of tables
- moved some more tables to iram
- rearranged decoder's data structure to fit it into iram on most targets
- adapted handling of first frame (cutting first samples) to non-interleaved sample format
- fully implemented metadata for mpc sv8
Still slower as svn for coldfire (svn: ~25 MHz, patch: ~32 MHz).
Speed on arm (iPod 5.5G) is 22.5 MHz (svn: 22.2 MHz).
Speed on coldfire (h130) is 29.7 MHz (svn: 25.3 MHz).
Measurements by AlexP on irc showed clearly that the main difference in speed on coldfire is located in the bitstream demuxing only (new decoder is about 4 MHz slower in this area). A major change of the new decoder is that it does uses a byte bitstream buffer instead of dword bitstream buffer.
Speed on Coldfire (h130) is 26.3 MHz now (svn: 25.3 MHz).