default window to tukey(0.5) instead of hann

diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h
index 180be4a..819f0e1 100644 (file)
--- a/include/FLAC/stream_encoder.h
+++ b/include/FLAC/stream_encoder.h
@@ -523,7 +523,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *enco
  *
  * Any function that is specified erroneously is silently dropped.  Up
  * to 32 functions are kept, the rest are dropped.  If the specification
- * is empty the encoder defaults to \c "hann".
+ * is empty the encoder defaults to \c "tukey(0.5)".
  *
  * When more than one function is specified, then for every subframe the
  * encoder will try each of them separately and choose the window that
@@ -532,7 +532,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *enco
  * Note that each function specified causes the encoder to occupy a
  * floating point array in which to store the window.
  *
- * \default \c "hann"
+ * \default \c "tukey(0.5)"
  * \param  encoder        An encoder instance to set.
  * \param  specification  See above.
  * \assert

diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 21ea026..2513ca9 100644 (file)
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -1168,7 +1168,8 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *en
        }
        if(encoder->protected_->num_apodizations == 0) {
                encoder->protected_->num_apodizations = 1;
-               encoder->protected_->apodizations[0].type = FLAC__APODIZATION_HANN;
+               encoder->protected_->apodizations[0].type = FLAC__APODIZATION_TUKEY;
+               encoder->protected_->apodizations[0].parameters.tukey.p = 0.5;
        }
 #ifdef WINDOW_DEBUG_OUTPUT
 {unsigned n;for(n=0;n<encoder->protected_->num_apodizations;n++)fprintf(stderr,"@@@@@@ parsed apodization[%zu]: %s\n",n,winstr[encoder->protected_->apodizations[n].type]);}
@@ -1764,7 +1765,8 @@ void set_defaults_(FLAC__StreamEncoder *encoder)
        encoder->protected_->blocksize = 1152;
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
        encoder->protected_->num_apodizations = 1;
-       encoder->protected_->apodizations[0].type = FLAC__APODIZATION_HANN;
+       encoder->protected_->apodizations[0].type = FLAC__APODIZATION_TUKEY;
+       encoder->protected_->apodizations[0].parameters.tukey.p = 0.5;
 #endif
        encoder->protected_->max_lpc_order = 0;
        encoder->protected_->qlp_coeff_precision = 0;