summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-10 15:15:10 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-10 15:15:10 +0000
commita7a2baa97f8ee7c4d1b751d66f095120b9f62778 (patch)
tree6a1aa6bfe374f54ff6bce704f56e172994ea9443
parent27bb9986f6e0bfc8f21a2dc1317accd2c6097048 (diff)
downloadrockbox-a7a2baa97f8ee7c4d1b751d66f095120b9f62778.tar.gz
rockbox-a7a2baa97f8ee7c4d1b751d66f095120b9f62778.zip
Some changes for musepack: Disable SV4-SV6 support (I guess I am the only one who oned such). Remove tabs, perform some minor code beautification and add ICONST_ATTR to some requantization constants.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17438 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/codecs/libmusepack/decoder.h4
-rw-r--r--apps/codecs/libmusepack/huffsv46.c2
-rw-r--r--apps/codecs/libmusepack/huffsv7.c34
-rw-r--r--apps/codecs/libmusepack/mpc_decoder.c45
-rw-r--r--apps/codecs/libmusepack/reader.h12
-rw-r--r--apps/codecs/libmusepack/requant.c32
6 files changed, 59 insertions, 70 deletions
diff --git a/apps/codecs/libmusepack/decoder.h b/apps/codecs/libmusepack/decoder.h
index d65f6dcfb3..bbd1aa9610 100644
--- a/apps/codecs/libmusepack/decoder.h
+++ b/apps/codecs/libmusepack/decoder.h
@@ -43,7 +43,7 @@
43#include "reader.h" 43#include "reader.h"
44#include "streaminfo.h" 44#include "streaminfo.h"
45 45
46#define MPC_SUPPORT_SV456 46//#define MPC_SUPPORT_SV456
47#define SCF_HACK 47#define SCF_HACK
48 48
49enum { 49enum {
@@ -107,8 +107,6 @@ typedef struct mpc_decoder_t {
107#endif 107#endif
108 mpc_int8_t SCFI_L [32]; 108 mpc_int8_t SCFI_L [32];
109 mpc_int8_t SCFI_R [32]; // describes order of transmitted SCF 109 mpc_int8_t SCFI_R [32]; // describes order of transmitted SCF
110 //mpc_int32_t DSCF_Reference_L [32];
111 //mpc_int32_t DSCF_Reference_R [32]; // holds last frames SCF
112 mpc_bool_t MS_Flag[32]; // MS used? 110 mpc_bool_t MS_Flag[32]; // MS used?
113 111
114 mpc_uint32_t* SeekTable; 112 mpc_uint32_t* SeekTable;
diff --git a/apps/codecs/libmusepack/huffsv46.c b/apps/codecs/libmusepack/huffsv46.c
index 3e0fb3ed93..833b64b454 100644
--- a/apps/codecs/libmusepack/huffsv46.c
+++ b/apps/codecs/libmusepack/huffsv46.c
@@ -69,7 +69,7 @@ static const HuffmanTyp mpc_table_Entropie_7 [63] =
69{{4278190080u,8,28},{4261412864u,8,26},{4227858432u,7,-20},{4160749568u,6,8},{4093640704u,6,-8},{4026531840u,6,-9},{3959422976u,6,9},{3925868544u,7,20},{3892314112u,7,21},{3825205248u,6,-10},{3758096384u,6,-11},{3690987520u,6,10},{3623878656u,6,11},{3590324224u,7,-21},{3573547008u,8,29},{3556769792u,8,-29},{3489660928u,6,13},{3422552064u,6,-13},{3355443200u,6,-12},{3288334336u,6,12},{3254779904u,7,-22},{3221225472u,7,22},{3154116608u,6,14},{3087007744u,6,15},{3019898880u,6,-14},{2986344448u,7,-23},{2952790016u,7,23},{2885681152u,6,-15},{2818572288u,6,-16},{2751463424u,6,16},{2717908992u,7,27},{2684354560u,7,-27},{2617245696u,6,17},{2550136832u,6,-17},{2533359616u,8,-30},{2516582400u,8,30},{2483027968u,7,24},{2415919104u,6,-18},{2281701376u,5,-1},{2147483648u,5,1},{2113929216u,7,-24},{2080374784u,7,25},{2013265920u,6,18},{1879048192u,5,-3},{1744830464u,5,3},{1610612736u,5,5},{1476395008u,5,0},{1342177280u,5,-2},{1275068416u,6,19},{1207959552u,6,-19},{1073741824u,5,-5},{939524096u,5,-4},{805306368u,5,-7},{671088640u,5,2},{536870912u,5,4},{402653184u,5,7},{369098752u,7,-25},{335544320u,7,-26},{301989888u,7,-28},{285212672u,8,-31},{268435456u,8,31},{134217728u,5,6},{0u,5,-6},}; 69{{4278190080u,8,28},{4261412864u,8,26},{4227858432u,7,-20},{4160749568u,6,8},{4093640704u,6,-8},{4026531840u,6,-9},{3959422976u,6,9},{3925868544u,7,20},{3892314112u,7,21},{3825205248u,6,-10},{3758096384u,6,-11},{3690987520u,6,10},{3623878656u,6,11},{3590324224u,7,-21},{3573547008u,8,29},{3556769792u,8,-29},{3489660928u,6,13},{3422552064u,6,-13},{3355443200u,6,-12},{3288334336u,6,12},{3254779904u,7,-22},{3221225472u,7,22},{3154116608u,6,14},{3087007744u,6,15},{3019898880u,6,-14},{2986344448u,7,-23},{2952790016u,7,23},{2885681152u,6,-15},{2818572288u,6,-16},{2751463424u,6,16},{2717908992u,7,27},{2684354560u,7,-27},{2617245696u,6,17},{2550136832u,6,-17},{2533359616u,8,-30},{2516582400u,8,30},{2483027968u,7,24},{2415919104u,6,-18},{2281701376u,5,-1},{2147483648u,5,1},{2113929216u,7,-24},{2080374784u,7,25},{2013265920u,6,18},{1879048192u,5,-3},{1744830464u,5,3},{1610612736u,5,5},{1476395008u,5,0},{1342177280u,5,-2},{1275068416u,6,19},{1207959552u,6,-19},{1073741824u,5,-5},{939524096u,5,-4},{805306368u,5,-7},{671088640u,5,2},{536870912u,5,4},{402653184u,5,7},{369098752u,7,-25},{335544320u,7,-26},{301989888u,7,-28},{285212672u,8,-31},{268435456u,8,31},{134217728u,5,6},{0u,5,-6},};
70 70
71const HuffmanTyp* mpc_table_SampleHuff [18] = { 71const HuffmanTyp* mpc_table_SampleHuff [18] = {
72 NULL,mpc_table_Entropie_1,mpc_table_Entropie_2,mpc_table_Entropie_3,mpc_table_Entropie_4,mpc_table_Entropie_5,mpc_table_Entropie_6,mpc_table_Entropie_7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL 72 NULL,mpc_table_Entropie_1,mpc_table_Entropie_2,mpc_table_Entropie_3,mpc_table_Entropie_4,mpc_table_Entropie_5,mpc_table_Entropie_6,mpc_table_Entropie_7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL
73}; 73};
74 74
75#endif //#ifdef MPC_SUPPORT_SV456 75#endif //#ifdef MPC_SUPPORT_SV456
diff --git a/apps/codecs/libmusepack/huffsv7.c b/apps/codecs/libmusepack/huffsv7.c
index 5611595281..ae2b902ea7 100644
--- a/apps/codecs/libmusepack/huffsv7.c
+++ b/apps/codecs/libmusepack/huffsv7.c
@@ -39,7 +39,7 @@
39#include <huffman.h> 39#include <huffman.h>
40#include <requant.h> 40#include <requant.h>
41 41
42const HuffmanTyp mpc_table_HuffHdr [10] ICONST_ATTR = 42const HuffmanTyp mpc_table_HuffHdr [10] ICONST_ATTR =
43{{2147483648u,1,0},{1610612736u,3,1},{1577058304u,7,-4},{1568669696u,9,3},{1560281088u,9,4},{1543503872u,8,-5},{1476395008u,6,2},{1342177280u,5,-3},{1073741824u,4,-2},{0u,2,-1},}; 43{{2147483648u,1,0},{1610612736u,3,1},{1577058304u,7,-4},{1568669696u,9,3},{1560281088u,9,4},{1543503872u,8,-5},{1476395008u,6,2},{1342177280u,5,-3},{1073741824u,4,-2},{0u,2,-1},};
44const HuffmanTyp mpc_table_HuffSCFI [ 4] ICONST_ATTR = 44const HuffmanTyp mpc_table_HuffSCFI [ 4] ICONST_ATTR =
45{{2147483648u,1,1},{1610612736u,3,2},{1073741824u,3,0},{0u,2,3},}; 45{{2147483648u,1,1},{1610612736u,3,2},{1073741824u,3,0},{0u,2,3},};
@@ -47,35 +47,35 @@ const HuffmanTyp mpc_table_HuffDSCF [16] ICONST_ATTR =
47{{4160749568u,5,5},{4026531840u,5,-4},{3758096384u,4,3},{3489660928u,4,-3},{3221225472u,4,8},{2684354560u,3,1},{2415919104u,4,0},{2281701376u,5,-5},{2214592512u,6,7},{2147483648u,6,-7},{1610612736u,3,-1},{1073741824u,3,2},{805306368u,4,4},{671088640u,5,6},{536870912u,5,-6},{0u,3,-2},}; 47{{4160749568u,5,5},{4026531840u,5,-4},{3758096384u,4,3},{3489660928u,4,-3},{3221225472u,4,8},{2684354560u,3,1},{2415919104u,4,0},{2281701376u,5,-5},{2214592512u,6,7},{2147483648u,6,-7},{1610612736u,3,-1},{1073741824u,3,2},{805306368u,4,4},{671088640u,5,6},{536870912u,5,-6},{0u,3,-2},};
48 48
49static const HuffmanTyp mpc_table_HuffQ1 [2] [3*3*3] ICONST_ATTR = { 49static const HuffmanTyp mpc_table_HuffQ1 [2] [3*3*3] ICONST_ATTR = {
50 {{3758096384u,3,13},{3690987520u,6,26},{3623878656u,6,0},{3556769792u,6,20},{3489660928u,6,6},{3221225472u,4,14},{2952790016u,4,12},{2684354560u,4,4},{2415919104u,4,22},{2348810240u,6,8},{2281701376u,6,18},{2214592512u,6,24},{2147483648u,6,2},{1879048192u,4,16},{1610612736u,4,10},{1476395008u,5,17},{1342177280u,5,9},{1207959552u,5,1},{1073741824u,5,25},{939524096u,5,5},{805306368u,5,21},{671088640u,5,3},{536870912u,5,11},{402653184u,5,15},{268435456u,5,23},{134217728u,5,19},{0u,5,7},}, 50 {{3758096384u,3,13},{3690987520u,6,26},{3623878656u,6,0},{3556769792u,6,20},{3489660928u,6,6},{3221225472u,4,14},{2952790016u,4,12},{2684354560u,4,4},{2415919104u,4,22},{2348810240u,6,8},{2281701376u,6,18},{2214592512u,6,24},{2147483648u,6,2},{1879048192u,4,16},{1610612736u,4,10},{1476395008u,5,17},{1342177280u,5,9},{1207959552u,5,1},{1073741824u,5,25},{939524096u,5,5},{805306368u,5,21},{671088640u,5,3},{536870912u,5,11},{402653184u,5,15},{268435456u,5,23},{134217728u,5,19},{0u,5,7},},
51 {{2147483648u,1,13},{2113929216u,7,15},{2080374784u,7,1},{2046820352u,7,11},{2013265920u,7,7},{1979711488u,7,17},{1946157056u,7,25},{1912602624u,7,19},{1904214016u,9,8},{1895825408u,9,18},{1887436800u,9,2},{1879048192u,9,24},{1845493760u,7,3},{1811939328u,7,23},{1778384896u,7,21},{1744830464u,7,5},{1728053248u,8,0},{1711276032u,8,26},{1694498816u,8,6},{1677721600u,8,20},{1610612736u,6,9},{1342177280u,4,14},{1073741824u,4,12},{805306368u,4,4},{536870912u,4,22},{268435456u,4,16},{0u,4,10},}, 51 {{2147483648u,1,13},{2113929216u,7,15},{2080374784u,7,1},{2046820352u,7,11},{2013265920u,7,7},{1979711488u,7,17},{1946157056u,7,25},{1912602624u,7,19},{1904214016u,9,8},{1895825408u,9,18},{1887436800u,9,2},{1879048192u,9,24},{1845493760u,7,3},{1811939328u,7,23},{1778384896u,7,21},{1744830464u,7,5},{1728053248u,8,0},{1711276032u,8,26},{1694498816u,8,6},{1677721600u,8,20},{1610612736u,6,9},{1342177280u,4,14},{1073741824u,4,12},{805306368u,4,4},{536870912u,4,22},{268435456u,4,16},{0u,4,10},},
52}; 52};
53static const HuffmanTyp mpc_table_HuffQ2 [2] [5*5] ICONST_ATTR = { 53static const HuffmanTyp mpc_table_HuffQ2 [2] [5*5] ICONST_ATTR = {
54 {{4026531840u,4,13},{3758096384u,4,17},{3489660928u,4,7},{3221225472u,4,11},{3154116608u,6,1},{3087007744u,6,23},{3053453312u,7,4},{3019898880u,7,20},{2986344448u,7,0},{2952790016u,7,24},{2818572288u,5,22},{2684354560u,5,10},{2147483648u,3,12},{2013265920u,5,2},{1879048192u,5,14},{1610612736u,4,6},{1342177280u,4,18},{1073741824u,4,8},{805306368u,4,16},{671088640u,5,9},{536870912u,5,5},{402653184u,5,15},{268435456u,5,21},{134217728u,5,19},{0u,5,3},}, 54 {{4026531840u,4,13},{3758096384u,4,17},{3489660928u,4,7},{3221225472u,4,11},{3154116608u,6,1},{3087007744u,6,23},{3053453312u,7,4},{3019898880u,7,20},{2986344448u,7,0},{2952790016u,7,24},{2818572288u,5,22},{2684354560u,5,10},{2147483648u,3,12},{2013265920u,5,2},{1879048192u,5,14},{1610612736u,4,6},{1342177280u,4,18},{1073741824u,4,8},{805306368u,4,16},{671088640u,5,9},{536870912u,5,5},{402653184u,5,15},{268435456u,5,21},{134217728u,5,19},{0u,5,3},},
55 {{4160749568u,5,18},{4026531840u,5,6},{3892314112u,5,8},{3875536896u,8,3},{3871342592u,10,24},{3867148288u,10,4},{3862953984u,10,0},{3858759680u,10,20},{3825205248u,7,23},{3791650816u,7,1},{3758096384u,7,19},{3623878656u,5,16},{3590324224u,7,15},{3556769792u,7,21},{3523215360u,7,9},{3489660928u,7,5},{3422552064u,6,2},{3355443200u,6,10},{3288334336u,6,14},{3221225472u,6,22},{2147483648u,2,12},{1610612736u,3,13},{1073741824u,3,17},{536870912u,3,11},{0u,3,7},}, 55 {{4160749568u,5,18},{4026531840u,5,6},{3892314112u,5,8},{3875536896u,8,3},{3871342592u,10,24},{3867148288u,10,4},{3862953984u,10,0},{3858759680u,10,20},{3825205248u,7,23},{3791650816u,7,1},{3758096384u,7,19},{3623878656u,5,16},{3590324224u,7,15},{3556769792u,7,21},{3523215360u,7,9},{3489660928u,7,5},{3422552064u,6,2},{3355443200u,6,10},{3288334336u,6,14},{3221225472u,6,22},{2147483648u,2,12},{1610612736u,3,13},{1073741824u,3,17},{536870912u,3,11},{0u,3,7},},
56}; 56};
57static const HuffmanTyp mpc_table_HuffQ3 [2] [ 7] ICONST_ATTR = { 57static const HuffmanTyp mpc_table_HuffQ3 [2] [ 7] ICONST_ATTR = {
58 {{3758096384u,3,1},{3489660928u,4,3},{3221225472u,4,-3},{2684354560u,3,2},{2147483648u,3,-2},{1073741824u,2,0},{0u,2,-1},}, 58 {{3758096384u,3,1},{3489660928u,4,3},{3221225472u,4,-3},{2684354560u,3,2},{2147483648u,3,-2},{1073741824u,2,0},{0u,2,-1},},
59 {{3221225472u,2,0},{2147483648u,2,-1},{1073741824u,2,1},{805306368u,4,-2},{671088640u,5,3},{536870912u,5,-3},{0u,3,2},}, 59 {{3221225472u,2,0},{2147483648u,2,-1},{1073741824u,2,1},{805306368u,4,-2},{671088640u,5,3},{536870912u,5,-3},{0u,3,2},},
60}; 60};
61static const HuffmanTyp mpc_table_HuffQ4 [2] [ 9] ICONST_ATTR = { 61static const HuffmanTyp mpc_table_HuffQ4 [2] [ 9] ICONST_ATTR = {
62 {{3758096384u,3,0},{3221225472u,3,-1},{2684354560u,3,1},{2147483648u,3,-2},{1610612736u,3,2},{1342177280u,4,-4},{1073741824u,4,4},{536870912u,3,3},{0u,3,-3},}, 62 {{3758096384u,3,0},{3221225472u,3,-1},{2684354560u,3,1},{2147483648u,3,-2},{1610612736u,3,2},{1342177280u,4,-4},{1073741824u,4,4},{536870912u,3,3},{0u,3,-3},},
63 {{3758096384u,3,1},{3489660928u,4,2},{3221225472u,4,-3},{2147483648u,2,0},{1610612736u,3,-2},{1342177280u,4,3},{1207959552u,5,-4},{1073741824u,5,4},{0u,2,-1},}, 63 {{3758096384u,3,1},{3489660928u,4,2},{3221225472u,4,-3},{2147483648u,2,0},{1610612736u,3,-2},{1342177280u,4,3},{1207959552u,5,-4},{1073741824u,5,4},{0u,2,-1},},
64}; 64};
65static const HuffmanTyp mpc_table_HuffQ5 [2] [15] ICONST_ATTR = { 65static const HuffmanTyp mpc_table_HuffQ5 [2] [15] ICONST_ATTR = {
66 {{4026531840u,4,2},{3892314112u,5,5},{3825205248u,6,-7},{3758096384u,6,7},{3489660928u,4,-3},{3221225472u,4,3},{3087007744u,5,-6},{2952790016u,5,6},{2684354560u,4,-4},{2415919104u,4,4},{2147483648u,4,-5},{1610612736u,3,0},{1073741824u,3,-1},{536870912u,3,1},{0u,3,-2},}, 66 {{4026531840u,4,2},{3892314112u,5,5},{3825205248u,6,-7},{3758096384u,6,7},{3489660928u,4,-3},{3221225472u,4,3},{3087007744u,5,-6},{2952790016u,5,6},{2684354560u,4,-4},{2415919104u,4,4},{2147483648u,4,-5},{1610612736u,3,0},{1073741824u,3,-1},{536870912u,3,1},{0u,3,-2},},
67 {{4026531840u,4,3},{3892314112u,5,4},{3858759680u,7,6},{3841982464u,8,-7},{3825205248u,8,7},{3758096384u,6,-6},{3221225472u,3,0},{2684354560u,3,-1},{2147483648u,3,1},{1610612736u,3,-2},{1073741824u,3,2},{939524096u,5,-5},{805306368u,5,5},{536870912u,4,-4},{0u,3,-3},}, 67 {{4026531840u,4,3},{3892314112u,5,4},{3858759680u,7,6},{3841982464u,8,-7},{3825205248u,8,7},{3758096384u,6,-6},{3221225472u,3,0},{2684354560u,3,-1},{2147483648u,3,1},{1610612736u,3,-2},{1073741824u,3,2},{939524096u,5,-5},{805306368u,5,5},{536870912u,4,-4},{0u,3,-3},},
68}; 68};
69static const HuffmanTyp mpc_table_HuffQ6 [2] [31] ICONST_ATTR = { 69static const HuffmanTyp mpc_table_HuffQ6 [2] [31] ICONST_ATTR = {
70 {{4160749568u,5,3},{4026531840u,5,-4},{3959422976u,6,-11},{3892314112u,6,12},{3758096384u,5,4},{3623878656u,5,6},{3489660928u,5,-5},{3355443200u,5,5},{3221225472u,5,7},{3087007744u,5,-7},{3019898880u,6,-12},{2952790016u,6,-13},{2818572288u,5,-6},{2684354560u,5,8},{2550136832u,5,-8},{2415919104u,5,9},{2281701376u,5,-9},{2214592512u,6,13},{2181038080u,7,-15},{2147483648u,7,15},{1879048192u,4,0},{1744830464u,5,-10},{1610612736u,5,10},{1342177280u,4,-1},{1073741824u,4,2},{805306368u,4,1},{536870912u,4,-2},{469762048u,6,14},{402653184u,6,-14},{268435456u,5,11},{0u,4,-3},}, 70 {{4160749568u,5,3},{4026531840u,5,-4},{3959422976u,6,-11},{3892314112u,6,12},{3758096384u,5,4},{3623878656u,5,6},{3489660928u,5,-5},{3355443200u,5,5},{3221225472u,5,7},{3087007744u,5,-7},{3019898880u,6,-12},{2952790016u,6,-13},{2818572288u,5,-6},{2684354560u,5,8},{2550136832u,5,-8},{2415919104u,5,9},{2281701376u,5,-9},{2214592512u,6,13},{2181038080u,7,-15},{2147483648u,7,15},{1879048192u,4,0},{1744830464u,5,-10},{1610612736u,5,10},{1342177280u,4,-1},{1073741824u,4,2},{805306368u,4,1},{536870912u,4,-2},{469762048u,6,14},{402653184u,6,-14},{268435456u,5,11},{0u,4,-3},},
71 {{4160749568u,5,-6},{4026531840u,5,6},{3758096384u,4,1},{3489660928u,4,-1},{3456106496u,7,10},{3422552064u,7,-10},{3405774848u,8,-11},{3397386240u,9,-12},{3395289088u,11,13},{3394764800u,13,15},{3394240512u,13,-14},{3393716224u,13,14},{3393191936u,13,-15},{3388997632u,10,-13},{3372220416u,8,11},{3355443200u,8,12},{3288334336u,6,-9},{3221225472u,6,9},{2952790016u,4,-2},{2684354560u,4,2},{2415919104u,4,3},{2147483648u,4,-3},{2013265920u,5,-7},{1879048192u,5,7},{1610612736u,4,-4},{1342177280u,4,4},{1207959552u,5,-8},{1073741824u,5,8},{805306368u,4,5},{536870912u,4,-5},{0u,3,0},}, 71 {{4160749568u,5,-6},{4026531840u,5,6},{3758096384u,4,1},{3489660928u,4,-1},{3456106496u,7,10},{3422552064u,7,-10},{3405774848u,8,-11},{3397386240u,9,-12},{3395289088u,11,13},{3394764800u,13,15},{3394240512u,13,-14},{3393716224u,13,14},{3393191936u,13,-15},{3388997632u,10,-13},{3372220416u,8,11},{3355443200u,8,12},{3288334336u,6,-9},{3221225472u,6,9},{2952790016u,4,-2},{2684354560u,4,2},{2415919104u,4,3},{2147483648u,4,-3},{2013265920u,5,-7},{1879048192u,5,7},{1610612736u,4,-4},{1342177280u,4,4},{1207959552u,5,-8},{1073741824u,5,8},{805306368u,4,5},{536870912u,4,-5},{0u,3,0},},
72}; 72};
73static const HuffmanTyp mpc_table_HuffQ7 [2] [63] ICONST_ATTR = { 73static const HuffmanTyp mpc_table_HuffQ7 [2] [63] ICONST_ATTR = {
74 {{4227858432u,6,7},{4160749568u,6,8},{4093640704u,6,9},{4026531840u,6,-8},{3959422976u,6,11},{3925868544u,7,21},{3909091328u,8,-28},{3892314112u,8,28},{3825205248u,6,-9},{3791650816u,7,-22},{3758096384u,7,-21},{3690987520u,6,-10},{3623878656u,6,-11},{3556769792u,6,10},{3489660928u,6,12},{3422552064u,6,-13},{3388997632u,7,22},{3355443200u,7,23},{3288334336u,6,-12},{3221225472u,6,13},{3154116608u,6,14},{3087007744u,6,-14},{3053453312u,7,-23},{3036676096u,8,-29},{3019898880u,8,29},{2952790016u,6,-15},{2885681152u,6,15},{2818572288u,6,16},{2751463424u,6,-16},{2717908992u,7,-24},{2684354560u,7,24},{2617245696u,6,17},{2583691264u,7,-25},{2566914048u,8,-30},{2550136832u,8,30},{2483027968u,6,-17},{2415919104u,6,18},{2348810240u,6,-18},{2315255808u,7,25},{2281701376u,7,26},{2214592512u,6,19},{2181038080u,7,-26},{2147483648u,7,-27},{2013265920u,5,2},{1946157056u,6,-19},{1879048192u,6,20},{1744830464u,5,-1},{1728053248u,8,-31},{1711276032u,8,31},{1677721600u,7,27},{1610612736u,6,-20},{1476395008u,5,1},{1342177280u,5,-5},{1207959552u,5,-3},{1073741824u,5,3},{939524096u,5,0},{805306368u,5,-2},{671088640u,5,-4},{536870912u,5,4},{402653184u,5,5},{268435456u,5,-6},{134217728u,5,6},{0u,5,-7},}, 74 {{4227858432u,6,7},{4160749568u,6,8},{4093640704u,6,9},{4026531840u,6,-8},{3959422976u,6,11},{3925868544u,7,21},{3909091328u,8,-28},{3892314112u,8,28},{3825205248u,6,-9},{3791650816u,7,-22},{3758096384u,7,-21},{3690987520u,6,-10},{3623878656u,6,-11},{3556769792u,6,10},{3489660928u,6,12},{3422552064u,6,-13},{3388997632u,7,22},{3355443200u,7,23},{3288334336u,6,-12},{3221225472u,6,13},{3154116608u,6,14},{3087007744u,6,-14},{3053453312u,7,-23},{3036676096u,8,-29},{3019898880u,8,29},{2952790016u,6,-15},{2885681152u,6,15},{2818572288u,6,16},{2751463424u,6,-16},{2717908992u,7,-24},{2684354560u,7,24},{2617245696u,6,17},{2583691264u,7,-25},{2566914048u,8,-30},{2550136832u,8,30},{2483027968u,6,-17},{2415919104u,6,18},{2348810240u,6,-18},{2315255808u,7,25},{2281701376u,7,26},{2214592512u,6,19},{2181038080u,7,-26},{2147483648u,7,-27},{2013265920u,5,2},{1946157056u,6,-19},{1879048192u,6,20},{1744830464u,5,-1},{1728053248u,8,-31},{1711276032u,8,31},{1677721600u,7,27},{1610612736u,6,-20},{1476395008u,5,1},{1342177280u,5,-5},{1207959552u,5,-3},{1073741824u,5,3},{939524096u,5,0},{805306368u,5,-2},{671088640u,5,-4},{536870912u,5,4},{402653184u,5,5},{268435456u,5,-6},{134217728u,5,6},{0u,5,-7},},
75 {{4160749568u,5,-1},{4026531840u,5,2},{3892314112u,5,-2},{3758096384u,5,3},{3741319168u,8,-20},{3737124864u,10,24},{3736862720u,14,28},{3736600576u,14,-28},{3736338432u,14,-30},{3736076288u,14,30},{3735027712u,12,-27},{3734765568u,14,29},{3734503424u,14,-29},{3734241280u,14,31},{3733979136u,14,-31},{3732930560u,12,27},{3724541952u,9,-22},{3690987520u,7,-17},{3623878656u,6,-11},{3489660928u,5,-3},{3355443200u,5,4},{3221225472u,5,-4},{3187671040u,7,17},{3170893824u,8,20},{3162505216u,9,22},{3158310912u,10,-25},{3154116608u,10,-26},{3087007744u,6,12},{2952790016u,5,5},{2818572288u,5,-5},{2684354560u,5,6},{2550136832u,5,-6},{2483027968u,6,-12},{2449473536u,7,-18},{2415919104u,7,18},{2348810240u,6,13},{2281701376u,6,-13},{2147483648u,5,-7},{2080374784u,6,14},{2063597568u,8,21},{2046820352u,8,-21},{2013265920u,7,-19},{1879048192u,5,7},{1744830464u,5,8},{1677721600u,6,-14},{1610612736u,6,-15},{1476395008u,5,-8},{1409286144u,6,15},{1375731712u,7,19},{1371537408u,10,25},{1367343104u,10,26},{1358954496u,9,-23},{1350565888u,9,23},{1342177280u,9,-24},{1207959552u,5,-9},{1073741824u,5,9},{1006632960u,6,16},{939524096u,6,-16},{805306368u,5,10},{536870912u,4,0},{402653184u,5,-10},{268435456u,5,11},{0u,4,1},}, 75 {{4160749568u,5,-1},{4026531840u,5,2},{3892314112u,5,-2},{3758096384u,5,3},{3741319168u,8,-20},{3737124864u,10,24},{3736862720u,14,28},{3736600576u,14,-28},{3736338432u,14,-30},{3736076288u,14,30},{3735027712u,12,-27},{3734765568u,14,29},{3734503424u,14,-29},{3734241280u,14,31},{3733979136u,14,-31},{3732930560u,12,27},{3724541952u,9,-22},{3690987520u,7,-17},{3623878656u,6,-11},{3489660928u,5,-3},{3355443200u,5,4},{3221225472u,5,-4},{3187671040u,7,17},{3170893824u,8,20},{3162505216u,9,22},{3158310912u,10,-25},{3154116608u,10,-26},{3087007744u,6,12},{2952790016u,5,5},{2818572288u,5,-5},{2684354560u,5,6},{2550136832u,5,-6},{2483027968u,6,-12},{2449473536u,7,-18},{2415919104u,7,18},{2348810240u,6,13},{2281701376u,6,-13},{2147483648u,5,-7},{2080374784u,6,14},{2063597568u,8,21},{2046820352u,8,-21},{2013265920u,7,-19},{1879048192u,5,7},{1744830464u,5,8},{1677721600u,6,-14},{1610612736u,6,-15},{1476395008u,5,-8},{1409286144u,6,15},{1375731712u,7,19},{1371537408u,10,25},{1367343104u,10,26},{1358954496u,9,-23},{1350565888u,9,23},{1342177280u,9,-24},{1207959552u,5,-9},{1073741824u,5,9},{1006632960u,6,16},{939524096u,6,-16},{805306368u,5,10},{536870912u,4,0},{402653184u,5,-10},{268435456u,5,11},{0u,4,1},},
76}; 76};
77 77
78const HuffmanTyp* mpc_table_HuffQ [2] [8] = { 78const HuffmanTyp* mpc_table_HuffQ [2] [8] = {
79 {0,mpc_table_HuffQ1[0],mpc_table_HuffQ2[0],mpc_table_HuffQ3[0],mpc_table_HuffQ4[0],mpc_table_HuffQ5[0],mpc_table_HuffQ6[0],mpc_table_HuffQ7[0]}, 79 {0,mpc_table_HuffQ1[0],mpc_table_HuffQ2[0],mpc_table_HuffQ3[0],mpc_table_HuffQ4[0],mpc_table_HuffQ5[0],mpc_table_HuffQ6[0],mpc_table_HuffQ7[0]},
80 {0,mpc_table_HuffQ1[1],mpc_table_HuffQ2[1],mpc_table_HuffQ3[1],mpc_table_HuffQ4[1],mpc_table_HuffQ5[1],mpc_table_HuffQ6[1],mpc_table_HuffQ7[1]}, 80 {0,mpc_table_HuffQ1[1],mpc_table_HuffQ2[1],mpc_table_HuffQ3[1],mpc_table_HuffQ4[1],mpc_table_HuffQ5[1],mpc_table_HuffQ6[1],mpc_table_HuffQ7[1]},
81}; 81};
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index a5a24d6c8a..f3aff7e54b 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -87,7 +87,8 @@ mpc_uint8_t LUT5_0 [1<< 6];
87mpc_uint8_t LUT5_1 [1<< 8]; // 320 Bytes 87mpc_uint8_t LUT5_1 [1<< 8]; // 320 Bytes
88mpc_uint8_t LUT6_0 [1<< 7]; 88mpc_uint8_t LUT6_0 [1<< 7];
89mpc_uint8_t LUT6_1 [1<< 7]; // 256 Bytes 89mpc_uint8_t LUT6_1 [1<< 7]; // 256 Bytes
90mpc_uint8_t LUT7_0 [1<< 8];mpc_uint8_t LUT7_1 [1<< 8]; // 512 Bytes 90mpc_uint8_t LUT7_0 [1<< 8];
91mpc_uint8_t LUT7_1 [1<< 8]; // 512 Bytes
91mpc_uint8_t LUTDSCF [1<< 6]; // 64 Bytes = 2976 Bytes 92mpc_uint8_t LUTDSCF [1<< 6]; // 64 Bytes = 2976 Bytes
92 93
93//------------------------------------------------------------------------------ 94//------------------------------------------------------------------------------
@@ -95,9 +96,6 @@ mpc_uint8_t LUTDSCF [1<< 6]; // 64 Bytes = 2976 Bytes
95//------------------------------------------------------------------------------ 96//------------------------------------------------------------------------------
96enum 97enum
97 { 98 {
98 EQ_TAP = 13, // length of FIR filter for EQ
99 DELAY = ((EQ_TAP + 1) / 2), // delay of FIR
100 FIR_BANDS = 4, // number of subbands to be FIR filtered
101 MEMSIZE = MPC_DECODER_MEMSIZE, // overall buffer size 99 MEMSIZE = MPC_DECODER_MEMSIZE, // overall buffer size
102 MEMSIZE2 = (MEMSIZE/2), // size of one buffer 100 MEMSIZE2 = (MEMSIZE/2), // size of one buffer
103 MEMMASK = (MEMSIZE-1) 101 MEMMASK = (MEMSIZE-1)
@@ -226,6 +224,7 @@ mpc_decoder_make_huffman_lookup(
226 return; 224 return;
227} 225}
228 226
227#ifdef MPC_SUPPORT_SV456
229// decode SCFI-bundle (sv4,5,6) 228// decode SCFI-bundle (sv4,5,6)
230static void 229static void
231mpc_decoder_scfi_bundle_read( 230mpc_decoder_scfi_bundle_read(
@@ -273,6 +272,7 @@ mpc_decoder_huffman_decode(mpc_decoder *d, const HuffmanTyp *Table)
273 272
274 return Table->Value; 273 return Table->Value;
275} 274}
275#endif
276 276
277// faster huffman through previewing less bits 277// faster huffman through previewing less bits
278// works with maximum lengths up to 10 278// works with maximum lengths up to 10
@@ -391,28 +391,26 @@ mpc_decoder_reset_globals(mpc_decoder *d)
391{ 391{
392 mpc_decoder_reset_bitstream_decode(d); 392 mpc_decoder_reset_bitstream_decode(d);
393 393
394 d->DecodedFrames = 0; 394 d->DecodedFrames = 0;
395 d->SeekTableIndex = 0; 395 d->SeekTableIndex = 0;
396 d->MaxDecodedFrames = 0; 396 d->MaxDecodedFrames = 0;
397 d->StreamVersion = 0; 397 d->StreamVersion = 0;
398 d->MS_used = 0; 398 d->MS_used = 0;
399 399
400 memset(d->Y_L , 0, sizeof Y_L ); 400 memset(d->Y_L , 0, sizeof Y_L );
401 memset(d->Y_R , 0, sizeof Y_R ); 401 memset(d->Y_R , 0, sizeof Y_R );
402 memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L ); 402 memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L);
403 memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R ); 403 memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R);
404 memset(d->Res_L , 0, sizeof d->Res_L ); 404 memset(d->Res_L , 0, sizeof d->Res_L );
405 memset(d->Res_R , 0, sizeof d->Res_R ); 405 memset(d->Res_R , 0, sizeof d->Res_R );
406 memset(d->SCFI_L , 0, sizeof d->SCFI_L ); 406 memset(d->SCFI_L , 0, sizeof d->SCFI_L );
407 memset(d->SCFI_R , 0, sizeof d->SCFI_R ); 407 memset(d->SCFI_R , 0, sizeof d->SCFI_R );
408#ifdef MPC_SUPPORT_SV456 408#ifdef MPC_SUPPORT_SV456
409 memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L ); 409 memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L);
410 memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R ); 410 memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R);
411#endif 411#endif
412 //memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L ); 412 memset(d->Q , 0, sizeof d->Q );
413 //memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R ); 413 memset(d->MS_Flag , 0, sizeof d->MS_Flag );
414 memset(d->Q , 0, sizeof d->Q );
415 memset(d->MS_Flag , 0, sizeof d->MS_Flag );
416} 414}
417 415
418mpc_uint32_t 416mpc_uint32_t
@@ -856,7 +854,6 @@ mpc_decoder_read_bitstream_sv6(mpc_decoder *d)
856 /*********** DSCF ************/ 854 /*********** DSCF ************/
857 if (d->DSCF_Flag_L[n]==1) 855 if (d->DSCF_Flag_L[n]==1)
858 { 856 {
859 //L[2] = d->DSCF_Reference_L[n];
860 switch (d->SCFI_L[n]) 857 switch (d->SCFI_L[n])
861 { 858 {
862 case 3: 859 case 3:
@@ -914,12 +911,9 @@ mpc_decoder_read_bitstream_sv6(mpc_decoder *d)
914 break; 911 break;
915 } 912 }
916 } 913 }
917 // update Reference for DSCF
918 //d->DSCF_Reference_L[n] = L[2];
919 } 914 }
920 if (*ResR) 915 if (*ResR)
921 { 916 {
922 //R[2] = d->DSCF_Reference_R[n];
923 /*********** DSCF ************/ 917 /*********** DSCF ************/
924 if (d->DSCF_Flag_R[n]==1) 918 if (d->DSCF_Flag_R[n]==1)
925 { 919 {
@@ -1086,7 +1080,6 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d, mpc_bool_t fastSeeking)
1086 for (n=0; n<=Max_used_Band; ++n, ++ResL, ++ResR, L+=3, R+=3) { 1080 for (n=0; n<=Max_used_Band; ++n, ++ResL, ++ResR, L+=3, R+=3) {
1087 if (*ResL) 1081 if (*ResL)
1088 { 1082 {
1089 //L[2] = d->DSCF_Reference_L[n];
1090 switch (d->SCFI_L[n]) 1083 switch (d->SCFI_L[n])
1091 { 1084 {
1092 case 1: 1085 case 1:
@@ -1663,8 +1656,6 @@ void mpc_decoder_reset_state(mpc_decoder *d) {
1663 memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L ); 1656 memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L );
1664 memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R ); 1657 memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R );
1665#endif 1658#endif
1666 //memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L );
1667 //memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R );
1668 memset(d->Q , 0, sizeof d->Q ); 1659 memset(d->Q , 0, sizeof d->Q );
1669 memset(d->MS_Flag , 0, sizeof d->MS_Flag ); 1660 memset(d->MS_Flag , 0, sizeof d->MS_Flag );
1670 1661
diff --git a/apps/codecs/libmusepack/reader.h b/apps/codecs/libmusepack/reader.h
index 83ef589e8f..397319b292 100644
--- a/apps/codecs/libmusepack/reader.h
+++ b/apps/codecs/libmusepack/reader.h
@@ -44,19 +44,19 @@
44/// a functional reader. 44/// a functional reader.
45typedef struct mpc_reader_t { 45typedef struct mpc_reader_t {
46 /// Reads size bytes of data into buffer at ptr. 46 /// Reads size bytes of data into buffer at ptr.
47 mpc_int32_t (*read)(void *t, void *ptr, mpc_int32_t size); 47 mpc_int32_t (*read)(void *t, void *ptr, mpc_int32_t size);
48 48
49 /// Seeks to byte position offset. 49 /// Seeks to byte position offset.
50 mpc_bool_t (*seek)(void *t, mpc_int32_t offset); 50 mpc_bool_t (*seek)(void *t, mpc_int32_t offset);
51 51
52 /// Returns the current byte offset in the stream. 52 /// Returns the current byte offset in the stream.
53 mpc_int32_t (*tell)(void *t); 53 mpc_int32_t (*tell)(void *t);
54 54
55 /// Returns the total length of the source stream, in bytes. 55 /// Returns the total length of the source stream, in bytes.
56 mpc_int32_t (*get_size)(void *t); 56 mpc_int32_t (*get_size)(void *t);
57 57
58 /// True if the stream is a seekable stream. 58 /// True if the stream is a seekable stream.
59 mpc_bool_t (*canseek)(void *t); 59 mpc_bool_t (*canseek)(void *t);
60 60
61 /// Field that can be used to identify a particular instance of 61 /// Field that can be used to identify a particular instance of
62 /// reader or carry along data associated with that reader. 62 /// reader or carry along data associated with that reader.
@@ -65,7 +65,7 @@ typedef struct mpc_reader_t {
65} mpc_reader; 65} mpc_reader;
66/* No standard STDIO based reader in Rockbox 66/* No standard STDIO based reader in Rockbox
67typedef struct mpc_reader_file_t { 67typedef struct mpc_reader_file_t {
68 mpc_reader reader; 68 mpc_reader reader;
69 69
70 FILE *file; 70 FILE *file;
71 long file_size; 71 long file_size;
diff --git a/apps/codecs/libmusepack/requant.c b/apps/codecs/libmusepack/requant.c
index 6b77585d32..3282286d74 100644
--- a/apps/codecs/libmusepack/requant.c
+++ b/apps/codecs/libmusepack/requant.c
@@ -41,7 +41,7 @@
41 41
42/* C O N S T A N T S */ 42/* C O N S T A N T S */
43// bits per sample for chosen quantizer 43// bits per sample for chosen quantizer
44const mpc_uint32_t Res_bit [18] = { 44const mpc_uint32_t Res_bit [18] ICONST_ATTR = {
45 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 45 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
46}; 46};
47 47
@@ -50,7 +50,7 @@ const mpc_uint32_t Res_bit [18] = {
50 50
51#define _(X) MAKE_MPC_SAMPLE_EX(X,14) 51#define _(X) MAKE_MPC_SAMPLE_EX(X,14)
52 52
53const MPC_SAMPLE_FORMAT __Cc [1 + 18] = { 53const MPC_SAMPLE_FORMAT __Cc [1 + 18] ICONST_ATTR = {
54 _(111.285962475327f), // 32768/2/255*sqrt(3) 54 _(111.285962475327f), // 32768/2/255*sqrt(3)
55 _(65536.000000000000f), _(21845.333333333332f), _(13107.200000000001f), _(9362.285714285713f), 55 _(65536.000000000000f), _(21845.333333333332f), _(13107.200000000001f), _(9362.285714285713f),
56 _(7281.777777777777f), _(4369.066666666666f), _(2114.064516129032f), _(1040.253968253968f), 56 _(7281.777777777777f), _(4369.066666666666f), _(2114.064516129032f), _(1040.253968253968f),
@@ -63,7 +63,7 @@ const MPC_SAMPLE_FORMAT __Cc [1 + 18] = {
63 63
64// offset for requantization 64// offset for requantization
65// 2*D+1 = steps of quantizer 65// 2*D+1 = steps of quantizer
66const mpc_int32_t __Dc [1 + 18] = { 66const mpc_int32_t __Dc [1 + 18] ICONST_ATTR = {
67 2, 67 2,
68 0, 1, 2, 3, 4, 7, 15, 31, 63, 68 0, 1, 2, 3, 4, 7, 15, 31, 63,
69 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767 69 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767
@@ -72,12 +72,12 @@ const mpc_int32_t __Dc [1 + 18] = {
72#ifdef MPC_FIXED_POINT 72#ifdef MPC_FIXED_POINT
73static mpc_uint32_t find_shift(double fval) 73static mpc_uint32_t find_shift(double fval)
74{ 74{
75 mpc_int64_t val = (mpc_int64_t)fval; 75 mpc_int64_t val = (mpc_int64_t)fval;
76 mpc_uint32_t ptr = 0; 76 mpc_uint32_t ptr = 0;
77 if (val<0) val = -val; 77 if (val<0) val = -val;
78 while(val) {val>>=1;ptr++;} 78 while(val) {val>>=1;ptr++;}
79 79
80 return ptr > 31 ? 0 : 31 - ptr; 80 return ptr > 31 ? 0 : 31 - ptr;
81} 81}
82#endif 82#endif
83 83
@@ -92,22 +92,22 @@ mpc_decoder_scale_output(mpc_decoder *d, double factor)
92 double f1; 92 double f1;
93 double f2; 93 double f2;
94#ifndef MPC_FIXED_POINT 94#ifndef MPC_FIXED_POINT
95 factor *= 1.0 / (double)(1<<(MPC_FIXED_POINT_SHIFT-1)); 95 factor *= 1.0 / (double)(1<<(MPC_FIXED_POINT_SHIFT-1));
96#else 96#else
97 factor *= 1.0 / (double)(1<<(16 - MPC_FIXED_POINT_SHIFT)); 97 factor *= 1.0 / (double)(1<<(16 - MPC_FIXED_POINT_SHIFT));
98#endif 98#endif
99 f1 = f2 = factor; 99 f1 = f2 = factor;
100 100
101 // handles +1.58...-98.41 dB, where's scf[n] / scf[n-1] = 1.20050805774840750476 101 // handles +1.58...-98.41 dB, where's scf[n] / scf[n-1] = 1.20050805774840750476
102 102
103 SET_SCF(1,factor); 103 SET_SCF(1,factor);
104 104
105 f1 *= 0.83298066476582673961; 105 f1 *= 0.83298066476582673961;
106 f2 *= 1/0.83298066476582673961; 106 f2 *= 1/0.83298066476582673961;
107 107
108 for ( n = 1; n <= 128; n++ ) { 108 for ( n = 1; n <= 128; n++ ) {
109 SET_SCF((unsigned char)(1+n),f1); 109 SET_SCF((unsigned char)(1+n),f1);
110 SET_SCF((unsigned char)(1-n),f2); 110 SET_SCF((unsigned char)(1-n),f2);
111 f1 *= 0.83298066476582673961; 111 f1 *= 0.83298066476582673961;
112 f2 *= 1/0.83298066476582673961; 112 f2 *= 1/0.83298066476582673961;
113 } 113 }
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 22:43:30 +0000