-
Notifications
You must be signed in to change notification settings - Fork 7
/
vorbis.patch
4734 lines (4555 loc) · 129 KB
/
vorbis.patch
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
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Index: include/vorbis/codec.h
===================================================================
--- include/vorbis/codec.h (リビジョン 7879)
+++ include/vorbis/codec.h (作業コピー)
@@ -25,6 +25,8 @@
#include <ogg/ogg.h>
+#pragma pack(push, 4)
+
typedef struct vorbis_info{
int version;
int channels;
@@ -50,6 +52,8 @@
long bitrate_lower;
long bitrate_window;
+ float global_gain;
+
void *codec_setup;
} vorbis_info;
@@ -163,6 +167,7 @@
/* Vorbis PRIMITIVES: general ***************************************/
extern void vorbis_info_init(vorbis_info *vi);
+extern void vorbis_info_set_global_gain(vorbis_info *info, float global_gain);
extern void vorbis_info_clear(vorbis_info *vi);
extern int vorbis_info_blocksize(vorbis_info *vi,int zo);
extern void vorbis_comment_init(vorbis_comment *vc);
@@ -232,6 +237,8 @@
#define OV_EBADLINK -137
#define OV_ENOSEEK -138
+#pragma pack(pop)
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Index: include/vorbis/vorbisfile.h
===================================================================
--- include/vorbis/vorbisfile.h (リビジョン 7879)
+++ include/vorbis/vorbisfile.h (作業コピー)
@@ -36,11 +36,12 @@
* the right values. For seek_func(), you *MUST* return -1 if the stream is
* unseekable
*/
+#pragma pack(push, 4)
typedef struct {
- size_t (*read_func) (void *ptr, size_t size, size_t nmemb, void *datasource);
- int (*seek_func) (void *datasource, ogg_int64_t offset, int whence);
- int (*close_func) (void *datasource);
- long (*tell_func) (void *datasource);
+ size_t (_cdecl* read_func) (void *ptr, size_t size, size_t nmemb, void *datasource);
+ int (_cdecl* seek_func) (void *datasource, ogg_int64_t offset, int whence);
+ int (_cdecl* close_func) (void *datasource);
+ long (_cdecl* tell_func) (void *datasource);
} ov_callbacks;
#define NOTOPEN 0
@@ -85,6 +86,7 @@
ov_callbacks callbacks;
} OggVorbis_File;
+#pragma pack(pop)
extern int ov_clear(OggVorbis_File *vf);
extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
@@ -131,6 +133,8 @@
int bigendianp,int word,int sgned,int *bitstream);
extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2);
+extern void ov_set_global_gain(OggVorbis_File *vf, float gain);
+
extern int ov_halfrate(OggVorbis_File *vf,int flag);
extern int ov_halfrate_p(OggVorbis_File *vf);
Index: lib/lsp.c
===================================================================
--- lib/lsp.c (リビジョン 7879)
+++ lib/lsp.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: LSP (also called LSF) conversion routines
- last mod: $Id: lsp.c,v 1.24 2002/10/16 07:44:21 xiphmont Exp $
+ last mod: $Id$
The LSP generation code is taken (with minimal modification and a
few bugfixes) from "On the Computation of the LSP Frequencies" by
@@ -294,7 +294,7 @@
}
}
-static int comp(const void *a,const void *b){
+static int _cdecl comp(const void *a,const void *b){
return (*(float *)a<*(float *)b)-(*(float *)a>*(float *)b);
}
Index: lib/floor0.c
===================================================================
--- lib/floor0.c (リビジョン 7879)
+++ lib/floor0.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.55 2003/09/05 23:17:49 giles Exp $
+ last mod: $Id$
********************************************************************/
@@ -158,6 +158,8 @@
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
vorbis_info_floor0 *info=look->vi;
int j,k;
+
+ float recip_global_gain = vb->vd->vi->global_gain != 0.0 ? 1.0 / vb->vd->vi->global_gain : 0.0;
int ampraw=oggpack_read(&vb->opb,info->ampbits);
if(ampraw>0){ /* also handles the -1 out of data case */
@@ -175,8 +177,13 @@
vector */
float *lsp=_vorbis_block_alloc(vb,sizeof(*lsp)*(look->m+b->dim+1));
- for(j=0;j<look->m;j+=b->dim)
- if(vorbis_book_decodev_set(b,lsp+j,&vb->opb,b->dim)==-1)goto eop;
+ for(j=0;j<look->m;j+=b->dim)
+ {
+ if(vorbis_book_decodev_set(b,lsp+j,&vb->opb,b->dim)==-1)goto eop;
+ /* we must apply recip of global gain because the codebook is already
+ controlled by global gain! */
+ for(k=0;k<b->dim;k++) lsp[j+k]*=recip_global_gain;
+ }
for(j=0;j<look->m;){
for(k=0;k<b->dim;k++,j++)lsp[j]+=last;
last=lsp[j-1];
Index: lib/floor1.c
===================================================================
--- lib/floor1.c (リビジョン 7879)
+++ lib/floor1.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.27 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -83,13 +83,13 @@
}
}
-static int ilog(unsigned int v){
- int ret=0;
- while(v){
- ret++;
- v>>=1;
- }
- return(ret);
+STIN int ilog(unsigned int v){
+ int r;
+ if(v & 0xffff0000) r = 16, v >>= 16; else r = 0;
+ if(v & 0xff00) r += 8, v >>= 8;
+ if(v & 0xf0) r += 4, v >>= 4;
+ v<<=1;
+ return r + ((0xffffaa50 >> v) &0x03) + 1;
}
static int ilog2(unsigned int v){
@@ -189,7 +189,7 @@
return(NULL);
}
-static int icomp(const void *a,const void *b){
+static int _cdecl icomp(const void *a,const void *b){
return(**(int **)a-**(int **)b);
}
@@ -267,20 +267,13 @@
return(look);
}
-
-static int render_point(int x0,int x1,int y0,int y1,int x){
+
+static int __inline render_point(int x0,int x1,int y0,int y1,int x){
y0&=0x7fff; /* mask off flag */
y1&=0x7fff;
{
- int dy=y1-y0;
- int adx=x1-x0;
- int ady=abs(dy);
- int err=ady*(x-x0);
-
- int off=err/adx;
- if(dy<0)return(y0-off);
- return(y0+off);
+ return (y1-y0)*(x-x0)/(x1-x0) + y0;
}
}
@@ -292,95 +285,110 @@
}
static float FLOOR1_fromdB_LOOKUP[256]={
- 1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F,
- 1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F,
- 1.7623575e-07F, 1.8768855e-07F, 1.9988561e-07F, 2.128753e-07F,
- 2.2670913e-07F, 2.4144197e-07F, 2.5713223e-07F, 2.7384213e-07F,
- 2.9163793e-07F, 3.1059021e-07F, 3.3077411e-07F, 3.5226968e-07F,
- 3.7516214e-07F, 3.9954229e-07F, 4.2550680e-07F, 4.5315863e-07F,
- 4.8260743e-07F, 5.1396998e-07F, 5.4737065e-07F, 5.8294187e-07F,
- 6.2082472e-07F, 6.6116941e-07F, 7.0413592e-07F, 7.4989464e-07F,
- 7.9862701e-07F, 8.5052630e-07F, 9.0579828e-07F, 9.6466216e-07F,
- 1.0273513e-06F, 1.0941144e-06F, 1.1652161e-06F, 1.2409384e-06F,
- 1.3215816e-06F, 1.4074654e-06F, 1.4989305e-06F, 1.5963394e-06F,
- 1.7000785e-06F, 1.8105592e-06F, 1.9282195e-06F, 2.0535261e-06F,
- 2.1869758e-06F, 2.3290978e-06F, 2.4804557e-06F, 2.6416497e-06F,
- 2.8133190e-06F, 2.9961443e-06F, 3.1908506e-06F, 3.3982101e-06F,
- 3.6190449e-06F, 3.8542308e-06F, 4.1047004e-06F, 4.3714470e-06F,
- 4.6555282e-06F, 4.9580707e-06F, 5.2802740e-06F, 5.6234160e-06F,
- 5.9888572e-06F, 6.3780469e-06F, 6.7925283e-06F, 7.2339451e-06F,
- 7.7040476e-06F, 8.2047000e-06F, 8.7378876e-06F, 9.3057248e-06F,
- 9.9104632e-06F, 1.0554501e-05F, 1.1240392e-05F, 1.1970856e-05F,
- 1.2748789e-05F, 1.3577278e-05F, 1.4459606e-05F, 1.5399272e-05F,
- 1.6400004e-05F, 1.7465768e-05F, 1.8600792e-05F, 1.9809576e-05F,
- 2.1096914e-05F, 2.2467911e-05F, 2.3928002e-05F, 2.5482978e-05F,
- 2.7139006e-05F, 2.8902651e-05F, 3.0780908e-05F, 3.2781225e-05F,
- 3.4911534e-05F, 3.7180282e-05F, 3.9596466e-05F, 4.2169667e-05F,
- 4.4910090e-05F, 4.7828601e-05F, 5.0936773e-05F, 5.4246931e-05F,
- 5.7772202e-05F, 6.1526565e-05F, 6.5524908e-05F, 6.9783085e-05F,
- 7.4317983e-05F, 7.9147585e-05F, 8.4291040e-05F, 8.9768747e-05F,
- 9.5602426e-05F, 0.00010181521F, 0.00010843174F, 0.00011547824F,
- 0.00012298267F, 0.00013097477F, 0.00013948625F, 0.00014855085F,
- 0.00015820453F, 0.00016848555F, 0.00017943469F, 0.00019109536F,
- 0.00020351382F, 0.00021673929F, 0.00023082423F, 0.00024582449F,
- 0.00026179955F, 0.00027881276F, 0.00029693158F, 0.00031622787F,
- 0.00033677814F, 0.00035866388F, 0.00038197188F, 0.00040679456F,
- 0.00043323036F, 0.00046138411F, 0.00049136745F, 0.00052329927F,
- 0.00055730621F, 0.00059352311F, 0.00063209358F, 0.00067317058F,
- 0.00071691700F, 0.00076350630F, 0.00081312324F, 0.00086596457F,
- 0.00092223983F, 0.00098217216F, 0.0010459992F, 0.0011139742F,
- 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F,
- 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F,
- 0.0019632195F, 0.0020908006F, 0.0022266726F, 0.0023713743F,
- 0.0025254795F, 0.0026895994F, 0.0028643847F, 0.0030505286F,
- 0.0032487691F, 0.0034598925F, 0.0036847358F, 0.0039241906F,
- 0.0041792066F, 0.0044507950F, 0.0047400328F, 0.0050480668F,
- 0.0053761186F, 0.0057254891F, 0.0060975636F, 0.0064938176F,
- 0.0069158225F, 0.0073652516F, 0.0078438871F, 0.0083536271F,
- 0.0088964928F, 0.009474637F, 0.010090352F, 0.010746080F,
- 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F,
- 0.014722068F, 0.015678791F, 0.016697687F, 0.017782797F,
- 0.018938423F, 0.020169149F, 0.021479854F, 0.022875735F,
- 0.024362330F, 0.025945531F, 0.027631618F, 0.029427276F,
- 0.031339626F, 0.033376252F, 0.035545228F, 0.037855157F,
- 0.040315199F, 0.042935108F, 0.045725273F, 0.048696758F,
- 0.051861348F, 0.055231591F, 0.058820850F, 0.062643361F,
- 0.066714279F, 0.071049749F, 0.075666962F, 0.080584227F,
- 0.085821044F, 0.091398179F, 0.097337747F, 0.10366330F,
- 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F,
- 0.14201813F, 0.15124727F, 0.16107617F, 0.17154380F,
- 0.18269168F, 0.19456402F, 0.20720788F, 0.22067342F,
- 0.23501402F, 0.25028656F, 0.26655159F, 0.28387361F,
- 0.30232132F, 0.32196786F, 0.34289114F, 0.36517414F,
- 0.38890521F, 0.41417847F, 0.44109412F, 0.46975890F,
- 0.50028648F, 0.53279791F, 0.56742212F, 0.60429640F,
- 0.64356699F, 0.68538959F, 0.72993007F, 0.77736504F,
- 0.82788260F, 0.88168307F, 0.9389798F, 1.F,
+ 1.0649863e-07f*32768.0f, 1.1341951e-07f*32768.0f, 1.2079015e-07f*32768.0f, 1.2863978e-07f*32768.0f,
+ 1.3699951e-07f*32768.0f, 1.4590251e-07f*32768.0f, 1.5538408e-07f*32768.0f, 1.6548181e-07f*32768.0f,
+ 1.7623575e-07f*32768.0f, 1.8768855e-07f*32768.0f, 1.9988561e-07f*32768.0f, 2.128753e-07f*32768.0f,
+ 2.2670913e-07f*32768.0f, 2.4144197e-07f*32768.0f, 2.5713223e-07f*32768.0f, 2.7384213e-07f*32768.0f,
+ 2.9163793e-07f*32768.0f, 3.1059021e-07f*32768.0f, 3.3077411e-07f*32768.0f, 3.5226968e-07f*32768.0f,
+ 3.7516214e-07f*32768.0f, 3.9954229e-07f*32768.0f, 4.2550680e-07f*32768.0f, 4.5315863e-07f*32768.0f,
+ 4.8260743e-07f*32768.0f, 5.1396998e-07f*32768.0f, 5.4737065e-07f*32768.0f, 5.8294187e-07f*32768.0f,
+ 6.2082472e-07f*32768.0f, 6.6116941e-07f*32768.0f, 7.0413592e-07f*32768.0f, 7.4989464e-07f*32768.0f,
+ 7.9862701e-07f*32768.0f, 8.5052630e-07f*32768.0f, 9.0579828e-07f*32768.0f, 9.6466216e-07f*32768.0f,
+ 1.0273513e-06f*32768.0f, 1.0941144e-06f*32768.0f, 1.1652161e-06f*32768.0f, 1.2409384e-06f*32768.0f,
+ 1.3215816e-06f*32768.0f, 1.4074654e-06f*32768.0f, 1.4989305e-06f*32768.0f, 1.5963394e-06f*32768.0f,
+ 1.7000785e-06f*32768.0f, 1.8105592e-06f*32768.0f, 1.9282195e-06f*32768.0f, 2.0535261e-06f*32768.0f,
+ 2.1869758e-06f*32768.0f, 2.3290978e-06f*32768.0f, 2.4804557e-06f*32768.0f, 2.6416497e-06f*32768.0f,
+ 2.8133190e-06f*32768.0f, 2.9961443e-06f*32768.0f, 3.1908506e-06f*32768.0f, 3.3982101e-06f*32768.0f,
+ 3.6190449e-06f*32768.0f, 3.8542308e-06f*32768.0f, 4.1047004e-06f*32768.0f, 4.3714470e-06f*32768.0f,
+ 4.6555282e-06f*32768.0f, 4.9580707e-06f*32768.0f, 5.2802740e-06f*32768.0f, 5.6234160e-06f*32768.0f,
+ 5.9888572e-06f*32768.0f, 6.3780469e-06f*32768.0f, 6.7925283e-06f*32768.0f, 7.2339451e-06f*32768.0f,
+ 7.7040476e-06f*32768.0f, 8.2047000e-06f*32768.0f, 8.7378876e-06f*32768.0f, 9.3057248e-06f*32768.0f,
+ 9.9104632e-06f*32768.0f, 1.0554501e-05f*32768.0f, 1.1240392e-05f*32768.0f, 1.1970856e-05f*32768.0f,
+ 1.2748789e-05f*32768.0f, 1.3577278e-05f*32768.0f, 1.4459606e-05f*32768.0f, 1.5399272e-05f*32768.0f,
+ 1.6400004e-05f*32768.0f, 1.7465768e-05f*32768.0f, 1.8600792e-05f*32768.0f, 1.9809576e-05f*32768.0f,
+ 2.1096914e-05f*32768.0f, 2.2467911e-05f*32768.0f, 2.3928002e-05f*32768.0f, 2.5482978e-05f*32768.0f,
+ 2.7139006e-05f*32768.0f, 2.8902651e-05f*32768.0f, 3.0780908e-05f*32768.0f, 3.2781225e-05f*32768.0f,
+ 3.4911534e-05f*32768.0f, 3.7180282e-05f*32768.0f, 3.9596466e-05f*32768.0f, 4.2169667e-05f*32768.0f,
+ 4.4910090e-05f*32768.0f, 4.7828601e-05f*32768.0f, 5.0936773e-05f*32768.0f, 5.4246931e-05f*32768.0f,
+ 5.7772202e-05f*32768.0f, 6.1526565e-05f*32768.0f, 6.5524908e-05f*32768.0f, 6.9783085e-05f*32768.0f,
+ 7.4317983e-05f*32768.0f, 7.9147585e-05f*32768.0f, 8.4291040e-05f*32768.0f, 8.9768747e-05f*32768.0f,
+ 9.5602426e-05f*32768.0f, 0.00010181521f*32768.0f, 0.00010843174f*32768.0f, 0.00011547824f*32768.0f,
+ 0.00012298267f*32768.0f, 0.00013097477f*32768.0f, 0.00013948625f*32768.0f, 0.00014855085f*32768.0f,
+ 0.00015820453f*32768.0f, 0.00016848555f*32768.0f, 0.00017943469f*32768.0f, 0.00019109536f*32768.0f,
+ 0.00020351382f*32768.0f, 0.00021673929f*32768.0f, 0.00023082423f*32768.0f, 0.00024582449f*32768.0f,
+ 0.00026179955f*32768.0f, 0.00027881276f*32768.0f, 0.00029693158f*32768.0f, 0.00031622787f*32768.0f,
+ 0.00033677814f*32768.0f, 0.00035866388f*32768.0f, 0.00038197188f*32768.0f, 0.00040679456f*32768.0f,
+ 0.00043323036f*32768.0f, 0.00046138411f*32768.0f, 0.00049136745f*32768.0f, 0.00052329927f*32768.0f,
+ 0.00055730621f*32768.0f, 0.00059352311f*32768.0f, 0.00063209358f*32768.0f, 0.00067317058f*32768.0f,
+ 0.00071691700f*32768.0f, 0.00076350630f*32768.0f, 0.00081312324f*32768.0f, 0.00086596457f*32768.0f,
+ 0.00092223983f*32768.0f, 0.00098217216f*32768.0f, 0.0010459992f*32768.0f, 0.0011139742f*32768.0f,
+ 0.0011863665f*32768.0f, 0.0012634633f*32768.0f, 0.0013455702f*32768.0f, 0.0014330129f*32768.0f,
+ 0.0015261382f*32768.0f, 0.0016253153f*32768.0f, 0.0017309374f*32768.0f, 0.0018434235f*32768.0f,
+ 0.0019632195f*32768.0f, 0.0020908006f*32768.0f, 0.0022266726f*32768.0f, 0.0023713743f*32768.0f,
+ 0.0025254795f*32768.0f, 0.0026895994f*32768.0f, 0.0028643847f*32768.0f, 0.0030505286f*32768.0f,
+ 0.0032487691f*32768.0f, 0.0034598925f*32768.0f, 0.0036847358f*32768.0f, 0.0039241906f*32768.0f,
+ 0.0041792066f*32768.0f, 0.0044507950f*32768.0f, 0.0047400328f*32768.0f, 0.0050480668f*32768.0f,
+ 0.0053761186f*32768.0f, 0.0057254891f*32768.0f, 0.0060975636f*32768.0f, 0.0064938176f*32768.0f,
+ 0.0069158225f*32768.0f, 0.0073652516f*32768.0f, 0.0078438871f*32768.0f, 0.0083536271f*32768.0f,
+ 0.0088964928f*32768.0f, 0.009474637f*32768.0f, 0.010090352f*32768.0f, 0.010746080f*32768.0f,
+ 0.011444421f*32768.0f, 0.012188144f*32768.0f, 0.012980198f*32768.0f, 0.013823725f*32768.0f,
+ 0.014722068f*32768.0f, 0.015678791f*32768.0f, 0.016697687f*32768.0f, 0.017782797f*32768.0f,
+ 0.018938423f*32768.0f, 0.020169149f*32768.0f, 0.021479854f*32768.0f, 0.022875735f*32768.0f,
+ 0.024362330f*32768.0f, 0.025945531f*32768.0f, 0.027631618f*32768.0f, 0.029427276f*32768.0f,
+ 0.031339626f*32768.0f, 0.033376252f*32768.0f, 0.035545228f*32768.0f, 0.037855157f*32768.0f,
+ 0.040315199f*32768.0f, 0.042935108f*32768.0f, 0.045725273f*32768.0f, 0.048696758f*32768.0f,
+ 0.051861348f*32768.0f, 0.055231591f*32768.0f, 0.058820850f*32768.0f, 0.062643361f*32768.0f,
+ 0.066714279f*32768.0f, 0.071049749f*32768.0f, 0.075666962f*32768.0f, 0.080584227f*32768.0f,
+ 0.085821044f*32768.0f, 0.091398179f*32768.0f, 0.097337747f*32768.0f, 0.10366330f*32768.0f,
+ 0.11039993f*32768.0f, 0.11757434f*32768.0f, 0.12521498f*32768.0f, 0.13335215f*32768.0f,
+ 0.14201813f*32768.0f, 0.15124727f*32768.0f, 0.16107617f*32768.0f, 0.17154380f*32768.0f,
+ 0.18269168f*32768.0f, 0.19456402f*32768.0f, 0.20720788f*32768.0f, 0.22067342f*32768.0f,
+ 0.23501402f*32768.0f, 0.25028656f*32768.0f, 0.26655159f*32768.0f, 0.28387361f*32768.0f,
+ 0.30232132f*32768.0f, 0.32196786f*32768.0f, 0.34289114f*32768.0f, 0.36517414f*32768.0f,
+ 0.38890521f*32768.0f, 0.41417847f*32768.0f, 0.44109412f*32768.0f, 0.46975890f*32768.0f,
+ 0.50028648f*32768.0f, 0.53279791f*32768.0f, 0.56742212f*32768.0f, 0.60429640f*32768.0f,
+ 0.64356699f*32768.0f, 0.68538959f*32768.0f, 0.72993007f*32768.0f, 0.77736504f*32768.0f,
+ 0.82788260f*32768.0f, 0.88168307f*32768.0f, 0.9389798f*32768.0f, 1.f*32768.0f,
};
-static void render_line(int x0,int x1,int y0,int y1,float *d){
- int dy=y1-y0;
- int adx=x1-x0;
- int ady=abs(dy);
- int base=dy/adx;
- int sy=(dy<0?base-1:base+1);
- int x=x0;
- int y=y0;
- int err=0;
+void scale_FLOOR1_fromdB_LOOKUP(float fac)
+{
+ int i;
+ for(i = 0; i < sizeof(FLOOR1_fromdB_LOOKUP)/sizeof(FLOOR1_fromdB_LOOKUP[0]); i++)
+ FLOOR1_fromdB_LOOKUP[i] *= fac;
+}
- ady-=abs(base*adx);
- d[x]*=FLOOR1_fromdB_LOOKUP[y];
- while(++x<x1){
- err=err+ady;
- if(err>=adx){
- err-=adx;
- y+=sy;
- }else{
- y+=base;
- }
- d[x]*=FLOOR1_fromdB_LOOKUP[y];
- }
+STIN void render_line(int x0,int x1,int y0,int y1,float *d){
+ /* using fixed-point interpolation */
+
+ int step = ((y1-y0)<<22) / (x1 - x0);
+ int y = y0 << 22;
+
+ float *f0 = d + x0;
+ float *f1 = d + x1;
+
+ f1 -= 3;
+
+ while(f0<f1)
+ {
+ f0[0] *= FLOOR1_fromdB_LOOKUP[y>>22];
+ f0[1] *= FLOOR1_fromdB_LOOKUP[(y+step)>>22];
+ f0[2] *= FLOOR1_fromdB_LOOKUP[(y+step +step)>>22];
+ f0[3] *= FLOOR1_fromdB_LOOKUP[(y+step*4 -step)>>22];
+ y += step*4;
+ f0+=4;
+ }
+
+ f1 += 3;
+
+ while(f0<f1)
+ {
+ f0[0] *= FLOOR1_fromdB_LOOKUP[y>>22];
+
+ y += step;
+ f0++;
+ }
}
static void render_line0(int x0,int x1,int y0,int y1,int *d){
@@ -1003,23 +1011,25 @@
}
/* unwrap positive values and reconsitute via linear interpolation */
- for(i=2;i<look->posts;i++){
- int predicted=render_point(info->postlist[look->loneighbor[i-2]],
- info->postlist[look->hineighbor[i-2]],
- fit_value[look->loneighbor[i-2]],
- fit_value[look->hineighbor[i-2]],
- info->postlist[i]);
+ for(i=0;i<look->posts-2;i++){
+ int lo = look->loneighbor[i];
+ int hi = look->hineighbor[i];
+ int predicted=render_point(info->postlist[lo],
+ info->postlist[hi],
+ fit_value[lo],
+ fit_value[hi],
+ info->postlist[i+2]);
int hiroom=look->quant_q-predicted;
int loroom=predicted;
int room=(hiroom<loroom?hiroom:loroom)<<1;
- int val=fit_value[i];
+ int val=fit_value[i+2];
if(val){
if(val>=room){
if(hiroom>loroom){
val = val-loroom;
}else{
- val = -1-(val-hiroom);
+ val = ~(val-hiroom);
}
}else{
if(val&1){
@@ -1029,12 +1039,12 @@
}
}
- fit_value[i]=val+predicted;
- fit_value[look->loneighbor[i-2]]&=0x7fff;
- fit_value[look->hineighbor[i-2]]&=0x7fff;
+ fit_value[i+2]=val+predicted;
+ fit_value[lo]&=0x7fff;
+ fit_value[hi]&=0x7fff;
}else{
- fit_value[i]=predicted|0x8000;
+ fit_value[i+2]=predicted|0x8000;
}
}
Index: lib/psy.c
===================================================================
--- lib/psy.c (リビジョン 7879)
+++ lib/psy.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.81 2002/10/21 07:00:11 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -1015,7 +1015,7 @@
}
/* this is for per-channel noise normalization */
-static int apsort(const void *a, const void *b){
+static int _cdecl apsort(const void *a, const void *b){
float f1=fabs(**(float**)a);
float f2=fabs(**(float**)b);
return (f1<f2)-(f1>f2);
Index: lib/mapping0.c
===================================================================
--- lib/mapping0.c (リビジョン 7879)
+++ lib/mapping0.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.61 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -729,6 +729,205 @@
return(0);
}
+
+__declspec(align(16)) static int sign_extractor[] = {0x80000000, 0x80000000, 0x80000000, 0x80000000};
+extern int CPU_SSE;
+extern int CPU_3DN;
+
+
+static int channel_coupling_asm(float *pcmM, float *pcmA, int n)
+{
+_asm
+{
+ push ebx
+
+ mov eax, pcmM
+ mov ebx, pcmA
+ mov ecx, ebx
+ sub ecx, eax // ecx = pcmA - pcmM
+ mov esi, n
+ lea esi, [esi*4 + eax] // edx = limit
+
+ cmp eax, esi
+ jae exit0
+
+ push ebp
+
+ align 16
+loop0:
+ fld dword ptr [eax]
+ mov edi, [ebx] // ang
+ mov ebp, [eax] // mag
+ xor ebp, edi
+ fld dword ptr [eax]
+ and ebp, 0x80000000 // extract sign
+ sar edi, 31 // make mask
+ xor [ebx], ebp // change sign
+ mov edx, edi
+ fld dword ptr [ebx]
+ and edx, ecx
+ fsub // st= mag +- ang
+ not edi
+ and edi, ecx
+ add ebx, 2*4
+ fstp dword ptr [edi+eax]
+ fstp dword ptr [edx+eax]
+
+ fld dword ptr [eax+4]
+ mov edi, [ebx+4-2*4] // ang
+ mov ebp, [eax+4] // mag
+ xor ebp, edi
+ fld dword ptr [eax+4]
+ and ebp, 0x80000000 // extract sign
+ sar edi, 31 // make mask
+ xor [ebx+4-2*4],ebp // change sign
+ mov edx, edi
+ fld dword ptr [ebx+4-2*4]
+ and edx, ecx
+ fsub // st= mag +- ang
+ not edi
+ add eax, 2*4
+ and edi, ecx
+ cmp eax, esi
+ fstp dword ptr [edi+eax+4-2*4]
+ fstp dword ptr [edx+eax+4-2*4]
+
+ jb loop0
+
+ pop ebp
+
+exit0:
+ sub eax, pcmM
+ shr eax, 2
+ pop ebx
+
+}
+
+}
+
+static int channel_coupling_sse(float *pcmM, float *pcmA, int n)
+{
+_asm
+{
+ push ebx
+
+ mov eax, pcmM
+ mov ecx, eax
+ mov ebx, pcmA
+ mov edx, n
+ lea edx, [edx*4 + eax]
+ xorps xmm7, xmm7 // xmm7 = 0
+
+ cmp eax, edx
+ jae exit0
+
+ align 16
+loop0:
+ movaps xmm1, [ebx] // xmm1 = ang
+ movaps xmm2, xmm1
+
+ movaps xmm0, [eax]
+ add ebx, 4*4
+ cmpnleps xmm2, xmm7 // xmm2 = ang > 0
+
+ movaps xmm3, xmm0
+ movaps xmm5, xmm2
+ prefetcht0 [ebx + 16 - 4*4]
+ xorps xmm3, xmm1
+ movaps xmm6, xmm0
+ andnps xmm3, sign_extractor
+
+ xorps xmm1, xmm3 // xmm1 = +ang or -ang (sign is changed)
+ prefetcht0 [eax + 16]
+
+ andps xmm2, xmm1
+ andnps xmm5, xmm1
+ add eax, 4*4
+ addps xmm6, xmm5
+ addps xmm2, xmm0
+ movaps [eax - 4*4], xmm6
+ cmp eax, edx
+ movaps [ebx - 4*4], xmm2
+
+ jb loop0
+
+exit0:
+ sub eax, ecx
+ shr eax, 2
+ pop ebx
+
+}
+
+}
+static int channel_coupling_3dn(float *pcmM, float *pcmA, int n)
+{
+_asm
+{
+ push ebx
+
+ mov eax, pcmM
+ mov ecx, eax
+ mov ebx, pcmA
+ mov edx, n
+ lea edx, [edx*4 + eax]
+ pxor mm7, mm7 // mm7 = 0
+
+ cmp eax, edx
+ jae exit30
+
+ align 16
+loop30:
+ movq mm1, [ebx] // mm1 = ang
+ movq mm2, mm1
+ movq mm0, [eax]
+ pfcmpgt mm2, mm7 // mm2 = ang > 0
+ movq mm3, mm0
+ movq mm5, mm2
+ pxor mm3, mm1
+ movq mm6, mm0
+ pandn mm3, sign_extractor
+ pxor mm1, mm3 // mm1 = +ang or -ang (sign is changed)
+ pand mm2, mm1
+ pandn mm5, mm1
+ pfadd mm6, mm5
+ pfadd mm2, mm0
+ movq [eax], mm6
+ movq [ebx], mm2
+
+ movq mm1, [ebx+8] // mm1 = ang
+ movq mm2, mm1
+ movq mm0, [eax+8]
+ pfcmpgt mm2, mm7 // mm2 = ang > 0
+ movq mm3, mm0
+ movq mm5, mm2
+ pxor mm3, mm1
+ movq mm6, mm0
+ pandn mm3, sign_extractor
+ pxor mm1, mm3 // mm1 = +ang or -ang (sign is changed)
+ pand mm2, mm1
+ pandn mm5, mm1
+ pfadd mm6, mm5
+ pfadd mm2, mm0
+ movq [eax+8], mm6
+ movq [ebx+8], mm2
+
+ add ebx, 4*4
+ add eax, 4*4
+ cmp eax, edx
+ jb loop30
+
+exit30:
+ sub eax, ecx
+ shr eax, 2
+ pop ebx
+ femms
+}
+
+}
+
+
+
+
static int mapping0_inverse(vorbis_block *vb,vorbis_info_mapping *l){
vorbis_dsp_state *vd=vb->vd;
vorbis_info *vi=vd->vi;
@@ -790,29 +989,135 @@
float *pcmM=vb->pcm[info->coupling_mag[i]];
float *pcmA=vb->pcm[info->coupling_ang[i]];
- for(j=0;j<n/2;j++){
- float mag=pcmM[j];
- float ang=pcmA[j];
+ if(CPU_SSE)
+ {
+ int lim = n/2;
+ int j;
- if(mag>0)
- if(ang>0){
- pcmM[j]=mag;
- pcmA[j]=mag-ang;
- }else{
- pcmA[j]=mag;
- pcmM[j]=mag+ang;
+ lim -= 3;
+
+ j = channel_coupling_sse(pcmM, pcmA, lim);
+
+ lim += 3;
+
+ for(;j<lim;j++){
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag > 0 ? mag-ang : mag+ang;
+ }else{
+ pcmM[j]=mag > 0 ? mag+ang : mag-ang;
+ pcmA[j]=mag;
+ }
+ }
}
- else
- if(ang>0){
- pcmM[j]=mag;
- pcmA[j]=mag+ang;
- }else{
- pcmA[j]=mag;
- pcmM[j]=mag-ang;
+ else if(CPU_3DN)
+ {
+ int lim = n/2;
+ int j;
+
+ lim -= 3;
+
+ j = channel_coupling_3dn(pcmM, pcmA, lim);
+
+ lim += 3;
+
+ for(;j<lim;j++){
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag > 0 ? mag-ang : mag+ang;
+ }else{
+ pcmM[j]=mag > 0 ? mag+ang : mag-ang;
+ pcmA[j]=mag;
+ }
+ }
}
- }
+ else if(1)
+ {
+ int lim = n/2;
+ int j;
+
+ lim -= 3;
+
+ j = channel_coupling_asm(pcmM, pcmA, lim);
+
+ lim += 3;
+
+ for(;j<lim;j++){
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag > 0 ? mag-ang : mag+ang;
+ }else{
+ pcmM[j]=mag > 0 ? mag+ang : mag-ang;
+ pcmA[j]=mag;
+ }
+ }
+ }
+ else
+ {
+ for(j=0;j<n/2;j++){
+
+ long temp;
+ register long temp2;
+ long mag = *(long*)(pcmM + j);
+ long ang = *(long*)(pcmA + j);
+ temp = ang ^ (( mag ^ ang ) & 0x80000000);
+
+
+/*
+ ((float*) (ang & 0x80000000 ? pcmM : pcmA))[j] = pcmM[j] - *(float*)&temp;
+ ((long *) (ang & 0x80000000 ? pcmA : pcmM))[j] = mag;
+*/
+ temp2 = (ang >> 31) & ((long)pcmM ^ (long)pcmA);
+ ((float*)(temp2 ^ (long)pcmA))[j] = pcmM[j] - *(float*)&temp;
+ ((long *)(temp2 ^ (long)pcmM))[j] = mag;
+/*
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag > 0 ? mag-ang : mag+ang;
+ }else{
+ pcmM[j]=mag > 0 ? mag+ang : mag-ang;
+ pcmA[j]=mag;
+*/
+ }
+/*
+
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(mag>0)
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag-ang;
+ }else{
+ pcmM[j]=mag+ang;
+ pcmA[j]=mag;
+ }
+ else
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag+ang;
+ }else{
+ pcmM[j]=mag-ang;
+ pcmA[j]=mag;
+ }
+ }
+*/
+ }
}
-
+
/* compute and apply spectral envelope */
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
@@ -835,10 +1140,18 @@
/* export hooks */
vorbis_func_mapping mapping0_exportbundle={
- &mapping0_pack,
+#ifdef DECODE_ONLY
+ NULL,
+#else
+ &mapping0_pack,
+#endif
&mapping0_unpack,
&mapping0_free_info,
+#ifdef DECODE_ONLY
+ NULL,
+#else
&mapping0_forward,
+#endif
&mapping0_inverse
};
Index: lib/codebook.c
===================================================================
--- lib/codebook.c (リビジョン 7879)
+++ lib/codebook.c (作業コピー)
@@ -11,7 +11,7 @@
********************************************************************
function: basic codebook pack/unpack/code/decode operations
- last mod: $Id: codebook.c,v 1.39 2002/06/28 22:19:35 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -290,6 +290,33 @@
return(vorbis_book_encode(book,best,b));
}
+/* oggpack_look and oggpack_adv: copied from bitwise.c to do inline */
+STIN long oggpack_look(oggpack_buffer *b,int bits){
+ unsigned long ret;
+ unsigned long m= (bits==32)?-1:((1<<bits)-1); /*mask[bits]*/
+
+ bits+=b->endbit;
+
+ if(b->endbyte+4>=b->storage){
+ /* not the main path */
+ if(b->endbyte*8+bits>b->storage*8)return(-1);
+ }
+
+ ret = *(ogg_uint32_t*)(b->ptr) >> b->endbit;
+
+ if(bits>32 && b->endbit)
+ ret|=b->ptr[4]<<(32-b->endbit);
+
+ return(m&ret);
+}
+
+STIN void oggpack_adv(oggpack_buffer *b,int bits){
+ bits+=b->endbit;
+ b->ptr+=bits>>3;
+ b->endbyte+=bits>>3;
+ b->endbit=bits&7;
+}
+
/* the 'eliminate the decode tree' optimization actually requires the
codewords to be MSb first, not LSb. This is an annoying inelegancy
(and one of the first places where carefully thought out design
@@ -297,15 +324,43 @@
to an MSb bitpacker), but not actually the huge hit it appears to
be. The first-stage decode table catches most words so that
bitreverse is not in the main execution path. */
-
-static ogg_uint32_t bitreverse(ogg_uint32_t x){
+/*
+STIN ogg_uint32_t bitreverse(ogg_uint32_t x){
x= ((x>>16)&0x0000ffff) | ((x<<16)&0xffff0000);
x= ((x>> 8)&0x00ff00ff) | ((x<< 8)&0xff00ff00);
x= ((x>> 4)&0x0f0f0f0f) | ((x<< 4)&0xf0f0f0f0);
x= ((x>> 2)&0x33333333) | ((x<< 2)&0xcccccccc);
return((x>> 1)&0x55555555) | ((x<< 1)&0xaaaaaaaa);
}
+*/
+STIN ogg_uint32_t bitreverse(ogg_uint32_t x){
+ _asm
+ {
+ mov eax, x
+ bswap eax
+ mov edx, eax
+ shl edx, 4
+ shr eax, 4
+ and edx, 0xf0f0f0f0
+ and eax, 0x0f0f0f0f
+ or eax, edx
+ mov edx, eax
+ shl edx, 2
+ shr eax, 2
+ and edx, 0xcccccccc
+ and eax, 0x33333333
+ or eax, edx
+ mov edx, eax
+ shl edx, 1
+ shr eax, 1
+ and edx, 0xaaaaaaaa
+ and eax, 0x55555555
+ or eax, edx
+ }
+}
+
+
STIN long decode_packed_entry_number(codebook *book, oggpack_buffer *b){
int read=book->dec_maxlength;
long lo,hi;
@@ -325,12 +380,15 @@
hi=book->used_entries;
}
- lok = oggpack_look(b, read);
- while(lok<0 && read>1)
- lok = oggpack_look(b, --read);
+ do{
+ lok = oggpack_look(b, read--);
+ }while(lok<0 && read>0);
+
if(lok<0)return -1;
+ read ++;
+
/* bisect search for the codeword in the ordered list */
{
ogg_uint32_t testword=bitreverse((ogg_uint32_t)lok);
@@ -352,6 +410,7 @@
return(-1);
}
+
/* Decode side is specced and easier, because we don't need to find
matches using different criteria; we simply read and map. There are
two things we need to do 'depending':
@@ -456,6 +515,36 @@
long i,j,entry;
int chptr=0;
+if(ch == 2)
+{
+/* special optimization for ch == 2 */
+ for(i=offset/2;i<(offset+n)/2;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ {
+ int dim = book->dim;
+ const float *t = book->valuelist+entry*dim;