diff options
| -rw-r--r-- | examples/puredata/bark-example.pd | 52 | ||||
| -rw-r--r-- | examples/puredata/regression-test.pd | 4 | ||||
| -rw-r--r-- | swig/java/Makefile.am | 78 | ||||
| -rw-r--r-- | swig/python/test.py | 12 |
4 files changed, 137 insertions, 9 deletions
diff --git a/examples/puredata/bark-example.pd b/examples/puredata/bark-example.pd new file mode 100644 index 0000000..e59b232 --- /dev/null +++ b/examples/puredata/bark-example.pd @@ -0,0 +1,52 @@ +#N canvas 191 188 450 625 10; +#N canvas 0 0 450 300 graph1 0; +#X array bark 26 float 5; +#A 0 0 0 0 0 0 0 0.00450555 0 0 0 0.0906432 0 0 0.154719 0 0.0683638 +0.0384251 0.0569213 0.0220149 0.0976565 0.064886 0.067408 0.0374335 +0.000314513 4.48489e-05 0; +#X coords 0 1 25 -1 200 140 1; +#X restore 236 -233 graph; +#X obj 273 104 xtract~ spectrum 64; +#X obj 272 73 xtract~ windowed 64; +#X obj 272 136 tabsend~ mags; +#N canvas 0 0 450 300 graph2 0; +#X array mags 32 float 5; +#A 0 0.00450555 0.0906432 0.154719 0.0683638 0.0384251 0.0569213 0.0220149 +0.0423353 0.0553211 0.018837 0.046049 0.0530074 0.0144005 0.0165512 +0.0167357 0.00365258 0.000494011 0.000160456 7.35776e-05 3.51928e-05 +3.1222e-05 1.40643e-05 1.18581e-05 8.65756e-06 7.31448e-06 6.333e-06 +2.75085e-06 4.85414e-06 3.08083e-06 2.56348e-06 3.22329e-06 1.50987e-08 +; +#X coords 0 1 31 -1 200 140 1; +#X restore 16 -232 graph; +#N canvas 3 50 450 300 bark 0; +#X obj 364 19 block~ 32; +#X obj 144 160 tabsend~ bark; +#X obj 145 93 tabreceive~ mags; +#X obj 145 118 xtract~ bark_coefficients 32; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X restore 271 167 pd bark; +#N canvas 0 0 450 300 graph3 0; +#X array waveform 67 float 5; +#A 0 -0.304942 0 0.304942 0.578981 0.795978 0.938463 0.999999 0.985604 +0.910237 0.795681 0.666471 0.545664 0.451213 0.393581 0.37492 0.389832 +0.427409 0.474038 0.516335 0.543621 0.549513 0.532424 0.495019 0.442906 +0.382948 0.321642 0.2639 0.212453 0.167896 0.129229 0.094662 0.062379 +0.0310556 8.38604e-07 -0.031054 -0.0623773 -0.0946602 -0.129227 -0.167893 +-0.212451 -0.263897 -0.321639 -0.382945 -0.442903 -0.495017 -0.532422 +-0.549513 -0.543622 -0.516337 -0.474041 -0.427411 -0.389833 -0.37492 +-0.393579 -0.451209 -0.545658 -0.666465 -0.795674 -0.910232 -0.985601 +-1 -0.938469 -0.795988 -0.578994 -0.304958 -1.67721e-05 0.304926; +#X coords 0 1 66 -1 200 140 1; +#X restore 17 -56 graph; +#X obj 23 135 loadbang; +#X obj 271 47 tabosc4~ waveform; +#X obj 270 21 sig~ 2000; +#X msg 23 165 \; waveform sinesum 64 0.8 0.3 0.3 0.3 0.1 \; waveform +normalize 1; +#X connect 1 0 3 0; +#X connect 2 0 1 0; +#X connect 7 0 10 0; +#X connect 8 0 2 0; +#X connect 9 0 8 0; diff --git a/examples/puredata/regression-test.pd b/examples/puredata/regression-test.pd index c269ca0..daf8e17 100644 --- a/examples/puredata/regression-test.pd +++ b/examples/puredata/regression-test.pd @@ -1,4 +1,4 @@ -#N canvas 534 223 894 462 10; +#N canvas 520 223 894 462 10; #X obj 168 31 noise~; #X obj 168 61 xtract~ spectrum; #X obj 72 106 xtract~ irregularity_j; @@ -38,7 +38,7 @@ #X obj 257 445 xtract~ bark_coefficients; #X obj 49 437 xtract~ peak_spectrum; #X obj 486 438 xtract~ mfcc; -#X obj 28 24 block~ 512; +#X obj 28 24 block~ 1024; #X connect 0 0 1 0; #X connect 0 0 18 0; #X connect 0 0 19 0; diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am index 1daa68c..31317b7 100644 --- a/swig/java/Makefile.am +++ b/swig/java/Makefile.am @@ -1,16 +1,80 @@ + javasources = \ - xtractJNI.java \ - xtract.java \ floatArray.java \ SWIGTYPE_p_float.java \ - SWIGTYPE_p_void.java - + SWIGTYPE_p_int.java \ + SWIGTYPE_p_p_float.java \ + SWIGTYPE_p_unit_.java \ + SWIGTYPE_p_void.java \ + xtract_bool_t.java \ + xtractConstants.java \ + xtract_feature_init_.java \ + xtract_features_.java \ + xtract_feature_types_.java \ + xtract_function_descriptor_t_algo.java \ + xtract_function_descriptor_t_argv.java \ + xtract_function_descriptor_t_data.java \ + xtract_function_descriptor_t.java \ + xtract_function_descriptor_t_result.java \ + xtract_function_descriptor_t_result_scalar.java \ + xtract_function_descriptor_t_result_vector.java \ + xtract.java \ + xtractJNI.java \ + xtract_lnorm_filter_types_.java \ + xtract_mel_filter.java \ + xtract_mfcc_types_.java \ + xtract_return_codes_.java \ + xtract_spectrum_.java \ + xtract_type_t.java \ + xtract_unit_t.java \ + xtract_vector_t.java \ + xtract_window_types_.java + javaclasses = \ - xtractJNI.class \ - xtract.class \ floatArray.class \ SWIGTYPE_p_float.class \ - SWIGTYPE_p_void.class + SWIGTYPE_p_int.class \ + SWIGTYPE_p_p_float.class \ + SWIGTYPE_p_unit_.class \ + SWIGTYPE_p_void.class \ + xtract_bool_t.class \ + xtractConstants.class \ + xtract_feature_init_.class \ + xtract_features_.class \ + xtract_feature_types_.class \ + xtract_function_descriptor_t_algo.class \ + xtract_function_descriptor_t_argv.class \ + xtract_function_descriptor_t_data.class \ + xtract_function_descriptor_t.class \ + xtract_function_descriptor_t_result.class \ + xtract_function_descriptor_t_result_scalar.class \ + xtract_function_descriptor_t_result_vector.class \ + xtract.class \ + xtractJNI.class \ + xtract_lnorm_filter_types_.class \ + xtract_mel_filter.class \ + xtract_mfcc_types_.class \ + xtract_return_codes_.class \ + xtract_spectrum_.class \ + xtract_type_t.class \ + xtract_unit_t.class \ + xtract_vector_t.class \ + xtract_window_types_.class + + +#javasources = \ +# xtractJNI.java \ +# xtract.java \ +# floatArray.java \ +# SWIGTYPE_p_float.java \ +# SWIGTYPE_p_void.java + +#javaclasses = \ +# xtractJNI.class \ +# xtract.class \ +# floatArray.class \ +# SWIGTYPE_p_float.class \ +# SWIGTYPE_p_void.class MAINTAINERCLEANFILES = $(javasources) Makefile.in diff --git a/swig/python/test.py b/swig/python/test.py index f7297f8..923adb7 100644 --- a/swig/python/test.py +++ b/swig/python/test.py @@ -34,4 +34,16 @@ xtract.xtract_spectrum(a,len,argv, result) for i in range(len): print result[i] + +print 'Computing windowed subframes...' + +for i in range(0, len): + a[i] = 1.0 + +window = xtract.xtract_init_window(len / 2, xtract.XTRACT_HANN) +xtract.xtract_features_from_subframes(a, len, xtract.XTRACT_WINDOWED, window, result) + +for i in range(len): + print result[i] + print '\nFinished!\n' |