Update FLAC to 1.3.1

src/libFLAC/stream_encoder.c

 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ * Copyright (C) 2000-2009  Josh Coalson
+ * Copyright (C) 2011-2014  Xiph.Org Foundation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * - Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
  * - Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  *
  * - Neither the name of the Xiph.org Foundation nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
-#if defined _MSC_VER || defined __MINGW32__
-#include <io.h> /* for _setmode() */
-#include <fcntl.h> /* for _O_BINARY */
-#endif
-#if defined __CYGWIN__ || defined __EMX__
-#include <io.h> /* for setmode(), O_BINARY */
-#include <fcntl.h> /* for _O_BINARY */
-#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcpy() */
 #include <sys/types.h> /* for off_t */
-#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
-#if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */
-#define fseeko fseek
-#define ftello ftell
-#else
-#define fseeko _fseeki64
-#define ftello _ftelli64
-#endif
-#endif
+#include "share/compat.h"
 #include "FLAC/assert.h"
 #include "FLAC/stream_decoder.h"
-#include "share/alloc.h"
 #include "protected/stream_encoder.h"
 #include "private/bitwriter.h"
 #include "private/bitmath.h"
 #include "private/crc.h"
 #include "private/cpu.h"
 #include "private/fixed.h"
 #include "private/format.h"
 #include "private/lpc.h"
 #include "private/md5.h"
 #include "private/memory.h"
+#include "private/macros.h"
 #if FLAC__HAS_OGG
 #include "private/ogg_helper.h"
 #include "private/ogg_mapping.h"
 #endif
+#include "private/stream_encoder.h"
 #include "private/stream_encoder_framing.h"
 #include "private/window.h"
+#include "share/alloc.h"
+#include "share/private.h"
 
-#ifndef FLaC__INLINE
-#define FLaC__INLINE
-#endif
-
-#ifdef min
-#undef min
-#endif
-#define min(x,y) ((x)<(y)?(x):(y))
-
-#ifdef max
-#undef max
-#endif
-#define max(x,y) ((x)>(y)?(x):(y))
 
 /* Exact Rice codeword length calculation is off by default.  The simple
  * (and fast) estimation (of how many bits a residual value will be
  * encoded with) in this encoder is very good, almost always yielding
  * compression within 0.1% of exact calculation.
  */
 #undef EXACT_RICE_BITS_CALCULATION
 /* Rice parameter searching is off by default.  The simple (and fast)
  * parameter estimation in this encoder is very good, almost always
  * yielding compression within 0.1% of the optimal parameters.
  */
-#undef ENABLE_RICE_PARAMETER_SEARCH 
+#undef ENABLE_RICE_PARAMETER_SEARCH
 
 
 typedef struct {
         FLAC__int32 *data[FLAC__MAX_CHANNELS];
         unsigned size; /* of each data[] in samples */
         unsigned tail;
 } verify_input_fifo;
 
 typedef struct {
         const FLAC__byte *data;
         unsigned capacity;
-        size_t bytes;
+        unsigned bytes;
 } verify_output;
 
 typedef enum {
         ENCODER_IN_MAGIC = 0,
         ENCODER_IN_METADATA = 1,
         ENCODER_IN_AUDIO = 2
 } EncoderStateHint;
 
 static struct CompressionLevels {
         FLAC__bool do_mid_side_stereo;
         FLAC__bool loose_mid_side_stereo;
         unsigned max_lpc_order;
         unsigned qlp_coeff_precision;
         FLAC__bool do_qlp_coeff_prec_search;
         FLAC__bool do_escape_coding;
         FLAC__bool do_exhaustive_model_search;
         unsigned min_residual_partition_order;
         unsigned max_residual_partition_order;
         unsigned rice_parameter_search_dist;
+        const char *apodization;
 } compression_levels_[] = {
-        { false, false,  0, 0, false, false, false, 0, 3, 0 },
-        { true , true ,  0, 0, false, false, false, 0, 3, 0 },
-        { true , false,  0, 0, false, false, false, 0, 3, 0 },
-        { false, false,  6, 0, false, false, false, 0, 4, 0 },
-        { true , true ,  8, 0, false, false, false, 0, 4, 0 },
-        { true , false,  8, 0, false, false, false, 0, 5, 0 },
-        { true , false,  8, 0, false, false, false, 0, 6, 0 },
-        { true , false,  8, 0, false, false, true , 0, 6, 0 },
-        { true , false, 12, 0, false, false, true , 0, 6, 0 }
+        { false, false,  0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" },
+        { true , true ,  0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" },
+        { true , false,  0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" },
+        { false, false,  6, 0, false, false, false, 0, 4, 0, "tukey(5e-1)" },
+        { true , true ,  8, 0, false, false, false, 0, 4, 0, "tukey(5e-1)" },
+        { true , false,  8, 0, false, false, false, 0, 5, 0, "tukey(5e-1)" },
+        { true , false,  8, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2)" },
+        { true , false, 12, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2)" },
+        { true , false, 12, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2);punchout_tukey(3)" }
+        /* here we use locale-independent 5e-1 instead of 0.5 or 0,5 */
 };
 
 
 /***********************************************************************
  *
  * Private class method prototypes
  *
  ***********************************************************************/
 
 static void set_defaults_(FLAC__StreamEncoder *encoder);
@@ skipping 74 matching lines @@
         unsigned min_partition_order,
         unsigned max_partition_order,
         FLAC__bool do_escape_coding,
         unsigned rice_parameter_search_dist,
         FLAC__Subframe *subframe,
         FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents
 );
 #endif
 
 static unsigned evaluate_verbatim_subframe_(
-        FLAC__StreamEncoder *encoder, 
+        FLAC__StreamEncoder *encoder,
         const FLAC__int32 signal[],
         unsigned blocksize,
         unsigned subframe_bps,
         FLAC__Subframe *subframe
 );
 
 static unsigned find_best_partition_order_(
         struct FLAC__StreamEncoderPrivate *private_,
         const FLAC__int32 residual[],
         FLAC__uint64 abs_residual_partition_sums[],
@@ skipping 114 matching lines @@
         FLAC__BitWriter *frame;                           /* the current frame being worked on */
         unsigned loose_mid_side_stereo_frames;            /* rounded number of frames the encoder will use before trying both independent and mid/side frames again */
         unsigned loose_mid_side_stereo_frame_count;       /* number of frames using the current channel assignment */
         FLAC__ChannelAssignment last_channel_assignment;
         FLAC__StreamMetadata streaminfo;                  /* scratchpad for STREAMINFO as it is built */
         FLAC__StreamMetadata_SeekTable *seek_table;       /* pointer into encoder->protected_->metadata_ where the seek table is */
         unsigned current_sample_number;
         unsigned current_frame_number;
         FLAC__MD5Context md5context;
         FLAC__CPUInfo cpuinfo;
+        void (*local_precompute_partition_info_sums)(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps);
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+        unsigned (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
 #else
         unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+        unsigned (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
 #endif
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         void (*local_lpc_compute_autocorrelation)(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
         void (*local_lpc_compute_residual_from_qlp_coefficients)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
         void (*local_lpc_compute_residual_from_qlp_coefficients_64bit)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
         void (*local_lpc_compute_residual_from_qlp_coefficients_16bit)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
 #endif
         FLAC__bool use_wide_by_block;          /* use slow 64-bit versions of some functions because of the block size */
         FLAC__bool use_wide_by_partition;      /* use slow 64-bit versions of some functions because of the min partition order and blocksize */
         FLAC__bool use_wide_by_order;          /* use slow 64-bit versions of some functions because of the lpc order */
@@ skipping 86 matching lines @@
         "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE",
         "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE",
         "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER",
         "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION",
         "FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER",
         "FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE",
         "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA",
         "FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED"
 };
 
-FLAC_API const char * const FLAC__treamEncoderReadStatusString[] = {
+FLAC_API const char * const FLAC__StreamEncoderReadStatusString[] = {
         "FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE",
         "FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM",
         "FLAC__STREAM_ENCODER_READ_STATUS_ABORT",
         "FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED"
 };
 
 FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[] = {
         "FLAC__STREAM_ENCODER_WRITE_STATUS_OK",
         "FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR"
 };
@@ skipping 28 matching lines @@
  * Class constructor/destructor
  *
  */
 FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void)
 {
         FLAC__StreamEncoder *encoder;
         unsigned i;
 
         FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */
 
-        encoder = (FLAC__StreamEncoder*)calloc(1, sizeof(FLAC__StreamEncoder));
+        encoder = calloc(1, sizeof(FLAC__StreamEncoder));
         if(encoder == 0) {
                 return 0;
         }
 
-        encoder->protected_ = (FLAC__StreamEncoderProtected*)calloc(1, sizeof(FLAC__StreamEncoderProtected));
+        encoder->protected_ = calloc(1, sizeof(FLAC__StreamEncoderProtected));
         if(encoder->protected_ == 0) {
                 free(encoder);
                 return 0;
         }
 
-        encoder->private_ = (FLAC__StreamEncoderPrivate*)calloc(1, sizeof(FLAC__StreamEncoderPrivate));
+        encoder->private_ = calloc(1, sizeof(FLAC__StreamEncoderPrivate));
         if(encoder->private_ == 0) {
                 free(encoder->protected_);
                 free(encoder);
                 return 0;
         }
 
         encoder->private_->frame = FLAC__bitwriter_new();
         if(encoder->private_->frame == 0) {
                 free(encoder->private_);
                 free(encoder->protected_);
@@ skipping 37 matching lines @@
 
         encoder->protected_->state = FLAC__STREAM_ENCODER_UNINITIALIZED;
 
         return encoder;
 }
 
 FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder)
 {
         unsigned i;
 
-        FLAC__ASSERT(0 != encoder);
+        if (encoder == NULL)
+                return ;
+
         FLAC__ASSERT(0 != encoder->protected_);
         FLAC__ASSERT(0 != encoder->private_);
         FLAC__ASSERT(0 != encoder->private_->frame);
 
         encoder->private_->is_being_deleted = true;
 
         (void)FLAC__stream_encoder_finish(encoder);
 
         if(0 != encoder->private_->verify.decoder)
                 FLAC__stream_decoder_delete(encoder->private_->verify.decoder);
@@ skipping 80 matching lines @@
         if(encoder->protected_->max_lpc_order > FLAC__MAX_LPC_ORDER)
                 return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER;
 
         if(encoder->protected_->blocksize < encoder->protected_->max_lpc_order)
                 return FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER;
 
         if(encoder->protected_->qlp_coeff_precision == 0) {
                 if(encoder->protected_->bits_per_sample < 16) {
                         /* @@@ need some data about how to set this here w.r.t. blocksize and sample rate */
                         /* @@@ until then we'll make a guess */
-                        encoder->protected_->qlp_coeff_precision = max(FLAC__MIN_QLP_COEFF_PRECISION, 2 + encoder->protected_->bits_per_sample / 2);
+                        encoder->protected_->qlp_coeff_precision = flac_max(FLAC__MIN_QLP_COEFF_PRECISION, 2 + encoder->protected_->bits_per_sample / 2);
                 }
                 else if(encoder->protected_->bits_per_sample == 16) {
                         if(encoder->protected_->blocksize <= 192)
                                 encoder->protected_->qlp_coeff_precision = 7;
                         else if(encoder->protected_->blocksize <= 384)
                                 encoder->protected_->qlp_coeff_precision = 8;
                         else if(encoder->protected_->blocksize <= 576)
                                 encoder->protected_->qlp_coeff_precision = 9;
                         else if(encoder->protected_->blocksize <= 1152)
                                 encoder->protected_->qlp_coeff_precision = 10;
@@ skipping 11 matching lines @@
                                 encoder->protected_->qlp_coeff_precision = FLAC__MAX_QLP_COEFF_PRECISION-1;
                         else
                                 encoder->protected_->qlp_coeff_precision = FLAC__MAX_QLP_COEFF_PRECISION;
                 }
                 FLAC__ASSERT(encoder->protected_->qlp_coeff_precision <= FLAC__MAX_QLP_COEFF_PRECISION);
         }
         else if(encoder->protected_->qlp_coeff_precision < FLAC__MIN_QLP_COEFF_PRECISION || encoder->protected_->qlp_coeff_precision > FLAC__MAX_QLP_COEFF_PRECISION)
                 return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION;
 
         if(encoder->protected_->streamable_subset) {
-                if(
-                        encoder->protected_->blocksize != 192 &&
-                        encoder->protected_->blocksize != 576 &&
-                        encoder->protected_->blocksize != 1152 &&
-                        encoder->protected_->blocksize != 2304 &&
-                        encoder->protected_->blocksize != 4608 &&
-                        encoder->protected_->blocksize != 256 &&
-                        encoder->protected_->blocksize != 512 &&
-                        encoder->protected_->blocksize != 1024 &&
-                        encoder->protected_->blocksize != 2048 &&
-                        encoder->protected_->blocksize != 4096 &&
-                        encoder->protected_->blocksize != 8192 &&
-                        encoder->protected_->blocksize != 16384
-                )
+                if(!FLAC__format_blocksize_is_subset(encoder->protected_->blocksize, encoder->protected_->sample_rate))
                         return FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE;
                 if(!FLAC__format_sample_rate_is_subset(encoder->protected_->sample_rate))
                         return FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE;
                 if(
                         encoder->protected_->bits_per_sample != 8 &&
                         encoder->protected_->bits_per_sample != 12 &&
                         encoder->protected_->bits_per_sample != 16 &&
                         encoder->protected_->bits_per_sample != 20 &&
                         encoder->protected_->bits_per_sample != 24
                 )
@@ skipping 12 matching lines @@
         }
 
         if(encoder->protected_->max_residual_partition_order >= (1u << FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN))
                 encoder->protected_->max_residual_partition_order = (1u << FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN) - 1;
         if(encoder->protected_->min_residual_partition_order >= encoder->protected_->max_residual_partition_order)
                 encoder->protected_->min_residual_partition_order = encoder->protected_->max_residual_partition_order;
 
 #if FLAC__HAS_OGG
         /* reorder metadata if necessary to ensure that any VORBIS_COMMENT is the first, according to the mapping spec */
         if(is_ogg && 0 != encoder->protected_->metadata && encoder->protected_->num_metadata_blocks > 1) {
-                unsigned i;
-                for(i = 1; i < encoder->protected_->num_metadata_blocks; i++) {
-                        if(0 != encoder->protected_->metadata[i] && encoder->protected_->metadata[i]->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-                                FLAC__StreamMetadata *vc = encoder->protected_->metadata[i];
-                                for( ; i > 0; i--)
-                                        encoder->protected_->metadata[i] = encoder->protected_->metadata[i-1];
+                unsigned i1;
+                for(i1 = 1; i1 < encoder->protected_->num_metadata_blocks; i1++) {
+                        if(0 != encoder->protected_->metadata[i1] && encoder->protected_->metadata[i1]->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
+                                FLAC__StreamMetadata *vc = encoder->protected_->metadata[i1];
+                                for( ; i1 > 0; i1--)
+                                        encoder->protected_->metadata[i1] = encoder->protected_->metadata[i1-1];
                                 encoder->protected_->metadata[0] = vc;
                                 break;
                         }
                 }
         }
 #endif
         /* keep track of any SEEKTABLE block */
         if(0 != encoder->protected_->metadata && encoder->protected_->num_metadata_blocks > 0) {
-                unsigned i;
-                for(i = 0; i < encoder->protected_->num_metadata_blocks; i++) {
-                        if(0 != encoder->protected_->metadata[i] && encoder->protected_->metadata[i]->type == FLAC__METADATA_TYPE_SEEKTABLE) {
-                                encoder->private_->seek_table = &encoder->protected_->metadata[i]->data.seek_table;
+                unsigned i2;
+                for(i2 = 0; i2 < encoder->protected_->num_metadata_blocks; i2++) {
+                        if(0 != encoder->protected_->metadata[i2] && encoder->protected_->metadata[i2]->type == FLAC__METADATA_TYPE_SEEKTABLE) {
+                                encoder->private_->seek_table = &encoder->protected_->metadata[i2]->data.seek_table;
                                 break; /* take only the first one */
                         }
                 }
         }
 
         /* validate metadata */
         if(0 == encoder->protected_->metadata && encoder->protected_->num_metadata_blocks > 0)
                 return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA;
         metadata_has_seektable = false;
         metadata_has_vorbis_comment = false;
@@ skipping 21 matching lines @@
                 }
                 else if(m->type == FLAC__METADATA_TYPE_PICTURE) {
                         if(!FLAC__format_picture_is_legal(&m->data.picture, /*violation=*/0))
                                 return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA;
                         if(m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD) {
                                 if(metadata_picture_has_type1) /* there should only be 1 per stream */
                                         return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA;
                                 metadata_picture_has_type1 = true;
                                 /* standard icon must be 32x32 pixel PNG */
                                 if(
-                                        m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD && 
+                                        m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD &&
                                         (
                                                 (strcmp(m->data.picture.mime_type, "image/png") && strcmp(m->data.picture.mime_type, "-->")) ||
                                                 m->data.picture.width != 32 ||
                                                 m->data.picture.height != 32
                                         )
                                 )
                                         return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA;
                         }
                         else if(m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON) {
                                 if(metadata_picture_has_type2) /* there should only be 1 per stream */
@@ skipping 44 matching lines @@
         FLAC__ASSERT(encoder->protected_->blocksize <= 65535);
         encoder->private_->loose_mid_side_stereo_frames = (unsigned)FLAC__fixedpoint_trunc((((FLAC__uint64)(encoder->protected_->sample_rate) * (FLAC__uint64)(26214)) << 16) / (encoder->protected_->blocksize<<16) + FLAC__FP_ONE_HALF);
 #endif
         if(encoder->private_->loose_mid_side_stereo_frames == 0)
                 encoder->private_->loose_mid_side_stereo_frames = 1;
         encoder->private_->loose_mid_side_stereo_frame_count = 0;
         encoder->private_->current_sample_number = 0;
         encoder->private_->current_frame_number = 0;
 
         encoder->private_->use_wide_by_block = (encoder->protected_->bits_per_sample + FLAC__bitmath_ilog2(encoder->protected_->blocksize)+1 > 30);
-        encoder->private_->use_wide_by_order = (encoder->protected_->bits_per_sample + FLAC__bitmath_ilog2(max(encoder->protected_->max_lpc_order, FLAC__MAX_FIXED_ORDER))+1 > 30); /*@@@ need to use this? */
+        encoder->private_->use_wide_by_order = (encoder->protected_->bits_per_sample + FLAC__bitmath_ilog2(flac_max(encoder->protected_->max_lpc_order, FLAC__MAX_FIXED_ORDER))+1 > 30); /*@@@ need to use this? */
         encoder->private_->use_wide_by_partition = (false); /*@@@ need to set this */
 
         /*
          * get the CPU info and set the function pointers
          */
         FLAC__cpu_info(&encoder->private_->cpuinfo);
         /* first default to the non-asm routines */
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation;
 #endif
+        encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_;
         encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor;
+        encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide;
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients;
         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide;
         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients;
 #endif
         /* now override with asm where appropriate */
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
 # ifndef FLAC__NO_ASM
         if(encoder->private_->cpuinfo.use_asm) {
 #  ifdef FLAC__CPU_IA32
                 FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
 #   ifdef FLAC__HAS_NASM
-                if(encoder->private_->cpuinfo.data.ia32.sse) {
+                if(encoder->private_->cpuinfo.ia32.sse) {
                         if(encoder->protected_->max_lpc_order < 4)
                                 encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4;
                         else if(encoder->protected_->max_lpc_order < 8)
                                 encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_8;
                         else if(encoder->protected_->max_lpc_order < 12)
                                 encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12;
+                        else if(encoder->protected_->max_lpc_order < 16)
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16;
                         else
                                 encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32;
                 }
-                else if(encoder->private_->cpuinfo.data.ia32._3dnow)
-                        encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow;
                 else
                         encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32;
-                if(encoder->private_->cpuinfo.data.ia32.mmx) {
+
+                encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32; /* OPT_IA32: was really necessary for GCC < 4.9 */
+                if(encoder->private_->cpuinfo.ia32.mmx) {
                         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
                         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx;
                 }
                 else {
                         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
                         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
                 }
-                if(encoder->private_->cpuinfo.data.ia32.mmx && encoder->private_->cpuinfo.data.ia32.cmov)
+
+                if(encoder->private_->cpuinfo.ia32.mmx && encoder->private_->cpuinfo.ia32.cmov)
                         encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov;
 #   endif /* FLAC__HAS_NASM */
-#  endif /* FLAC__CPU_IA32 */
+#   ifdef FLAC__HAS_X86INTRIN
+#    if defined FLAC__SSE_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.sse) {
+                        if(encoder->protected_->max_lpc_order < 4)
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4;
+                        else if(encoder->protected_->max_lpc_order < 8)
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8;
+                        else if(encoder->protected_->max_lpc_order < 12)
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12;
+                        else if(encoder->protected_->max_lpc_order < 16)
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16;
+                        else
+                                encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation;
+                }
+#    endif
+
+#    ifdef FLAC__SSE2_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.sse2) {
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients       = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2;
+                }
+#    endif
+#    ifdef FLAC__SSE4_1_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.sse41) {
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients       = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_sse41;
+                }
+#    endif
+#    ifdef FLAC__AVX2_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.avx2) {
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients       = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2;
+                }
+#    endif
+
+#    ifdef FLAC__SSE2_SUPPORTED
+                if (encoder->private_->cpuinfo.ia32.sse2) {
+                        encoder->private_->local_fixed_compute_best_predictor      = FLAC__fixed_compute_best_predictor_intrin_sse2;
+                        encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_sse2;
+                }
+#    endif
+#    ifdef FLAC__SSSE3_SUPPORTED
+                if (encoder->private_->cpuinfo.ia32.ssse3) {
+                        encoder->private_->local_fixed_compute_best_predictor      = FLAC__fixed_compute_best_predictor_intrin_ssse3;
+                        encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_ssse3;
+                }
+#    endif
+#   endif /* FLAC__HAS_X86INTRIN */
+#  elif defined FLAC__CPU_X86_64
+                FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_X86_64);
+#   ifdef FLAC__HAS_X86INTRIN
+#    ifdef FLAC__SSE_SUPPORTED
+                if(encoder->protected_->max_lpc_order < 4)
+                        encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4;
+                else if(encoder->protected_->max_lpc_order < 8)
+                        encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8;
+                else if(encoder->protected_->max_lpc_order < 12)
+                        encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12;
+                else if(encoder->protected_->max_lpc_order < 16)
+                        encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16;
+#    endif
+
+#    ifdef FLAC__SSE2_SUPPORTED
+                encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2;
+#    endif
+#    ifdef FLAC__SSE4_1_SUPPORTED
+                if(encoder->private_->cpuinfo.x86.sse41) {
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41;
+                }
+#    endif
+#    ifdef FLAC__AVX2_SUPPORTED
+                if(encoder->private_->cpuinfo.x86.avx2) {
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients       = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2;
+                        encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2;
+                }
+#    endif
+
+#    ifdef FLAC__SSE2_SUPPORTED
+                encoder->private_->local_fixed_compute_best_predictor      = FLAC__fixed_compute_best_predictor_intrin_sse2;
+                encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_sse2;
+#    endif
+#    ifdef FLAC__SSSE3_SUPPORTED
+                if (encoder->private_->cpuinfo.x86.ssse3) {
+                        encoder->private_->local_fixed_compute_best_predictor      = FLAC__fixed_compute_best_predictor_intrin_ssse3;
+                        encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_ssse3;
+                }
+#    endif
+#   endif /* FLAC__HAS_X86INTRIN */
+#  endif /* FLAC__CPU_... */
         }
 # endif /* !FLAC__NO_ASM */
 #endif /* !FLAC__INTEGER_ONLY_LIBRARY */
+#if !defined FLAC__NO_ASM && defined FLAC__HAS_X86INTRIN
+        if(encoder->private_->cpuinfo.use_asm) {
+# if defined FLAC__CPU_IA32
+#  ifdef FLAC__SSE2_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.sse2)
+                        encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2;
+#  endif
+#  ifdef FLAC__SSSE3_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.ssse3)
+                        encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3;
+#  endif
+#  ifdef FLAC__AVX2_SUPPORTED
+                if(encoder->private_->cpuinfo.ia32.avx2)
+                        encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_avx2;
+#  endif
+# elif defined FLAC__CPU_X86_64
+#  ifdef FLAC__SSE2_SUPPORTED
+                encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2;
+#  endif
+#  ifdef FLAC__SSSE3_SUPPORTED
+                if(encoder->private_->cpuinfo.x86.ssse3)
+                        encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3;
+#  endif
+#  ifdef FLAC__AVX2_SUPPORTED
+                if(encoder->private_->cpuinfo.x86.avx2)
+                        encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_avx2;
+#  endif
+# endif /* FLAC__CPU_... */
+        }
+#endif /* !FLAC__NO_ASM && FLAC__HAS_X86INTRIN */
         /* finally override based on wide-ness if necessary */
         if(encoder->private_->use_wide_by_block) {
-                encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_wide;
+                encoder->private_->local_fixed_compute_best_predictor = encoder->private_->local_fixed_compute_best_predictor_wide;
         }
 
         /* set state to OK; from here on, errors are fatal and we'll override the state then */
         encoder->protected_->state = FLAC__STREAM_ENCODER_OK;
 
 #if FLAC__HAS_OGG
         encoder->private_->is_ogg = is_ogg;
         if(is_ogg && !FLAC__ogg_encoder_aspect_init(&encoder->protected_->ogg_encoder_aspect)) {
                 encoder->protected_->state = FLAC__STREAM_ENCODER_OGG_ERROR;
                 return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
@@ skipping 20 matching lines @@
         /*
          * Set up the verify stuff if necessary
          */
         if(encoder->protected_->verify) {
                 /*
                  * First, set up the fifo which will hold the
                  * original signal to compare against
                  */
                 encoder->private_->verify.input_fifo.size = encoder->protected_->blocksize+OVERREAD_;
                 for(i = 0; i < encoder->protected_->channels; i++) {
-                        if(0 == (encoder->private_->verify.input_fifo.data[i] = (FLAC__int32*)safe_malloc_mul_2op_(sizeof(FLAC__int32), /*times*/encoder->private_->verify.input_fifo.size))) {
+                        if(0 == (encoder->private_->verify.input_fifo.data[i] = safe_malloc_mul_2op_p(sizeof(FLAC__int32), /*times*/encoder->private_->verify.input_fifo.size))) {
                                 encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
                                 return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
                         }
                 }
                 encoder->private_->verify.input_fifo.tail = 0;
 
                 /*
                  * Now set up a stream decoder for verification
                  */
-                encoder->private_->verify.decoder = FLAC__stream_decoder_new();
                 if(0 == encoder->private_->verify.decoder) {
-                        encoder->protected_->state = FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR;
-                        return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
+                        encoder->private_->verify.decoder = FLAC__stream_decoder_new();
+                        if(0 == encoder->private_->verify.decoder) {
+                                encoder->protected_->state = FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR;
+                                return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
+                        }
                 }
 
                 if(FLAC__stream_decoder_init_stream(encoder->private_->verify.decoder, verify_read_callback_, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, /*eof_callback=*/0, verify_write_callback_, verify_metadata_callback_, verify_error_callback_, /*client_data=*/encoder) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
                         encoder->protected_->state = FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR;
                         return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
                 }
         }
         encoder->private_->verify.error_stats.absolute_sample = 0;
         encoder->private_->verify.error_stats.frame_number = 0;
         encoder->private_->verify.error_stats.channel = 0;
@@ skipping 152 matching lines @@
                 encoder,
                 read_callback,
                 write_callback,
                 seek_callback,
                 tell_callback,
                 metadata_callback,
                 client_data,
                 /*is_ogg=*/true
         );
 }
- 
+
 static FLAC__StreamEncoderInitStatus init_FILE_internal_(
         FLAC__StreamEncoder *encoder,
         FILE *file,
         FLAC__StreamEncoderProgressCallback progress_callback,
         void *client_data,
         FLAC__bool is_ogg
 )
 {
         FLAC__StreamEncoderInitStatus init_status;
 
@@ skipping 10 matching lines @@
         }
 
         /*
          * To make sure that our file does not go unclosed after an error, we
          * must assign the FILE pointer before any further error can occur in
          * this routine.
          */
         if(file == stdout)
                 file = get_binary_stdout_(); /* just to be safe */
 
+#ifdef _WIN32
+        /*
+         * Windows can suffer quite badly from disk fragmentation. This can be
+         * reduced significantly by setting the output buffer size to be 10MB.
+         */
+        setvbuf(file, NULL, _IOFBF, 10*1024*1024);
+#endif
         encoder->private_->file = file;
 
         encoder->private_->progress_callback = progress_callback;
         encoder->private_->bytes_written = 0;
         encoder->private_->samples_written = 0;
         encoder->private_->frames_written = 0;
 
         init_status = init_stream_internal_(
                 encoder,
                 encoder->private_->file == stdout? 0 : is_ogg? file_read_callback_ : 0,
@@ skipping 11 matching lines @@
 
         {
                 unsigned blocksize = FLAC__stream_encoder_get_blocksize(encoder);
 
                 FLAC__ASSERT(blocksize != 0);
                 encoder->private_->total_frames_estimate = (unsigned)((FLAC__stream_encoder_get_total_samples_estimate(encoder) + blocksize - 1) / blocksize);
         }
 
         return init_status;
 }
- 
+
 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE(
         FLAC__StreamEncoder *encoder,
         FILE *file,
         FLAC__StreamEncoderProgressCallback progress_callback,
         void *client_data
 )
 {
         return init_FILE_internal_(encoder, file, progress_callback, client_data, /*is_ogg=*/false);
 }
- 
+
 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE(
         FLAC__StreamEncoder *encoder,
         FILE *file,
         FLAC__StreamEncoderProgressCallback progress_callback,
         void *client_data
 )
 {
         return init_FILE_internal_(encoder, file, progress_callback, client_data, /*is_ogg=*/true);
 }
 
@@ skipping 10 matching lines @@
         FLAC__ASSERT(0 != encoder);
 
         /*
          * To make sure that our file does not go unclosed after an error, we
          * have to do the same entrance checks here that are later performed
          * in FLAC__stream_encoder_init_FILE() before the FILE* is assigned.
          */
         if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
                 return FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED;
 
-        file = filename? fopen(filename, "w+b") : stdout;
+        file = filename? flac_fopen(filename, "w+b") : stdout;
 
         if(file == 0) {
                 encoder->protected_->state = FLAC__STREAM_ENCODER_IO_ERROR;
                 return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
         }
 
         return init_FILE_internal_(encoder, file, progress_callback, client_data, is_ogg);
 }
 
 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file(
@@ skipping 175 matching lines @@
         FLAC__ASSERT(0 != encoder);
         FLAC__ASSERT(0 != encoder->private_);
         FLAC__ASSERT(0 != encoder->protected_);
         if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
                 return false;
         if(value >= sizeof(compression_levels_)/sizeof(compression_levels_[0]))
                 value = sizeof(compression_levels_)/sizeof(compression_levels_[0]) - 1;
         ok &= FLAC__stream_encoder_set_do_mid_side_stereo          (encoder, compression_levels_[value].do_mid_side_stereo);
         ok &= FLAC__stream_encoder_set_loose_mid_side_stereo       (encoder, compression_levels_[value].loose_mid_side_stereo);
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
-#if 0
-        /* was: */
+#if 1
         ok &= FLAC__stream_encoder_set_apodization                 (encoder, compression_levels_[value].apodization);
-        /* but it's too hard to specify the string in a locale-specific way */
 #else
+        /* equivalent to -A tukey(0.5) */
         encoder->protected_->num_apodizations = 1;
         encoder->protected_->apodizations[0].type = FLAC__APODIZATION_TUKEY;
         encoder->protected_->apodizations[0].parameters.tukey.p = 0.5;
 #endif
 #endif
         ok &= FLAC__stream_encoder_set_max_lpc_order               (encoder, compression_levels_[value].max_lpc_order);
         ok &= FLAC__stream_encoder_set_qlp_coeff_precision         (encoder, compression_levels_[value].qlp_coeff_precision);
         ok &= FLAC__stream_encoder_set_do_qlp_coeff_prec_search    (encoder, compression_levels_[value].do_qlp_coeff_prec_search);
         ok &= FLAC__stream_encoder_set_do_escape_coding            (encoder, compression_levels_[value].do_escape_coding);
         ok &= FLAC__stream_encoder_set_do_exhaustive_model_search  (encoder, compression_levels_[value].do_exhaustive_model_search);
@@ skipping 83 matching lines @@
                         encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_RECTANGLE;
                 else if(n==8  && 0 == strncmp("triangle"     , specification, n))
                         encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TRIANGLE;
                 else if(n>7   && 0 == strncmp("tukey("       , specification, 6)) {
                         FLAC__real p = (FLAC__real)strtod(specification+6, 0);
                         if (p >= 0.0 && p <= 1.0) {
                                 encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.tukey.p = p;
                                 encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY;
                         }
                 }
+                else if(n>15   && 0 == strncmp("partial_tukey("       , specification, 14)) {
+                        FLAC__int32 tukey_parts = (FLAC__int32)strtod(specification+14, 0);
+                        const char *si_1 = strchr(specification, '/');
+                        FLAC__real overlap = si_1?flac_min((FLAC__real)strtod(si_1+1, 0),0.99f):0.1f;
+                        FLAC__real overlap_units = 1.0f/(1.0f - overlap) - 1.0f;
+                        const char *si_2 = strchr((si_1?(si_1+1):specification), '/');
+                        FLAC__real tukey_p = si_2?(FLAC__real)strtod(si_2+1, 0):0.2f;
+
+                        if (tukey_parts <= 1) {
+                                encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.tukey.p = tukey_p;
+                                encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY;
+                        }else if (encoder->protected_->num_apodizations + tukey_parts < 32){
+                                FLAC__int32 m;
+                                for(m = 0; m < tukey_parts; m++){
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.p = tukey_p;
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.start = m/(tukey_parts+overlap_units);
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.end = (m+1+overlap_units)/(tukey_parts+overlap_units);
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_PARTIAL_TUKEY;
+                                }
+                        }
+                }
+                else if(n>16   && 0 == strncmp("punchout_tukey("       , specification, 15)) {
+                        FLAC__int32 tukey_parts = (FLAC__int32)strtod(specification+15, 0);
+                        const char *si_1 = strchr(specification, '/');
+                        FLAC__real overlap = si_1?flac_min((FLAC__real)strtod(si_1+1, 0),0.99f):0.2f;
+                        FLAC__real overlap_units = 1.0f/(1.0f - overlap) - 1.0f;
+                        const char *si_2 = strchr((si_1?(si_1+1):specification), '/');
+                        FLAC__real tukey_p = si_2?(FLAC__real)strtod(si_2+1, 0):0.2f;
+
+                        if (tukey_parts <= 1) {
+                                encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.tukey.p = tukey_p;
+                                encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY;
+                        }else if (encoder->protected_->num_apodizations + tukey_parts < 32){
+                                FLAC__int32 m;
+                                for(m = 0; m < tukey_parts; m++){
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.p = tukey_p;
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.start = m/(tukey_parts+overlap_units);
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.end = (m+1+overlap_units)/(tukey_parts+overlap_units);
+                                        encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_PUNCHOUT_TUKEY;
+                                }
+                        }
+                }
                 else if(n==5  && 0 == strncmp("welch"        , specification, n))
                         encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_WELCH;
                 if (encoder->protected_->num_apodizations == 32)
                         break;
                 if (s)
                         specification = s+1;
                 else
                         break;
         }
         if(encoder->protected_->num_apodizations == 0) {
@@ skipping 126 matching lines @@
         if(0 == num_blocks)
                 metadata = 0;
         /* realloc() does not do exactly what we want so... */
         if(encoder->protected_->metadata) {
                 free(encoder->protected_->metadata);
                 encoder->protected_->metadata = 0;
                 encoder->protected_->num_metadata_blocks = 0;
         }
         if(num_blocks) {
                 FLAC__StreamMetadata **m;
-                if(0 == (m = (FLAC__StreamMetadata**)safe_malloc_mul_2op_(sizeof(m[0]), /*times*/num_blocks)))
+                if(0 == (m = safe_malloc_mul_2op_p(sizeof(m[0]), /*times*/num_blocks)))
                         return false;
                 memcpy(m, metadata, sizeof(m[0]) * num_blocks);
                 encoder->protected_->metadata = m;
                 encoder->protected_->num_metadata_blocks = num_blocks;
         }
 #if FLAC__HAS_OGG
         if(!FLAC__ogg_encoder_aspect_set_num_metadata(&encoder->protected_->ogg_encoder_aspect, num_blocks))
                 return false;
 #endif
         return true;
@@ skipping 233 matching lines @@
 {
         unsigned i, j = 0, channel;
         const unsigned channels = encoder->protected_->channels, blocksize = encoder->protected_->blocksize;
 
         FLAC__ASSERT(0 != encoder);
         FLAC__ASSERT(0 != encoder->private_);
         FLAC__ASSERT(0 != encoder->protected_);
         FLAC__ASSERT(encoder->protected_->state == FLAC__STREAM_ENCODER_OK);
 
         do {
-                const unsigned n = min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j);
+                const unsigned n = flac_min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j);
 
                 if(encoder->protected_->verify)
                         append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, n);
 
                 for(channel = 0; channel < channels; channel++)
                         memcpy(&encoder->private_->integer_signal[channel][encoder->private_->current_sample_number], &buffer[channel][j], sizeof(buffer[channel][0]) * n);
 
                 if(encoder->protected_->do_mid_side_stereo) {
                         FLAC__ASSERT(channels == 2);
                         /* "i <= blocksize" to overread 1 sample; see comment in OVERREAD_ decl */
@@ skipping 42 matching lines @@
         /*
          * we have several flavors of the same basic loop, optimized for
          * different conditions:
          */
         if(encoder->protected_->do_mid_side_stereo && channels == 2) {
                 /*
                  * stereo coding: unroll channel loop
                  */
                 do {
                         if(encoder->protected_->verify)
-                                append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j));
+                                append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, flac_min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j));
 
                         /* "i <= blocksize" to overread 1 sample; see comment in OVERREAD_ decl */
                         for(i = encoder->private_->current_sample_number; i <= blocksize && j < samples; i++, j++) {
                                 encoder->private_->integer_signal[0][i] = mid = side = buffer[k++];
                                 x = buffer[k++];
                                 encoder->private_->integer_signal[1][i] = x;
                                 mid += x;
                                 side -= x;
                                 mid >>= 1; /* NOTE: not the same as 'mid = (left + right) / 2' ! */
                                 encoder->private_->integer_signal_mid_side[1][i] = side;
@@ skipping 14 matching lines @@
                                 encoder->private_->current_sample_number = 1;
                         }
                 } while(j < samples);
         }
         else {
                 /*
                  * independent channel coding: buffer each channel in inner loop
                  */
                 do {
                         if(encoder->protected_->verify)
-                                append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j));
+                                append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, flac_min(blocksize+OVERREAD_-encoder->private_->current_sample_number, samples-j));
 
                         /* "i <= blocksize" to overread 1 sample; see comment in OVERREAD_ decl */
                         for(i = encoder->private_->current_sample_number; i <= blocksize && j < samples; i++, j++) {
                                 for(channel = 0; channel < channels; channel++)
                                         encoder->private_->integer_signal[channel][i] = buffer[k++];
                         }
                         encoder->private_->current_sample_number = i;
                         /* we only process if we have a full block + 1 extra sample; final block is always handled by FLAC__stream_encoder_finish() */
                         if(i > blocksize) {
                                 if(!process_frame_(encoder, /*is_fractional_block=*/false, /*is_last_block=*/false))
@@ skipping 62 matching lines @@
         encoder->private_->write_callback = 0;
         encoder->private_->seek_callback = 0;
         encoder->private_->tell_callback = 0;
         encoder->private_->metadata_callback = 0;
         encoder->private_->progress_callback = 0;
         encoder->private_->client_data = 0;
 
 #if FLAC__HAS_OGG
         FLAC__ogg_encoder_aspect_set_defaults(&encoder->protected_->ogg_encoder_aspect);
 #endif
+
+        FLAC__stream_encoder_set_compression_level(encoder, 5);
 }
 
 void free_(FLAC__StreamEncoder *encoder)
 {
         unsigned i, channel;
 
         FLAC__ASSERT(0 != encoder);
         if(encoder->protected_->metadata) {
                 free(encoder->protected_->metadata);
                 encoder->protected_->metadata = 0;
@@ skipping 78 matching lines @@
         FLAC__ASSERT(new_blocksize > 0);
         FLAC__ASSERT(encoder->protected_->state == FLAC__STREAM_ENCODER_OK);
         FLAC__ASSERT(encoder->private_->current_sample_number == 0);
 
         /* To avoid excessive malloc'ing, we only grow the buffer; no shrinking. */
         if(new_blocksize <= encoder->private_->input_capacity)
                 return true;
 
         ok = true;
 
-        /* WATCHOUT: FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx()
-         * requires that the input arrays (in our case the integer signals)
+        /* WATCHOUT: FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx() and ..._intrin_sse2()
+         * require that the input arrays (in our case the integer signals)
          * have a buffer of up to 3 zeroes in front (at negative indices) for
          * alignment purposes; we use 4 in front to keep the data well-aligned.
          */
 
         for(i = 0; ok && i < encoder->protected_->channels; i++) {
                 ok = ok && FLAC__memory_alloc_aligned_int32_array(new_blocksize+4+OVERREAD_, &encoder->private_->integer_signal_unaligned[i], &encoder->private_->integer_signal[i]);
                 memset(encoder->private_->integer_signal[i], 0, sizeof(FLAC__int32)*4);
                 encoder->private_->integer_signal[i] += 4;
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
 #if 0 /* @@@ currently unused */
@@ skipping 76 matching lines @@
                                         break;
                                 case FLAC__APODIZATION_RECTANGLE:
                                         FLAC__window_rectangle(encoder->private_->window[i], new_blocksize);
                                         break;
                                 case FLAC__APODIZATION_TRIANGLE:
                                         FLAC__window_triangle(encoder->private_->window[i], new_blocksize);
                                         break;
                                 case FLAC__APODIZATION_TUKEY:
                                         FLAC__window_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.tukey.p);
                                         break;
+                                case FLAC__APODIZATION_PARTIAL_TUKEY:
+                                        FLAC__window_partial_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.multiple_tukey.p, encoder->protected_->apodizations[i].parameters.multiple_tukey.start, encoder->protected_->apodizations[i].parameters.multiple_tukey.end);
+                                        break;
+                                case FLAC__APODIZATION_PUNCHOUT_TUKEY:
+                                        FLAC__window_punchout_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.multiple_tukey.p, encoder->protected_->apodizations[i].parameters.multiple_tukey.start, encoder->protected_->apodizations[i].parameters.multiple_tukey.end);
+                                        break;
                                 case FLAC__APODIZATION_WELCH:
                                         FLAC__window_welch(encoder->private_->window[i], new_blocksize);
                                         break;
                                 default:
                                         FLAC__ASSERT(0);
                                         /* double protection */
                                         FLAC__window_hann(encoder->private_->window[i], new_blocksize);
                                         break;
                         }
                 }
@@ skipping 41 matching lines @@
                 FLAC__bitwriter_release_buffer(encoder->private_->frame);
                 FLAC__bitwriter_clear(encoder->private_->frame);
                 encoder->protected_->state = FLAC__STREAM_ENCODER_CLIENT_ERROR;
                 return false;
         }
 
         FLAC__bitwriter_release_buffer(encoder->private_->frame);
         FLAC__bitwriter_clear(encoder->private_->frame);
 
         if(samples > 0) {
-                encoder->private_->streaminfo.data.stream_info.min_framesize = (unsigned)min(bytes, encoder->private_->streaminfo.data.stream_info.min_framesize);
-                encoder->private_->streaminfo.data.stream_info.max_framesize = (unsigned)max(bytes, encoder->private_->streaminfo.data.stream_info.max_framesize);
+                encoder->private_->streaminfo.data.stream_info.min_framesize = flac_min(bytes, encoder->private_->streaminfo.data.stream_info.min_framesize);
+                encoder->private_->streaminfo.data.stream_info.max_framesize = flac_max(bytes, encoder->private_->streaminfo.data.stream_info.max_framesize);
         }
 
         return true;
 }
 
 FLAC__StreamEncoderWriteStatus write_frame_(FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, FLAC__bool is_last_block)
 {
         FLAC__StreamEncoderWriteStatus status;
         FLAC__uint64 output_position = 0;
 
+#if FLAC__HAS_OGG == 0
+        (void)is_last_block;
+#endif
+
         /* FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED just means we didn't get the offset; no error */
         if(encoder->private_->tell_callback && encoder->private_->tell_callback(encoder, &output_position, encoder->private_->client_data) == FLAC__STREAM_ENCODER_TELL_STATUS_ERROR) {
                 encoder->protected_->state = FLAC__STREAM_ENCODER_CLIENT_ERROR;
                 return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
         }
 
         /*
          * Watch for the STREAMINFO block and first SEEKTABLE block to go by and store their offsets.
          */
         if(samples == 0) {
@@ skipping 56 matching lines @@
 #endif
         status = encoder->private_->write_callback(encoder, buffer, bytes, samples, encoder->private_->current_frame_number, encoder->private_->client_data);
 
         if(status == FLAC__STREAM_ENCODER_WRITE_STATUS_OK) {
                 encoder->private_->bytes_written += bytes;
                 encoder->private_->samples_written += samples;
                 /* we keep a high watermark on the number of frames written because
                  * when the encoder goes back to write metadata, 'current_frame'
                  * will drop back to 0.
                  */
-                encoder->private_->frames_written = max(encoder->private_->frames_written, encoder->private_->current_frame_number+1);
+                encoder->private_->frames_written = flac_max(encoder->private_->frames_written, encoder->private_->current_frame_number+1);
         }
         else
                 encoder->protected_->state = FLAC__STREAM_ENCODER_CLIENT_ERROR;
 
         return status;
 }
 
 /* Gets called when the encoding process has finished so that we can update the STREAMINFO and SEEKTABLE blocks.  */
 void update_metadata_(const FLAC__StreamEncoder *encoder)
 {
-        FLAC__byte b[max(6, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH)];
+        FLAC__byte b[flac_max(6u, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH)];
         const FLAC__StreamMetadata *metadata = &encoder->private_->streaminfo;
         const FLAC__uint64 samples = metadata->data.stream_info.total_samples;
         const unsigned min_framesize = metadata->data.stream_info.min_framesize;
         const unsigned max_framesize = metadata->data.stream_info.max_framesize;
         const unsigned bps = metadata->data.stream_info.bits_per_sample;
         FLAC__StreamEncoderSeekStatus seek_status;
 
         FLAC__ASSERT(metadata->type == FLAC__METADATA_TYPE_STREAMINFO);
 
         /* All this is based on intimate knowledge of the stream header
@@ skipping 144 matching lines @@
 {
         /* the # of bytes in the 1st packet that precede the STREAMINFO */
         static const unsigned FIRST_OGG_PACKET_STREAMINFO_PREFIX_LENGTH =
                 FLAC__OGG_MAPPING_PACKET_TYPE_LENGTH +
                 FLAC__OGG_MAPPING_MAGIC_LENGTH +
                 FLAC__OGG_MAPPING_VERSION_MAJOR_LENGTH +
                 FLAC__OGG_MAPPING_VERSION_MINOR_LENGTH +
                 FLAC__OGG_MAPPING_NUM_HEADERS_LENGTH +
                 FLAC__STREAM_SYNC_LENGTH
         ;
-        FLAC__byte b[max(6, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH)];
+        FLAC__byte b[flac_max(6u, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH)];
         const FLAC__StreamMetadata *metadata = &encoder->private_->streaminfo;
         const FLAC__uint64 samples = metadata->data.stream_info.total_samples;
         const unsigned min_framesize = metadata->data.stream_info.min_framesize;
         const unsigned max_framesize = metadata->data.stream_info.max_framesize;
         ogg_page page;
 
         FLAC__ASSERT(metadata->type == FLAC__METADATA_TYPE_STREAMINFO);
         FLAC__ASSERT(0 != encoder->private_->seek_callback);
 
         /* Pre-check that client supports seeking, since we don't want the
@@ skipping 230 matching lines @@
         FLAC__bool do_independent, do_mid_side;
 
         /*
          * Calculate the min,max Rice partition orders
          */
         if(is_fractional_block) {
                 max_partition_order = 0;
         }
         else {
                 max_partition_order = FLAC__format_get_max_rice_partition_order_from_blocksize(encoder->protected_->blocksize);
-                max_partition_order = min(max_partition_order, encoder->protected_->max_residual_partition_order);
+                max_partition_order = flac_min(max_partition_order, encoder->protected_->max_residual_partition_order);
         }
-        min_partition_order = min(min_partition_order, max_partition_order);
+        min_partition_order = flac_min(min_partition_order, max_partition_order);
 
         /*
          * Setup the frame
          */
         frame_header.blocksize = encoder->protected_->blocksize;
         frame_header.sample_rate = encoder->protected_->sample_rate;
         frame_header.channels = encoder->protected_->channels;
         frame_header.channel_assignment = FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT; /* the default unless the encoder determines otherwise */
         frame_header.bits_per_sample = encoder->protected_->bits_per_sample;
         frame_header.number_type = FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER;
@@ skipping 228 matching lines @@
         unsigned *best_bits
 )
 {
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         FLAC__float fixed_residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1];
 #else
         FLAC__fixedpoint fixed_residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1];
 #endif
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
         FLAC__double lpc_residual_bits_per_sample;
-        FLAC__real autoc[FLAC__MAX_LPC_ORDER+1]; /* WATCHOUT: the size is important even though encoder->protected_->max_lpc_order might be less; some asm routines need all the space */
+        FLAC__real autoc[FLAC__MAX_LPC_ORDER+1]; /* WATCHOUT: the size is important even though encoder->protected_->max_lpc_order might be less; some asm and x86 intrinsic routines need all the space */
         FLAC__double lpc_error[FLAC__MAX_LPC_ORDER];
         unsigned min_lpc_order, max_lpc_order, lpc_order;
         unsigned min_qlp_coeff_precision, max_qlp_coeff_precision, qlp_coeff_precision;
 #endif
         unsigned min_fixed_order, max_fixed_order, guess_fixed_order, fixed_order;
         unsigned rice_parameter;
         unsigned _candidate_bits, _best_bits;
         unsigned _best_subframe;
         /* only use RICE2 partitions if stream bps > 16 */
         const unsigned rice_parameter_limit = FLAC__stream_encoder_get_bits_per_sample(encoder) > 16? FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER : FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER;
@@ skipping 132 matching lines @@
                                                                 rice_parameter = (lpc_residual_bits_per_sample > 0.0)? (unsigned)(lpc_residual_bits_per_sample+0.5) : 0; /* 0.5 is for rounding */
                                                                 rice_parameter++; /* to account for the signed->unsigned conversion during rice coding */
                                                                 if(rice_parameter >= rice_parameter_limit) {
 #ifdef DEBUG_VERBOSE
                                                                         fprintf(stderr, "clipping rice_parameter (%u -> %u) @1\n", rice_parameter, rice_parameter_limit - 1);
 #endif
                                                                         rice_parameter = rice_parameter_limit - 1;
                                                                 }
                                                                 if(encoder->protected_->do_qlp_coeff_prec_search) {
                                                                         min_qlp_coeff_precision = FLAC__MIN_QLP_COEFF_PRECISION;
-                                                                        /* try to ensure a 32-bit datapath throughout for 16bps(+1bps for side channel) or less */
-                                                                        if(subframe_bps <= 17) {
-                                                                                max_qlp_coeff_precision = min(32 - subframe_bps - lpc_order, FLAC__MAX_QLP_COEFF_PRECISION);
-                                                                                max_qlp_coeff_precision = max(max_qlp_coeff_precision, min_qlp_coeff_precision);
+                                                                        /* try to keep qlp coeff precision such that only 32-bit math is required for decode of <=16bps streams */
+                                                                        if(subframe_bps <= 16) {
+                                                                                max_qlp_coeff_precision = flac_min(32 - subframe_bps - FLAC__bitmath_ilog2(lpc_order), FLAC__MAX_QLP_COEFF_PRECISION);
+                                                                                max_qlp_coeff_precision = flac_max(max_qlp_coeff_precision, min_qlp_coeff_precision);
                                                                         }
                                                                         else
                                                                                 max_qlp_coeff_precision = FLAC__MAX_QLP_COEFF_PRECISION;
                                                                 }
                                                                 else {
                                                                         min_qlp_coeff_precision = max_qlp_coeff_precision = encoder->protected_->qlp_coeff_precision;
                                                                 }
                                                                 for(qlp_coeff_precision = min_qlp_coeff_precision; qlp_coeff_precision <= max_qlp_coeff_precision; qlp_coeff_precision++) {
                                                                         _candidate_bits =
                                                                                 evaluate_lpc_subframe_(
@@ skipping 214 matching lines @@
         unsigned rice_parameter,
         unsigned rice_parameter_limit,
         unsigned min_partition_order,
         unsigned max_partition_order,
         FLAC__bool do_escape_coding,
         unsigned rice_parameter_search_dist,
         FLAC__Subframe *subframe,
         FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents
 )
 {
-        FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER];
+        FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER]; /* WATCHOUT: the size is important; some x86 intrinsic routines need more than lpc order elements */
         unsigned i, residual_bits, estimate;
         int quantization, ret;
         const unsigned residual_samples = blocksize - order;
 
         /* try to keep qlp coeff precision such that only 32-bit math is required for decode of <=16bps streams */
         if(subframe_bps <= 16) {
                 FLAC__ASSERT(order > 0);
                 FLAC__ASSERT(order <= FLAC__MAX_LPC_ORDER);
-                qlp_coeff_precision = min(qlp_coeff_precision, 32 - subframe_bps - FLAC__bitmath_ilog2(order));
+                qlp_coeff_precision = flac_min(qlp_coeff_precision, 32 - subframe_bps - FLAC__bitmath_ilog2(order));
         }
 
         ret = FLAC__lpc_quantize_coefficients(lp_coeff, order, qlp_coeff_precision, qlp_coeff, &quantization);
         if(ret != 0)
                 return 0; /* this is a hack to indicate to the caller that we can't do lp at this order on this subframe */
 
         if(subframe_bps + qlp_coeff_precision + FLAC__bitmath_ilog2(order) <= 32)
                 if(subframe_bps <= 16 && qlp_coeff_precision <= 16)
                         encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit(signal+order, residual_samples, qlp_coeff, order, quantization, residual);
                 else
@@ skipping 83 matching lines @@
         unsigned rice_parameter_search_dist,
         FLAC__EntropyCodingMethod *best_ecm
 )
 {
         unsigned residual_bits, best_residual_bits = 0;
         unsigned best_parameters_index = 0;
         unsigned best_partition_order = 0;
         const unsigned blocksize = residual_samples + predictor_order;
 
         max_partition_order = FLAC__format_get_max_rice_partition_order_from_blocksize_limited_max_and_predictor_order(max_partition_order, blocksize, predictor_order);
-        min_partition_order = min(min_partition_order, max_partition_order);
+        min_partition_order = flac_min(min_partition_order, max_partition_order);
 
-        precompute_partition_info_sums_(residual, abs_residual_partition_sums, residual_samples, predictor_order, min_partition_order, max_partition_order, bps);
+        private_->local_precompute_partition_info_sums(residual, abs_residual_partition_sums, residual_samples, predictor_order, min_partition_order, max_partition_order, bps);
 
         if(do_escape_coding)
                 precompute_partition_info_escapes_(residual, raw_bits_per_partition, residual_samples, predictor_order, min_partition_order, max_partition_order);
 
         {
                 int partition_order;
                 unsigned sum;
 
                 for(partition_order = (int)max_partition_order, sum = 0; partition_order >= (int)min_partition_order; partition_order--) {
                         if(!
@@ skipping 31 matching lines @@
 
         {
                 /*
                  * We are allowed to de-const the pointer based on our special
                  * knowledge; it is const to the outside world.
                  */
                 FLAC__EntropyCodingMethod_PartitionedRiceContents* prc = (FLAC__EntropyCodingMethod_PartitionedRiceContents*)best_ecm->data.partitioned_rice.contents;
                 unsigned partition;
 
                 /* save best parameters and raw_bits */
-                FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(prc, max(6, best_partition_order));
-                memcpy(prc->parameters, private_->partitioned_rice_contents_extra[best_parameters_index].parameters, sizeof(unsigned)*((size_t)1<<(best_partition_order)));
+                FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(prc, flac_max(6u, best_partition_order));
+                memcpy(prc->parameters, private_->partitioned_rice_contents_extra[best_parameters_index].parameters, sizeof(unsigned)*(1<<(best_partition_order)));
                 if(do_escape_coding)
-                        memcpy(prc->raw_bits, private_->partitioned_rice_contents_extra[best_parameters_index].raw_bits, sizeof(unsigned)*((size_t)1<<(best_partition_order)));
+                        memcpy(prc->raw_bits, private_->partitioned_rice_contents_extra[best_parameters_index].raw_bits, sizeof(unsigned)*(1<<(best_partition_order)));
                 /*
                  * Now need to check if the type should be changed to
                  * FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 based on the
                  * size of the rice parameters.
                  */
                 for(partition = 0; partition < (1u<<best_partition_order); partition++) {
                         if(prc->parameters[partition] >= FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER) {
                                 best_ecm->type = FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2;
                                 break;
                         }
                 }
         }
 
         return best_residual_bits;
 }
 
-#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM
-extern void precompute_partition_info_sums_32bit_asm_ia32_(
-        const FLAC__int32 residual[],
-        FLAC__uint64 abs_residual_partition_sums[],
-        unsigned blocksize,
-        unsigned predictor_order,
-        unsigned min_partition_order,
-        unsigned max_partition_order
-);
-#endif
-
 void precompute_partition_info_sums_(
         const FLAC__int32 residual[],
         FLAC__uint64 abs_residual_partition_sums[],
         unsigned residual_samples,
         unsigned predictor_order,
         unsigned min_partition_order,
         unsigned max_partition_order,
         unsigned bps
 )
 {
         const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order;
         unsigned partitions = 1u << max_partition_order;
 
         FLAC__ASSERT(default_partition_samples > predictor_order);
 
-#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM
-        /* slightly pessimistic but still catches all common cases */
-        /* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */
-        if(FLAC__bitmath_ilog2(default_partition_samples) + bps < 32) {
-                precompute_partition_info_sums_32bit_asm_ia32_(residual, abs_residual_partition_sums, residual_samples + predictor_order, predictor_order, min_partition_order, max_partition_order);
-                return;
-        }
-#endif
-
         /* first do max_partition_order */
         {
                 unsigned partition, residual_sample, end = (unsigned)(-(int)predictor_order);
-                /* slightly pessimistic but still catches all common cases */
-                /* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */
-                if(FLAC__bitmath_ilog2(default_partition_samples) + bps < 32) {
+                /* WATCHOUT: "+ bps + FLAC__MAX_EXTRA_RESIDUAL_BPS" is the maximum
+                 * assumed size of the average residual magnitude */
+                if(FLAC__bitmath_ilog2(default_partition_samples) + bps + FLAC__MAX_EXTRA_RESIDUAL_BPS < 32) {
                         FLAC__uint32 abs_residual_partition_sum;
 
                         for(partition = residual_sample = 0; partition < partitions; partition++) {
                                 end += default_partition_samples;
                                 abs_residual_partition_sum = 0;
                                 for( ; residual_sample < end; residual_sample++)
                                         abs_residual_partition_sum += abs(residual[residual_sample]); /* abs(INT_MIN) is undefined, but if the residual is INT_MIN we have bigger problems */
                                 abs_residual_partition_sums[partition] = abs_residual_partition_sum;
                         }
                 }
@@ skipping 71 matching lines @@
         }
 
         /* now merge partitions for lower orders */
         for(from_partition = 0, --partition_order; partition_order >= (int)min_partition_order; partition_order--) {
                 unsigned m;
                 unsigned i;
                 const unsigned partitions = 1u << partition_order;
                 for(i = 0; i < partitions; i++) {
                         m = raw_bits_per_partition[from_partition];
                         from_partition++;
-                        raw_bits_per_partition[to_partition] = max(m, raw_bits_per_partition[from_partition]);
+                        raw_bits_per_partition[to_partition] = flac_max(m, raw_bits_per_partition[from_partition]);
                         from_partition++;
                         to_partition++;
                 }
         }
 }
 
 #ifdef EXACT_RICE_BITS_CALCULATION
-static FLaC__INLINE unsigned count_rice_bits_in_partition_(
+static inline unsigned count_rice_bits_in_partition_(
         const unsigned rice_parameter,
         const unsigned partition_samples,
         const FLAC__int32 *residual
 )
 {
         unsigned i, partition_bits =
                 FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + /* actually could end up being FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN but err on side of 16bps */
                 (1+rice_parameter) * partition_samples /* 1 for unary stop bit + rice_parameter for the binary portion */
         ;
         for(i = 0; i < partition_samples; i++)
                 partition_bits += ( (FLAC__uint32)((residual[i]<<1)^(residual[i]>>31)) >> rice_parameter );
         return partition_bits;
 }
 #else
-static FLaC__INLINE unsigned count_rice_bits_in_partition_(
+static inline unsigned count_rice_bits_in_partition_(
         const unsigned rice_parameter,
         const unsigned partition_samples,
         const FLAC__uint64 abs_residual_partition_sum
 )
 {
         return
                 FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + /* actually could end up being FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN but err on side of 16bps */
                 (1+rice_parameter) * partition_samples + /* 1 for unary stop bit + rice_parameter for the binary portion */
                 (
                         rice_parameter?
@@ skipping 34 matching lines @@
         unsigned *parameters, *raw_bits;
 #ifdef ENABLE_RICE_PARAMETER_SEARCH
         unsigned min_rice_parameter, max_rice_parameter;
 #else
         (void)rice_parameter_search_dist;
 #endif
 
         FLAC__ASSERT(suggested_rice_parameter < FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER);
         FLAC__ASSERT(rice_parameter_limit <= FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER);
 
-        FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(partitioned_rice_contents, max(6, partition_order));
+        FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(partitioned_rice_contents, flac_max(6u, partition_order));
         parameters = partitioned_rice_contents->parameters;
         raw_bits = partitioned_rice_contents->raw_bits;
 
         if(partition_order == 0) {
                 best_partition_bits = (unsigned)(-1);
 #ifdef ENABLE_RICE_PARAMETER_SEARCH
                 if(rice_parameter_search_dist) {
                         if(suggested_rice_parameter < rice_parameter_search_dist)
                                 min_rice_parameter = 0;
                         else
@@ skipping 53 matching lines @@
                         }
                         mean = abs_residual_partition_sums[partition];
                         /* we are basically calculating the size in bits of the
                          * average residual magnitude in the partition:
                          *   rice_parameter = floor(log2(mean/partition_samples))
                          * 'mean' is not a good name for the variable, it is
                          * actually the sum of magnitudes of all residual values
                          * in the partition, so the actual mean is
                          * mean/partition_samples
                          */
+#if 0 /* old simple code */
                         for(rice_parameter = 0, k = partition_samples; k < mean; rice_parameter++, k <<= 1)
                                 ;
+#else
+#if defined FLAC__CPU_X86_64 /* and other 64-bit arch, too */
+                        if(mean <= 0x80000000/512) { /* 512: more or less optimal for both 16- and 24-bit input */
+#else
+                        if(mean <= 0x80000000/8) { /* 32-bit arch: use 32-bit math if possible */
+#endif
+                                FLAC__uint32 k2, mean2 = (FLAC__uint32) mean;
+                                rice_parameter = 0; k2 = partition_samples;
+                                while(k2*8 < mean2) { /* requires: mean <= (2^31)/8 */
+                                        rice_parameter += 4; k2 <<= 4; /* tuned for 16-bit input */
+                                }
+                                while(k2 < mean2) { /* requires: mean <= 2^31 */
+                                        rice_parameter++; k2 <<= 1;
+                                }
+                        }
+                        else {
+                                rice_parameter = 0; k = partition_samples;
+                                if(mean <= FLAC__U64L(0x8000000000000000)/128) /* usually mean is _much_ smaller than this value */
+                                        while(k*128 < mean) { /* requires: mean <= (2^63)/128 */
+                                                rice_parameter += 8; k <<= 8; /* tuned for 24-bit input */
+                                        }
+                                while(k < mean) { /* requires: mean <= 2^63 */
+                                        rice_parameter++; k <<= 1;
+                                }
+                        }
+#endif
                         if(rice_parameter >= rice_parameter_limit) {
 #ifdef DEBUG_VERBOSE
                                 fprintf(stderr, "clipping rice_parameter (%u -> %u) @6\n", rice_parameter, rice_parameter_limit - 1);
 #endif
                                 rice_parameter = rice_parameter_limit - 1;
                         }
 
                         best_partition_bits = (unsigned)(-1);
 #ifdef ENABLE_RICE_PARAMETER_SEARCH
                         if(rice_parameter_search_dist) {
@@ skipping 196 matching lines @@
                 else if (ferror(encoder->private_->file))
                         return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
         }
         return FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE;
 }
 
 FLAC__StreamEncoderSeekStatus file_seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 {
         (void)client_data;
 
-        if(fseeko(encoder->private_->file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
+        if(fseeko(encoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0)
                 return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
         else
                 return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
 }
 
 FLAC__StreamEncoderTellStatus file_tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 {
-        off_t offset;
+        FLAC__off_t offset;
 
         (void)client_data;
 
         offset = ftello(encoder->private_->file);
 
         if(offset < 0) {
                 return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;
         }
         else {
                 *absolute_byte_offset = (FLAC__uint64)offset;
@@ skipping 57 matching lines @@
         _setmode(_fileno(stdout), _O_BINARY);
 #elif defined __CYGWIN__
         /* almost certainly not needed for any modern Cygwin, but let's be safe... */
         setmode(_fileno(stdout), _O_BINARY);
 #elif defined __EMX__
         setmode(fileno(stdout), O_BINARY);
 #endif
 
         return stdout;
 }