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