libdca-0.0.5-constant.patch 23 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720
  1. Index: libdca-0.0.5/libdca/parse.c
  2. ===================================================================
  3. --- libdca-0.0.5.orig/libdca/parse.c
  4. +++ libdca-0.0.5/libdca/parse.c
  5. @@ -548,7 +548,7 @@ static int dca_subframe_header (dca_stat
  6. /* Scale factors */
  7. for (j = 0; j < state->prim_channels; j++)
  8. {
  9. - int *scale_table;
  10. + const int *scale_table;
  11. int scale_sum;
  12. for (k = 0; k < state->subband_activity[j]; k++)
  13. @@ -761,7 +761,7 @@ static int dca_subsubframe (dca_state_t
  14. int k, l;
  15. int subsubframe = state->current_subsubframe;
  16. - double *quant_step_table;
  17. + const double *quant_step_table;
  18. /* FIXME */
  19. double subband_samples[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8];
  20. @@ -1145,7 +1145,7 @@ static void qmf_32_subbands (dca_state_t
  21. double samples_in[32][8], sample_t *samples_out,
  22. double scale, sample_t bias)
  23. {
  24. - double *prCoeff;
  25. + const double *prCoeff;
  26. int i, j, k;
  27. double raXin[32];
  28. @@ -1236,7 +1236,7 @@ static void lfe_interpolation_fir (int n
  29. */
  30. int nDeciFactor, k, J;
  31. - double *prCoeff;
  32. + const double *prCoeff;
  33. int NumFIRCoef = 512; /* Number of FIR coefficients */
  34. int nInterpIndex = 0; /* Index to the interpolated samples */
  35. Index: libdca-0.0.5/libdca/tables_fir.h
  36. ===================================================================
  37. --- libdca-0.0.5.orig/libdca/tables_fir.h
  38. +++ libdca-0.0.5/libdca/tables_fir.h
  39. @@ -21,7 +21,7 @@
  40. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  41. */
  42. -double fir_32bands_perfect[] =
  43. +static const double fir_32bands_perfect[] =
  44. {
  45. +1.135985195E-010,
  46. -6.022448247E-007,
  47. @@ -537,7 +537,7 @@ double fir_32bands_perfect[] =
  48. -1.135985195E-010
  49. };
  50. -double fir_32bands_nonperfect[] =
  51. +static const double fir_32bands_nonperfect[] =
  52. {
  53. -1.390191784E-007,
  54. -1.693738625E-007,
  55. @@ -1053,7 +1053,7 @@ double fir_32bands_nonperfect[] =
  56. +1.390191784E-007
  57. };
  58. -double lfe_fir_64[] =
  59. +static const double lfe_fir_64[] =
  60. {
  61. 2.6584343868307770E-004,
  62. 8.1793652498163280E-005,
  63. @@ -1569,7 +1569,7 @@ double lfe_fir_64[] =
  64. 2.6584343868307770E-004
  65. };
  66. -double lfe_fir_128[] =
  67. +static const double lfe_fir_128[] =
  68. {
  69. 0.00053168571,
  70. 0.00016358691,
  71. Index: libdca-0.0.5/libdca/tables_huffman.h
  72. ===================================================================
  73. --- libdca-0.0.5.orig/libdca/tables_huffman.h
  74. +++ libdca-0.0.5/libdca/tables_huffman.h
  75. @@ -29,7 +29,7 @@ typedef struct huff_entry_s
  76. } huff_entry_t;
  77. -huff_entry_t bitalloc_a_12[] =
  78. +static const huff_entry_t bitalloc_a_12[] =
  79. {
  80. { 1, 0, 1}, { 2, 2, 2}, { 3, 6, 3}, { 4, 14, 4},
  81. { 5, 30, 5}, { 6, 62, 6}, { 8, 255, 7}, { 8, 254, 8},
  82. @@ -37,7 +37,7 @@ huff_entry_t bitalloc_a_12[] =
  83. { 0, 0, 0}
  84. };
  85. -huff_entry_t bitalloc_b_12[] =
  86. +static const huff_entry_t bitalloc_b_12[] =
  87. {
  88. { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 5, 15, 4},
  89. { 5, 12, 5}, { 6, 29, 6}, { 7, 57, 7}, { 7, 56, 8},
  90. @@ -45,7 +45,7 @@ huff_entry_t bitalloc_b_12[] =
  91. { 0, 0, 0}
  92. };
  93. -huff_entry_t bitalloc_c_12[] =
  94. +static const huff_entry_t bitalloc_c_12[] =
  95. {
  96. { 2, 0, 1}, { 3, 7, 2}, { 3, 5, 3}, { 3, 4, 4},
  97. { 3, 2, 5}, { 4, 13, 6}, { 4, 12, 7}, { 4, 6, 8},
  98. @@ -53,7 +53,7 @@ huff_entry_t bitalloc_c_12[] =
  99. { 0, 0, 0}
  100. };
  101. -huff_entry_t bitalloc_d_12[] =
  102. +static const huff_entry_t bitalloc_d_12[] =
  103. {
  104. { 2, 3, 1}, { 2, 2, 2}, { 2, 0, 3}, { 3, 2, 4},
  105. { 4, 6, 5}, { 5, 14, 6}, { 6, 30, 7}, { 7, 62, 8},
  106. @@ -61,7 +61,7 @@ huff_entry_t bitalloc_d_12[] =
  107. { 0, 0, 0}
  108. };
  109. -huff_entry_t bitalloc_e_12[] =
  110. +static const huff_entry_t bitalloc_e_12[] =
  111. {
  112. { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 4, 6, 4},
  113. { 5, 14, 5}, { 7, 63, 6}, { 7, 61, 7}, { 8, 124, 8},
  114. @@ -69,7 +69,7 @@ huff_entry_t bitalloc_e_12[] =
  115. { 0, 0, 0}
  116. };
  117. -huff_entry_t *bitalloc_12[] =
  118. +static const huff_entry_t *const bitalloc_12[] =
  119. {
  120. bitalloc_a_12,
  121. bitalloc_b_12,
  122. @@ -78,7 +78,7 @@ huff_entry_t *bitalloc_12[] =
  123. bitalloc_e_12
  124. };
  125. -huff_entry_t scales_a_129[] =
  126. +static const huff_entry_t scales_a_129[] =
  127. {
  128. { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2},
  129. { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4},
  130. @@ -115,7 +115,7 @@ huff_entry_t scales_a_129[] =
  131. {14, 15024,-64}, { 0, 0, 0}
  132. };
  133. -huff_entry_t scales_b_129[] =
  134. +static const huff_entry_t scales_b_129[] =
  135. {
  136. { 3, 3, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2},
  137. { 4, 14, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 10, 4},
  138. @@ -152,7 +152,7 @@ huff_entry_t scales_b_129[] =
  139. {15, 3936,-64}, { 0, 0, 0}
  140. };
  141. -huff_entry_t scales_c_129[] =
  142. +static const huff_entry_t scales_c_129[] =
  143. {
  144. { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2},
  145. { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4},
  146. @@ -189,7 +189,7 @@ huff_entry_t scales_c_129[] =
  147. {15, 20944,-64}, { 0, 0, 0}
  148. };
  149. -huff_entry_t scales_d_129[] =
  150. +static const huff_entry_t scales_d_129[] =
  151. {
  152. { 2, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 15, 2},
  153. { 4, 14, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 26, 4},
  154. @@ -226,7 +226,7 @@ huff_entry_t scales_d_129[] =
  155. {15, 28516,-64}, { 0, 0, 0}
  156. };
  157. -huff_entry_t scales_e_129[] =
  158. +static const huff_entry_t scales_e_129[] =
  159. {
  160. { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 7, 2},
  161. { 4, 6, -2}, { 4, 3, 3}, { 4, 2, -3}, { 5, 31, 4},
  162. @@ -263,7 +263,7 @@ huff_entry_t scales_e_129[] =
  163. {16, 57172,-64}, { 0, 0, 0}
  164. };
  165. -huff_entry_t *scales_129[] =
  166. +static const huff_entry_t *const scales_129[] =
  167. {
  168. scales_a_129,
  169. scales_b_129,
  170. @@ -272,36 +272,36 @@ huff_entry_t *scales_129[] =
  171. scales_e_129
  172. };
  173. -huff_entry_t bitalloc_a_3[] =
  174. +static const huff_entry_t bitalloc_a_3[] =
  175. {
  176. { 1, 0, 0}, { 2, 2, 1}, { 2, 3, -1}, { 0, 0, 0}
  177. };
  178. -huff_entry_t bitalloc_a_4[] =
  179. +static const huff_entry_t bitalloc_a_4[] =
  180. {
  181. { 1, 0, 0}, { 2, 2, 1}, { 3, 6, 2}, { 3, 7, 3},
  182. { 0, 0, 0}
  183. };
  184. -huff_entry_t bitalloc_b_4[] =
  185. +static const huff_entry_t bitalloc_b_4[] =
  186. {
  187. { 2, 2, 0}, { 3, 6, 1}, { 3, 7, 2}, { 1, 0, 3},
  188. { 0, 0, 0}
  189. };
  190. -huff_entry_t bitalloc_c_4[] =
  191. +static const huff_entry_t bitalloc_c_4[] =
  192. {
  193. { 3, 6, 0}, { 3, 7, 1}, { 1, 0, 2}, { 2, 2, 3},
  194. { 0, 0, 0}
  195. };
  196. -huff_entry_t bitalloc_d_4[] =
  197. +static const huff_entry_t bitalloc_d_4[] =
  198. {
  199. { 2, 0, 0}, { 2, 1, 1}, { 2, 2, 2}, { 2, 3, 3},
  200. { 0, 0, 0}
  201. };
  202. -huff_entry_t *tmode[] =
  203. +static const huff_entry_t *const tmode[] =
  204. {
  205. bitalloc_a_4,
  206. bitalloc_b_4,
  207. @@ -309,64 +309,64 @@ huff_entry_t *tmode[] =
  208. bitalloc_d_4
  209. };
  210. -huff_entry_t bitalloc_a_5[] =
  211. +static const huff_entry_t bitalloc_a_5[] =
  212. {
  213. { 1, 0, 0}, { 2, 2, 1}, { 3, 6, -1}, { 4, 14, 2},
  214. { 4, 15, -2}, { 0, 0, 0}
  215. };
  216. -huff_entry_t bitalloc_b_5[] =
  217. +static const huff_entry_t bitalloc_b_5[] =
  218. {
  219. { 2, 2, 0}, { 2, 0, 1}, { 2, 1, -1}, { 3, 6, 2},
  220. { 3, 7, -2}, { 0, 0, 0}
  221. };
  222. -huff_entry_t bitalloc_c_5[] =
  223. +static const huff_entry_t bitalloc_c_5[] =
  224. {
  225. { 1, 0, 0}, { 3, 4, 1}, { 3, 5, -1}, { 3, 6, 2},
  226. { 3, 7, -2}, { 0, 0, 0}
  227. };
  228. -huff_entry_t bitalloc_a_7[] =
  229. +static const huff_entry_t bitalloc_a_7[] =
  230. {
  231. { 1, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 4, 2},
  232. { 4, 14, -2}, { 5, 31, 3}, { 5, 30, -3}, { 0, 0, 0}
  233. };
  234. -huff_entry_t bitalloc_b_7[] =
  235. +static const huff_entry_t bitalloc_b_7[] =
  236. {
  237. { 2, 3, 0}, { 2, 1, 1}, { 2, 0, -1}, { 3, 4, 2},
  238. { 4, 11, -2}, { 5, 21, 3}, { 5, 20, -3}, { 0, 0, 0}
  239. };
  240. -huff_entry_t bitalloc_c_7[] =
  241. +static const huff_entry_t bitalloc_c_7[] =
  242. {
  243. { 2, 3, 0}, { 2, 2, 1}, { 2, 1, -1}, { 4, 3, 2},
  244. { 4, 2, -2}, { 4, 1, 3}, { 4, 0, -3}, { 0, 0, 0}
  245. };
  246. -huff_entry_t bitalloc_a_9[] =
  247. +static const huff_entry_t bitalloc_a_9[] =
  248. {
  249. { 1, 0, 0}, { 3, 7, 1}, { 3, 5, -1}, { 4, 13, 2},
  250. { 4, 9, -2}, { 4, 8, 3}, { 5, 25, -3}, { 6, 49, 4},
  251. { 6, 48, -4}, { 0, 0, 0}
  252. };
  253. -huff_entry_t bitalloc_b_9[] =
  254. +static const huff_entry_t bitalloc_b_9[] =
  255. {
  256. { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 3, 2},
  257. { 3, 2, -2}, { 5, 27, 3}, { 5, 26, -3}, { 5, 25, 4},
  258. { 5, 24, -4}, { 0, 0, 0}
  259. };
  260. -huff_entry_t bitalloc_c_9[] =
  261. +static const huff_entry_t bitalloc_c_9[] =
  262. {
  263. { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 6, 2},
  264. { 3, 2, -2}, { 4, 6, 3}, { 5, 15, -3}, { 6, 29, 4},
  265. { 6, 28, -4}, { 0, 0, 0}
  266. };
  267. -huff_entry_t bitalloc_a_13[] =
  268. +static const huff_entry_t bitalloc_a_13[] =
  269. {
  270. { 1, 0, 0}, { 3, 4, 1}, { 4, 15, -1}, { 4, 13, 2},
  271. { 4, 12, -2}, { 4, 10, 3}, { 5, 29, -3}, { 5, 22, 4},
  272. @@ -374,7 +374,7 @@ huff_entry_t bitalloc_a_13[] =
  273. { 7, 112, -6}, { 0, 0, 0}
  274. };
  275. -huff_entry_t bitalloc_b_13[] =
  276. +static const huff_entry_t bitalloc_b_13[] =
  277. {
  278. { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2},
  279. { 4, 15, -2}, { 4, 9, 3}, { 4, 7, -3}, { 4, 6, 4},
  280. @@ -382,7 +382,7 @@ huff_entry_t bitalloc_b_13[] =
  281. { 6, 56, -6}, { 0, 0, 0}
  282. };
  283. -huff_entry_t bitalloc_c_13[] =
  284. +static const huff_entry_t bitalloc_c_13[] =
  285. {
  286. { 3, 5, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 2, 2},
  287. { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 12, 4},
  288. @@ -390,7 +390,7 @@ huff_entry_t bitalloc_c_13[] =
  289. { 5, 4, -6}, { 0, 0, 0}
  290. };
  291. -huff_entry_t bitalloc_a_17[] =
  292. +static const huff_entry_t bitalloc_a_17[] =
  293. {
  294. { 2, 1, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 4, 2},
  295. { 3, 1, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 0, 4},
  296. @@ -399,7 +399,7 @@ huff_entry_t bitalloc_a_17[] =
  297. {12, 340, -8}, { 0, 0, 0}
  298. };
  299. -huff_entry_t bitalloc_b_17[] =
  300. +static const huff_entry_t bitalloc_b_17[] =
  301. {
  302. { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2},
  303. { 4, 15, -2}, { 4, 9, 3}, { 4, 8, -3}, { 5, 29, 4},
  304. @@ -408,7 +408,7 @@ huff_entry_t bitalloc_b_17[] =
  305. { 8, 124, -8}, { 0, 0, 0}
  306. };
  307. -huff_entry_t bitalloc_c_17[] =
  308. +static const huff_entry_t bitalloc_c_17[] =
  309. {
  310. { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 0, 2},
  311. { 4, 15, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 4, 4},
  312. @@ -417,7 +417,7 @@ huff_entry_t bitalloc_c_17[] =
  313. { 7, 44, -8}, { 0, 0, 0}
  314. };
  315. -huff_entry_t bitalloc_d_17[] =
  316. +static const huff_entry_t bitalloc_d_17[] =
  317. {
  318. { 1, 0, 0}, { 3, 7, 1}, { 3, 6, -1}, { 4, 11, 2},
  319. { 4, 10, -2}, { 5, 19, 3}, { 5, 18, -3}, { 6, 35, 4},
  320. @@ -426,7 +426,7 @@ huff_entry_t bitalloc_d_17[] =
  321. { 9, 256, -8}, { 0, 0, 0}
  322. };
  323. -huff_entry_t bitalloc_e_17[] =
  324. +static const huff_entry_t bitalloc_e_17[] =
  325. {
  326. { 1, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 12, 2},
  327. { 5, 31, -2}, { 5, 28, 3}, { 5, 27, -3}, { 6, 60, 4},
  328. @@ -435,7 +435,7 @@ huff_entry_t bitalloc_e_17[] =
  329. { 8, 232, -8}, { 0, 0, 0}
  330. };
  331. -huff_entry_t bitalloc_f_17[] =
  332. +static const huff_entry_t bitalloc_f_17[] =
  333. {
  334. { 3, 6, 0}, { 3, 5, 1}, { 3, 4, -1}, { 3, 2, 2},
  335. { 3, 1, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 6, 4},
  336. @@ -444,7 +444,7 @@ huff_entry_t bitalloc_f_17[] =
  337. { 8, 4, -8}, { 0, 0, 0}
  338. };
  339. -huff_entry_t bitalloc_g_17[] =
  340. +static const huff_entry_t bitalloc_g_17[] =
  341. {
  342. { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2},
  343. { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 14, 4},
  344. @@ -453,7 +453,7 @@ huff_entry_t bitalloc_g_17[] =
  345. { 8, 96, -8}, { 0, 0, 0}
  346. };
  347. -huff_entry_t bitalloc_a_25[] =
  348. +static const huff_entry_t bitalloc_a_25[] =
  349. {
  350. { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 1, 2},
  351. { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 5, 4},
  352. @@ -464,7 +464,7 @@ huff_entry_t bitalloc_a_25[] =
  353. {14, 10324,-12}, { 0, 0, 0}
  354. };
  355. -huff_entry_t bitalloc_b_25[] =
  356. +static const huff_entry_t bitalloc_b_25[] =
  357. {
  358. { 3, 5, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2},
  359. { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4},
  360. @@ -475,7 +475,7 @@ huff_entry_t bitalloc_b_25[] =
  361. { 9, 28,-12}, { 0, 0, 0}
  362. };
  363. -huff_entry_t bitalloc_c_25[] =
  364. +static const huff_entry_t bitalloc_c_25[] =
  365. {
  366. { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 12, 2},
  367. { 4, 11, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4},
  368. @@ -486,7 +486,7 @@ huff_entry_t bitalloc_c_25[] =
  369. { 8, 76,-12}, { 0, 0, 0}
  370. };
  371. -huff_entry_t bitalloc_d_25[] =
  372. +static const huff_entry_t bitalloc_d_25[] =
  373. {
  374. { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2},
  375. { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 13, 4},
  376. @@ -497,7 +497,7 @@ huff_entry_t bitalloc_d_25[] =
  377. {12, 1920,-12}, { 0, 0, 0}
  378. };
  379. -huff_entry_t bitalloc_e_25[] =
  380. +static const huff_entry_t bitalloc_e_25[] =
  381. {
  382. { 2, 3, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 11, 2},
  383. { 4, 10, -2}, { 4, 1, 3}, { 4, 0, -3}, { 5, 17, 4},
  384. @@ -508,7 +508,7 @@ huff_entry_t bitalloc_e_25[] =
  385. { 8, 60,-12}, { 0, 0, 0}
  386. };
  387. -huff_entry_t bitalloc_f_25[] =
  388. +static const huff_entry_t bitalloc_f_25[] =
  389. {
  390. { 3, 1, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 14, 2},
  391. { 4, 13, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 8, 4},
  392. @@ -519,7 +519,7 @@ huff_entry_t bitalloc_f_25[] =
  393. {10, 804,-12}, { 0, 0, 0}
  394. };
  395. -huff_entry_t bitalloc_g_25[] =
  396. +static const huff_entry_t bitalloc_g_25[] =
  397. {
  398. { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2},
  399. { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4},
  400. @@ -530,7 +530,7 @@ huff_entry_t bitalloc_g_25[] =
  401. {10, 936,-12}, { 0, 0, 0}
  402. };
  403. -huff_entry_t bitalloc_a_33[] =
  404. +static const huff_entry_t bitalloc_a_33[] =
  405. {
  406. { 3, 2, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 14, 2},
  407. { 4, 13, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 9, 4},
  408. @@ -543,7 +543,7 @@ huff_entry_t bitalloc_a_33[] =
  409. {13, 5504,-16}, { 0, 0, 0}
  410. };
  411. -huff_entry_t bitalloc_b_33[] =
  412. +static const huff_entry_t bitalloc_b_33[] =
  413. {
  414. { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 11, 2},
  415. { 4, 10, -2}, { 4, 8, 3}, { 4, 7, -3}, { 4, 4, 4},
  416. @@ -556,7 +556,7 @@ huff_entry_t bitalloc_b_33[] =
  417. {10, 780,-16}, { 0, 0, 0}
  418. };
  419. -huff_entry_t bitalloc_c_33[] =
  420. +static const huff_entry_t bitalloc_c_33[] =
  421. {
  422. { 4, 13, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2},
  423. { 4, 7, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 2, 4},
  424. @@ -569,7 +569,7 @@ huff_entry_t bitalloc_c_33[] =
  425. { 9, 204,-16}, { 0, 0, 0}
  426. };
  427. -huff_entry_t bitalloc_d_33[] =
  428. +static const huff_entry_t bitalloc_d_33[] =
  429. {
  430. { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2},
  431. { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4},
  432. @@ -582,7 +582,7 @@ huff_entry_t bitalloc_d_33[] =
  433. {14, 15096,-16}, { 0, 0, 0}
  434. };
  435. -huff_entry_t bitalloc_e_33[] =
  436. +static const huff_entry_t bitalloc_e_33[] =
  437. {
  438. { 2, 2, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 12, 2},
  439. { 4, 7, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 27, 4},
  440. @@ -595,7 +595,7 @@ huff_entry_t bitalloc_e_33[] =
  441. { 9, 456,-16}, { 0, 0, 0}
  442. };
  443. -huff_entry_t bitalloc_f_33[] =
  444. +static const huff_entry_t bitalloc_f_33[] =
  445. {
  446. { 4, 13, 0}, { 4, 12, 1}, { 4, 11, -1}, { 4, 9, 2},
  447. { 4, 8, -2}, { 4, 7, 3}, { 4, 6, -3}, { 4, 4, 4},
  448. @@ -608,7 +608,7 @@ huff_entry_t bitalloc_f_33[] =
  449. {11, 1828,-16}, { 0, 0, 0}
  450. };
  451. -huff_entry_t bitalloc_g_33[] =
  452. +static const huff_entry_t bitalloc_g_33[] =
  453. {
  454. { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2},
  455. { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4},
  456. @@ -621,7 +621,7 @@ huff_entry_t bitalloc_g_33[] =
  457. {10, 644,-16}, { 0, 0, 0}
  458. };
  459. -huff_entry_t bitalloc_a_65[] =
  460. +static const huff_entry_t bitalloc_a_65[] =
  461. {
  462. { 4, 6, 0}, { 4, 5, 1}, { 4, 4, -1}, { 4, 2, 2},
  463. { 4, 1, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 29, 4},
  464. @@ -642,7 +642,7 @@ huff_entry_t bitalloc_a_65[] =
  465. {16, 40540,-32}, { 0, 0, 0}
  466. };
  467. -huff_entry_t bitalloc_b_65[] =
  468. +static const huff_entry_t bitalloc_b_65[] =
  469. {
  470. { 4, 4, 0}, { 4, 2, 1}, { 4, 1, -1}, { 5, 30, 2},
  471. { 5, 29, -2}, { 5, 26, 3}, { 5, 25, -3}, { 5, 23, 4},
  472. @@ -663,7 +663,7 @@ huff_entry_t bitalloc_b_65[] =
  473. {12, 2700,-32}, { 0, 0, 0}
  474. };
  475. -huff_entry_t bitalloc_c_65[] =
  476. +static const huff_entry_t bitalloc_c_65[] =
  477. {
  478. { 5, 28, 0}, { 5, 25, 1}, { 5, 24, -1}, { 5, 23, 2},
  479. { 5, 22, -2}, { 5, 19, 3}, { 5, 18, -3}, { 5, 16, 4},
  480. @@ -684,7 +684,7 @@ huff_entry_t bitalloc_c_65[] =
  481. {11, 1116,-32}, { 0, 0, 0}
  482. };
  483. -huff_entry_t bitalloc_d_65[] =
  484. +static const huff_entry_t bitalloc_d_65[] =
  485. {
  486. { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2},
  487. { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4},
  488. @@ -705,7 +705,7 @@ huff_entry_t bitalloc_d_65[] =
  489. {15, 28848,-32}, { 0, 0, 0}
  490. };
  491. -huff_entry_t bitalloc_e_65[] =
  492. +static const huff_entry_t bitalloc_e_65[] =
  493. {
  494. { 3, 4, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 7, 2},
  495. { 4, 6, -2}, { 5, 29, 3}, { 5, 28, -3}, { 5, 23, 4},
  496. @@ -726,7 +726,7 @@ huff_entry_t bitalloc_e_65[] =
  497. {10, 812,-32}, { 0, 0, 0}
  498. };
  499. -huff_entry_t bitalloc_f_65[] =
  500. +static const huff_entry_t bitalloc_f_65[] =
  501. {
  502. { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2},
  503. { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4},
  504. @@ -747,7 +747,7 @@ huff_entry_t bitalloc_f_65[] =
  505. {14, 4064,-32}, { 0, 0, 0}
  506. };
  507. -huff_entry_t bitalloc_g_65[] =
  508. +static const huff_entry_t bitalloc_g_65[] =
  509. {
  510. { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2},
  511. { 4, 6, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 0, 4},
  512. @@ -768,7 +768,7 @@ huff_entry_t bitalloc_g_65[] =
  513. {11, 268,-32}, { 0, 0, 0}
  514. };
  515. -huff_entry_t bitalloc_a_129[] =
  516. +static const huff_entry_t bitalloc_a_129[] =
  517. {
  518. { 4, 8, 0}, { 4, 10, 1}, { 4, 9, -1}, { 4, 0, 2},
  519. { 5, 31, -2}, { 5, 24, 3}, { 5, 23, -3}, { 5, 12, 4},
  520. @@ -805,7 +805,7 @@ huff_entry_t bitalloc_a_129[] =
  521. {11, 1632,-64}, { 0, 0, 0}
  522. };
  523. -huff_entry_t bitalloc_b_129[] =
  524. +static const huff_entry_t bitalloc_b_129[] =
  525. {
  526. { 5, 10, 0}, { 5, 7, 1}, { 5, 6, -1}, { 5, 4, 2},
  527. { 5, 3, -2}, { 5, 0, 3}, { 6, 63, -3}, { 6, 60, 4},
  528. @@ -842,7 +842,7 @@ huff_entry_t bitalloc_b_129[] =
  529. {14, 10716,-64}, { 0, 0, 0}
  530. };
  531. -huff_entry_t bitalloc_c_129[] =
  532. +static const huff_entry_t bitalloc_c_129[] =
  533. {
  534. { 6, 58, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2},
  535. { 6, 51, -2}, { 6, 49, 3}, { 6, 48, -3}, { 6, 46, 4},
  536. @@ -879,7 +879,7 @@ huff_entry_t bitalloc_c_129[] =
  537. {13, 3676,-64}, { 0, 0, 0}
  538. };
  539. -huff_entry_t bitalloc_d_129[] =
  540. +static const huff_entry_t bitalloc_d_129[] =
  541. {
  542. { 4, 9, 0}, { 4, 6, 1}, { 4, 5, -1}, { 4, 2, 2},
  543. { 4, 1, -2}, { 5, 30, 3}, { 5, 29, -3}, { 5, 26, 4},
  544. @@ -916,7 +916,7 @@ huff_entry_t bitalloc_d_129[] =
  545. {16, 42392,-64}, { 0, 0, 0}
  546. };
  547. -huff_entry_t bitalloc_e_129[] =
  548. +static const huff_entry_t bitalloc_e_129[] =
  549. {
  550. { 5, 12, 0}, { 5, 11, 1}, { 5, 10, -1}, { 5, 9, 2},
  551. { 5, 8, -2}, { 5, 7, 3}, { 5, 6, -3}, { 5, 4, 4},
  552. @@ -953,7 +953,7 @@ huff_entry_t bitalloc_e_129[] =
  553. {16, 41276,-64}, { 0, 0, 0}
  554. };
  555. -huff_entry_t bitalloc_f_129[] =
  556. +static const huff_entry_t bitalloc_f_129[] =
  557. {
  558. { 6, 56, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2},
  559. { 6, 51, -2}, { 6, 50, 3}, { 6, 49, -3}, { 6, 48, 4},
  560. @@ -990,7 +990,7 @@ huff_entry_t bitalloc_f_129[] =
  561. {15, 30252,-64}, { 0, 0, 0}
  562. };
  563. -huff_entry_t bitalloc_g_129[] =
  564. +static const huff_entry_t bitalloc_g_129[] =
  565. {
  566. { 4, 0, 0}, { 5, 29, 1}, { 5, 28, -1}, { 5, 25, 2},
  567. { 5, 24, -2}, { 5, 21, 3}, { 5, 20, -3}, { 5, 17, 4},
  568. @@ -1027,7 +1027,7 @@ huff_entry_t bitalloc_g_129[] =
  569. {13, 7712,-64}, { 0, 0, 0}
  570. };
  571. -huff_entry_t *bitalloc_select[11][8] =
  572. +static const huff_entry_t *const bitalloc_select[11][8] =
  573. {
  574. { 0 },
  575. { bitalloc_a_3, 0 },
  576. @@ -1047,7 +1047,7 @@ huff_entry_t *bitalloc_select[11][8] =
  577. bitalloc_e_129, bitalloc_f_129, bitalloc_g_129, 0 },
  578. };
  579. -static int InverseQ( dca_state_t * state, huff_entry_t * huff )
  580. +static int InverseQ( dca_state_t * state, const huff_entry_t * huff )
  581. {
  582. int value = 0;
  583. int length = 0, j;
  584. Index: libdca-0.0.5/libdca/tables_quantization.h
  585. ===================================================================
  586. --- libdca-0.0.5.orig/libdca/tables_quantization.h
  587. +++ libdca-0.0.5/libdca/tables_quantization.h
  588. @@ -21,7 +21,7 @@
  589. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  590. */
  591. -int scale_factor_quant6[] =
  592. +static const int scale_factor_quant6[] =
  593. {
  594. 1, 2, 2, 3, 3, 4, 6, 7,
  595. 10, 12, 16, 20, 26, 34, 44, 56,
  596. @@ -33,7 +33,7 @@ int scale_factor_quant6[] =
  597. 1819701, 2344229, 3019952, 3890451, 5011872, 6456542, 8317638, 0
  598. };
  599. -int scale_factor_quant7[] =
  600. +static const int scale_factor_quant7[] =
  601. {
  602. 1, 1, 2, 2, 2, 2, 3, 3,
  603. 3, 4, 4, 5, 6, 7, 7, 8,
  604. @@ -54,7 +54,7 @@ int scale_factor_quant7[] =
  605. };
  606. /* 20bits unsigned fractional binary codes */
  607. -int lossy_quant[] =
  608. +static const int lossy_quant[] =
  609. {
  610. 0, 6710886, 4194304, 3355443, 2474639, 2097152, 1761608, 1426063,
  611. 796918, 461373, 251658, 146801, 79692, 46137, 27263, 16777,
  612. @@ -62,7 +62,7 @@ int lossy_quant[] =
  613. 84, 42, 21, 0, 0, 0, 0, 0
  614. };
  615. -double lossy_quant_d[] =
  616. +static const double lossy_quant_d[] =
  617. {
  618. 0, 1.6, 1.0, 0.8, 0.59, 0.50, 0.42, 0.34,
  619. 0.19, 0.11, 0.06, 0.035, 0.019, 0.011, 0.0065, 0.0040,
  620. @@ -71,7 +71,7 @@ double lossy_quant_d[] =
  621. };
  622. /* 20bits unsigned fractional binary codes */
  623. -int lossless_quant[] =
  624. +static const int lossless_quant[] =
  625. {
  626. 0, 4194304, 2097152, 1384120, 1048576, 696254, 524288, 348127,
  627. 262144, 131072, 65431, 33026, 16450, 8208, 4100, 2049,
  628. @@ -79,7 +79,7 @@ int lossless_quant[] =
  629. 4, 2, 1, 0, 0, 0, 0, 0
  630. };
  631. -double lossless_quant_d[] =
  632. +static const double lossless_quant_d[] =
  633. {
  634. 0, 1.0, 0.5, 0.33, 0.25, 0.166, 0.125,
  635. 0.083, 0.0625, 0.03125, 0.0156, 7.874E-3, 3.922E-3, 1.957E-3,