fix bug: wave header fixup was being tried even in test mode
[platform/upstream/flac.git] / src / flac / decode.c
index 372f7ee..22d038f 100644 (file)
@@ -1,5 +1,5 @@
 /* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003  Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+#  include <config.h>
 #endif
 
 #if defined _WIN32 && !defined __CYGWIN__
 #else
 # include <unistd.h>
 #endif
+#if defined _MSC_VER || defined __MINGW32__
+#include <sys/types.h> /* for off_t */
+#if _MSC_VER <= 1200 /* @@@ [2G limit] */
+#define fseeko fseek
+#define ftello ftell
+#endif
+#endif
+#include <errno.h>
 #include <math.h> /* for floor() */
-#include <stdio.h> /* for FILE et al. */
-#include <string.h> /* for strcmp() */
+#include <stdio.h> /* for FILE etc. */
+#include <string.h> /* for strcmp(), strerror() */
 #include "FLAC/all.h"
 #include "share/grabbag.h"
+#include "share/replaygain_synthesis.h"
 #include "decode.h"
 
-#ifdef FLAC__HAS_OGG
-#include "OggFLAC/stream_decoder.h"
-#endif
-
 typedef struct {
 #ifdef FLAC__HAS_OGG
        FLAC__bool is_ogg;
 #endif
 
-       FLAC__bool verbose;
        FLAC__bool is_aiff_out;
        FLAC__bool is_wave_out;
        FLAC__bool continue_through_decode_errors;
+       FLAC__bool channel_map_none;
+
+       struct {
+               replaygain_synthesis_spec_t spec;
+               FLAC__bool apply; /* 'spec.apply' is just a request; this 'apply' means we actually parsed the RG tags and are ready to go */
+               double scale;
+               DitherContext dither_context;
+       } replaygain;
+
        FLAC__bool test_only;
        FLAC__bool analysis_mode;
        analysis_options aopts;
        utils__SkipUntilSpecification *skip_specification;
        utils__SkipUntilSpecification *until_specification; /* a canonicalized value of 0 mean end-of-stream (i.e. --until=-0) */
+       utils__CueSpecification *cue_specification;
 
        const char *inbasefilename;
        const char *outfilename;
@@ -58,35 +72,22 @@ typedef struct {
        FLAC__uint64 samples_processed;
        unsigned frame_counter;
        FLAC__bool abort_flag;
+       FLAC__bool aborting_due_to_until; /* true if we intentionally abort decoding prematurely because we hit the --until point */
+       FLAC__bool aborting_due_to_unparseable; /* true if we abort decoding because we hit an unparseable frame */
 
-       struct {
-               FLAC__bool needs_fixup;
-               unsigned riff_offset; /* or FORM offset for AIFF */
-               unsigned data_offset; /* or SSND offset for AIFF */
-               unsigned frames_offset; /* AIFF only */
-       } wave_chunk_size_fixup;
+       FLAC__bool iff_headers_need_fixup;
 
        FLAC__bool is_big_endian;
        FLAC__bool is_unsigned_samples;
+       FLAC__bool got_stream_info;
        FLAC__uint64 total_samples;
        unsigned bps;
        unsigned channels;
        unsigned sample_rate;
+       FLAC__uint32 channel_mask;
 
-       union {
-               union {
-                       FLAC__FileDecoder *file;
-               } flac;
-#ifdef FLAC__HAS_OGG
-               union {
-                       OggFLAC__StreamDecoder *stream;
-               } ogg;
-#endif
-       } decoder;
+       FLAC__StreamDecoder *decoder;
 
-#ifdef FLAC__HAS_OGG
-       FILE *fin;
-#endif
        FILE *fout;
 } DecoderSession;
 
@@ -97,30 +98,24 @@ static FLAC__bool is_big_endian_host_;
 /*
  * local routines
  */
-static FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool verbose, FLAC__bool is_aiff_out, FLAC__bool is_wave_out, FLAC__bool continue_through_decode_errors, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_specification, const char *infilename, const char *outfilename);
+static FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool is_aiff_out, FLAC__bool is_wave_out, FLAC__bool continue_through_decode_errors, FLAC__bool channel_map_none, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_specification, utils__CueSpecification *cue_specification, const char *infilename, const char *outfilename);
 static void DecoderSession_destroy(DecoderSession *d, FLAC__bool error_occurred);
 static FLAC__bool DecoderSession_init_decoder(DecoderSession *d, decode_options_t decode_options, const char *infilename);
 static FLAC__bool DecoderSession_process(DecoderSession *d);
 static int DecoderSession_finish_ok(DecoderSession *d);
 static int DecoderSession_finish_error(DecoderSession *d);
 static FLAC__bool canonicalize_until_specification(utils__SkipUntilSpecification *spec, const char *inbasefilename, unsigned sample_rate, FLAC__uint64 skip, FLAC__uint64 total_samples_in_input);
+static FLAC__bool write_iff_headers(FILE *f, DecoderSession *decoder_session, FLAC__uint64 samples);
 static FLAC__bool write_little_endian_uint16(FILE *f, FLAC__uint16 val);
 static FLAC__bool write_little_endian_uint32(FILE *f, FLAC__uint32 val);
 static FLAC__bool write_big_endian_uint16(FILE *f, FLAC__uint16 val);
 static FLAC__bool write_big_endian_uint32(FILE *f, FLAC__uint32 val);
 static FLAC__bool write_sane_extended(FILE *f, unsigned val);
-static FLAC__bool fixup_wave_chunk_size(const char *outfilename, FLAC__bool is_wave_out, unsigned riff_offset, unsigned data_offset, unsigned frames_offset, FLAC__uint32 total_samples, unsigned channels, unsigned bps);
-#ifdef FLAC__HAS_OGG
-static FLAC__StreamDecoderReadStatus read_callback(const OggFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-#endif
-/*
- * We use 'void *' so that we can use the same callbacks for the
- * FLAC__StreamDecoder and FLAC__FileDecoder.  The 'decoder' argument is
- * actually never used in the callbacks.
- */
-static FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-static void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-static void error_callback(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static FLAC__bool fixup_iff_headers(DecoderSession *d);
+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static void print_error_with_init_status(const DecoderSession *d, const char *message, FLAC__StreamDecoderInitStatus init_status);
 static void print_error_with_state(const DecoderSession *d, const char *message);
 static void print_stats(const DecoderSession *decoder_session);
 
@@ -140,14 +135,16 @@ int flac__decode_aiff(const char *infilename, const char *outfilename, FLAC__boo
 #else
                        /*is_ogg=*/false,
 #endif
-                       options.common.verbose,
                        /*is_aiff_out=*/true,
                        /*is_wave_out=*/false,
                        options.common.continue_through_decode_errors,
+                       options.common.channel_map_none,
+                       options.common.replaygain_synthesis_spec,
                        analysis_mode,
                        aopts,
                        &options.common.skip_specification,
                        &options.common.until_specification,
+                       options.common.has_cue_specification? &options.common.cue_specification : 0,
                        infilename,
                        outfilename
                )
@@ -175,14 +172,16 @@ int flac__decode_wav(const char *infilename, const char *outfilename, FLAC__bool
 #else
                        /*is_ogg=*/false,
 #endif
-                       options.common.verbose,
                        /*is_aiff_out=*/false,
                        /*is_wave_out=*/true,
                        options.common.continue_through_decode_errors,
+                       options.common.channel_map_none,
+                       options.common.replaygain_synthesis_spec,
                        analysis_mode,
                        aopts,
                        &options.common.skip_specification,
                        &options.common.until_specification,
+                       options.common.has_cue_specification? &options.common.cue_specification : 0,
                        infilename,
                        outfilename
                )
@@ -213,14 +212,16 @@ int flac__decode_raw(const char *infilename, const char *outfilename, FLAC__bool
 #else
                        /*is_ogg=*/false,
 #endif
-                       options.common.verbose,
                        /*is_aiff_out=*/false,
                        /*is_wave_out=*/false,
                        options.common.continue_through_decode_errors,
+                       options.common.channel_map_none,
+                       options.common.replaygain_synthesis_spec,
                        analysis_mode,
                        aopts,
                        &options.common.skip_specification,
                        &options.common.until_specification,
+                       options.common.has_cue_specification? &options.common.cue_specification : 0,
                        infilename,
                        outfilename
                )
@@ -236,7 +237,7 @@ int flac__decode_raw(const char *infilename, const char *outfilename, FLAC__bool
        return DecoderSession_finish_ok(&decoder_session);
 }
 
-FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool verbose, FLAC__bool is_aiff_out, FLAC__bool is_wave_out, FLAC__bool continue_through_decode_errors, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_specification, const char *infilename, const char *outfilename)
+FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool is_aiff_out, FLAC__bool is_wave_out, FLAC__bool continue_through_decode_errors, FLAC__bool channel_map_none, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_specification, utils__CueSpecification *cue_specification, const char *infilename, const char *outfilename)
 {
 #ifdef FLAC__HAS_OGG
        d->is_ogg = is_ogg;
@@ -244,15 +245,20 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__
        (void)is_ogg;
 #endif
 
-       d->verbose = verbose;
        d->is_aiff_out = is_aiff_out;
        d->is_wave_out = is_wave_out;
        d->continue_through_decode_errors = continue_through_decode_errors;
+       d->channel_map_none = channel_map_none;
+       d->replaygain.spec = replaygain_synthesis_spec;
+       d->replaygain.apply = false;
+       d->replaygain.scale = 0.0;
+       /* d->replaygain.dither_context gets initialized later once we know the sample resolution */
        d->test_only = (0 == outfilename);
        d->analysis_mode = analysis_mode;
        d->aopts = aopts;
        d->skip_specification = skip_specification;
        d->until_specification = until_specification;
+       d->cue_specification = cue_specification;
 
        d->inbasefilename = grabbag__file_get_basename(infilename);
        d->outfilename = outfilename;
@@ -260,17 +266,20 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__
        d->samples_processed = 0;
        d->frame_counter = 0;
        d->abort_flag = false;
+       d->aborting_due_to_until = false;
+       d->aborting_due_to_unparseable = false;
 
-       d->wave_chunk_size_fixup.needs_fixup = false;
+       d->iff_headers_need_fixup = false;
 
-       d->decoder.flac.file = 0;
-#ifdef FLAC__HAS_OGG
-       d->decoder.ogg.stream = 0;
-#endif
+       d->total_samples = 0;
+       d->got_stream_info = false;
+       d->bps = 0;
+       d->channels = 0;
+       d->sample_rate = 0;
+       d->channel_mask = 0;
+
+       d->decoder = 0;
 
-#ifdef FLAC__HAS_OGG
-       d->fin = 0;
-#endif
        d->fout = 0; /* initialized with an open file later if necessary */
 
        FLAC__ASSERT(!(d->test_only && d->analysis_mode));
@@ -281,27 +290,13 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__
                }
                else {
                        if(0 == (d->fout = fopen(outfilename, "wb"))) {
-                               fprintf(stderr, "%s: ERROR: can't open output file %s\n", d->inbasefilename, outfilename);
+                               flac__utils_printf(stderr, 1, "%s: ERROR: can't open output file %s: %s\n", d->inbasefilename, outfilename, strerror(errno));
                                DecoderSession_destroy(d, /*error_occurred=*/true);
                                return false;
                        }
                }
        }
 
-#ifdef FLAC__HAS_OGG
-       if(d->is_ogg) {
-               if (0 == strcmp(infilename, "-")) {
-                       d->fin = grabbag__file_get_binary_stdin();
-               } else {
-                       if (0 == (d->fin = fopen(infilename, "rb"))) {
-                               fprintf(stderr, "%s: ERROR: can't open input file %s\n", d->inbasefilename, infilename);
-                               DecoderSession_destroy(d, /*error_occurred=*/true);
-                               return false;
-                       }
-               }
-       }
-#endif
-
        if(analysis_mode)
                flac__analyze_init(aopts);
 
@@ -315,73 +310,45 @@ void DecoderSession_destroy(DecoderSession *d, FLAC__bool error_occurred)
                if(error_occurred)
                        unlink(d->outfilename);
        }
-#ifdef FLAC__HAS_OGG
-       if(0 != d->fin && d->fin != stdin)
-               fclose(d->fin);
-#endif
 }
 
 FLAC__bool DecoderSession_init_decoder(DecoderSession *decoder_session, decode_options_t decode_options, const char *infilename)
 {
+       FLAC__StreamDecoderInitStatus init_status;
        FLAC__uint32 test = 1;
 
        is_big_endian_host_ = (*((FLAC__byte*)(&test)))? false : true;
 
-#ifdef FLAC__HAS_OGG
-       if(decoder_session->is_ogg) {
-               decoder_session->decoder.ogg.stream = OggFLAC__stream_decoder_new();
+       decoder_session->decoder = FLAC__stream_decoder_new();
 
-               if(0 == decoder_session->decoder.ogg.stream) {
-                       fprintf(stderr, "%s: ERROR creating the decoder instance\n", decoder_session->inbasefilename);
-                       return false;
-               }
+       if(0 == decoder_session->decoder) {
+               flac__utils_printf(stderr, 1, "%s: ERROR creating the decoder instance\n", decoder_session->inbasefilename);
+               return false;
+       }
+
+       FLAC__stream_decoder_set_md5_checking(decoder_session->decoder, true);
+       if (0 != decoder_session->cue_specification)
+               FLAC__stream_decoder_set_metadata_respond(decoder_session->decoder, FLAC__METADATA_TYPE_CUESHEET);
+       if (decoder_session->replaygain.spec.apply)
+               FLAC__stream_decoder_set_metadata_respond(decoder_session->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
 
+#ifdef FLAC__HAS_OGG
+       if(decoder_session->is_ogg) {
                if(!decode_options.use_first_serial_number)
-                       OggFLAC__stream_decoder_set_serial_number(decoder_session->decoder.ogg.stream, decode_options.serial_number);
-
-               OggFLAC__stream_decoder_set_read_callback(decoder_session->decoder.ogg.stream, read_callback);
-               /*
-                * The three ugly casts here are to 'downcast' the 'void *' argument of
-                * the callback down to 'FLAC__StreamDecoder *'.  In C++ this would be
-                * unnecessary but here the cast makes the C compiler happy.
-                */
-               OggFLAC__stream_decoder_set_write_callback(decoder_session->decoder.ogg.stream, (FLAC__StreamDecoderWriteStatus (*)(const OggFLAC__StreamDecoder *, const FLAC__Frame *, const FLAC__int32 * const [], void *))write_callback);
-               OggFLAC__stream_decoder_set_metadata_callback(decoder_session->decoder.ogg.stream, (void (*)(const OggFLAC__StreamDecoder *, const FLAC__StreamMetadata *, void *))metadata_callback);
-               OggFLAC__stream_decoder_set_error_callback(decoder_session->decoder.ogg.stream, (void (*)(const OggFLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus, void *))error_callback);
-               OggFLAC__stream_decoder_set_client_data(decoder_session->decoder.ogg.stream, decoder_session);
-
-               if(OggFLAC__stream_decoder_init(decoder_session->decoder.ogg.stream) != OggFLAC__STREAM_DECODER_OK) {
-                       print_error_with_state(decoder_session, "ERROR initializing decoder");
-                       return false;
-               }
+                       FLAC__stream_decoder_set_ogg_serial_number(decoder_session->decoder, decode_options.serial_number);
+               init_status = FLAC__stream_decoder_init_ogg_file(decoder_session->decoder, strcmp(infilename, "-")? infilename : 0, write_callback, metadata_callback, error_callback, /*client_data=*/decoder_session);
        }
        else
 #else
        (void)decode_options;
 #endif
        {
-               decoder_session->decoder.flac.file = FLAC__file_decoder_new();
-
-               if(0 == decoder_session->decoder.flac.file) {
-                       fprintf(stderr, "%s: ERROR creating the decoder instance\n", decoder_session->inbasefilename);
-                       return false;
-               }
+               init_status = FLAC__stream_decoder_init_file(decoder_session->decoder, strcmp(infilename, "-")? infilename : 0, write_callback, metadata_callback, error_callback, /*client_data=*/decoder_session);
+       }
 
-               FLAC__file_decoder_set_md5_checking(decoder_session->decoder.flac.file, true);
-               FLAC__file_decoder_set_filename(decoder_session->decoder.flac.file, infilename);
-               /*
-                * The three ugly casts here are to 'downcast' the 'void *' argument of
-                * the callback down to 'FLAC__FileDecoder *'.
-                */
-               FLAC__file_decoder_set_write_callback(decoder_session->decoder.flac.file, (FLAC__StreamDecoderWriteStatus (*)(const FLAC__FileDecoder *, const FLAC__Frame *, const FLAC__int32 * const [], void *))write_callback);
-               FLAC__file_decoder_set_metadata_callback(decoder_session->decoder.flac.file, (void (*)(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, void *))metadata_callback);
-               FLAC__file_decoder_set_error_callback(decoder_session->decoder.flac.file, (void (*)(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, void *))error_callback);
-               FLAC__file_decoder_set_client_data(decoder_session->decoder.flac.file, decoder_session);
-
-               if(FLAC__file_decoder_init(decoder_session->decoder.flac.file) != FLAC__FILE_DECODER_OK) {
-                       print_error_with_state(decoder_session, "ERROR initializing decoder");
-                       return false;
-               }
+       if(init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+               print_error_with_init_status(decoder_session, "ERROR initializing decoder", init_status);
+               return false;
        }
 
        return true;
@@ -389,93 +356,85 @@ FLAC__bool DecoderSession_init_decoder(DecoderSession *decoder_session, decode_o
 
 FLAC__bool DecoderSession_process(DecoderSession *d)
 {
-#ifdef FLAC__HAS_OGG
-       if(d->is_ogg) {
-               if(!OggFLAC__stream_decoder_process_until_end_of_metadata(d->decoder.ogg.stream)) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR while decoding metadata");
+       if(!FLAC__stream_decoder_process_until_end_of_metadata(d->decoder)) {
+               flac__utils_printf(stderr, 2, "\n");
+               print_error_with_state(d, "ERROR while decoding metadata");
+               return false;
+       }
+       if(FLAC__stream_decoder_get_state(d->decoder) > FLAC__STREAM_DECODER_END_OF_STREAM) {
+               flac__utils_printf(stderr, 2, "\n");
+               print_error_with_state(d, "ERROR during metadata decoding");
+               if(!d->continue_through_decode_errors)
                        return false;
+       }
+
+       if(d->abort_flag)
+               return false;
+
+       /* set channel mapping */
+       if(!d->channel_map_none) {
+               /* currently FLAC order matches SMPTE/WAVEFORMATEXTENSIBLE order, so no reordering is necessary; see encode.c */
+               /* only the channel mask must be set if it was not already picked up from the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag */
+               if(d->channels == 1) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x0001;
                }
-               if(OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(d->decoder.ogg.stream) != FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC && OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(d->decoder.ogg.stream) != FLAC__STREAM_DECODER_END_OF_STREAM) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR during metadata decoding");
-                       return false;
+               else if(d->channels == 2) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x0003;
                }
-       }
-       else
-#endif
-       {
-               if(!FLAC__file_decoder_process_until_end_of_metadata(d->decoder.flac.file)) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR while decoding metadata");
-                       return false;
+               else if(d->channels == 3) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x0007;
+               }
+               else if(d->channels == 4) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x0033;
                }
-               if(FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_OK && FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR during metadata decoding");
+               else if(d->channels == 5) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x0607;
+               }
+               else if(d->channels == 6) {
+                       if(d->channel_mask == 0)
+                               d->channel_mask = 0x060f;
+               }
+       }
+
+       /* write the WAVE/AIFF headers if necessary */
+       if(!d->analysis_mode && !d->test_only && (d->is_wave_out || d->is_aiff_out)) {
+               if(!write_iff_headers(d->fout, d, d->total_samples)) {
+                       d->abort_flag = true;
                        return false;
                }
        }
-       if(d->abort_flag)
-               return false;
 
        if(d->skip_specification->value.samples > 0) {
                const FLAC__uint64 skip = (FLAC__uint64)d->skip_specification->value.samples;
 
-#ifdef FLAC__HAS_OGG
-               if(d->is_ogg) { /*@@@ (move this check into main.c) */
-                       fprintf(stderr, "%s: ERROR, can't skip when decoding Ogg-FLAC yet; convert to native-FLAC first\n", d->inbasefilename);
-                       return false;
-               }
-#endif
-               if(!FLAC__file_decoder_seek_absolute(d->decoder.flac.file, skip)) {
+               if(!FLAC__stream_decoder_seek_absolute(d->decoder, skip)) {
                        print_error_with_state(d, "ERROR seeking while skipping bytes");
                        return false;
                }
-               if(!FLAC__file_decoder_process_until_end_of_file(d->decoder.flac.file)) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR while decoding frames");
-                       return false;
-               }
-               if(FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_OK && FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(d->verbose) fprintf(stderr, "\n");
-                       print_error_with_state(d, "ERROR during decoding");
+       }
+       if(!FLAC__stream_decoder_process_until_end_of_stream(d->decoder) && !d->aborting_due_to_until) {
+               flac__utils_printf(stderr, 2, "\n");
+               print_error_with_state(d, "ERROR while decoding data");
+               if(!d->continue_through_decode_errors)
                        return false;
-               }
        }
-       else {
-#ifdef FLAC__HAS_OGG
-               if(d->is_ogg) {
-                       if(!OggFLAC__stream_decoder_process_until_end_of_stream(d->decoder.ogg.stream)) {
-                               if(d->verbose) fprintf(stderr, "\n");
-                               print_error_with_state(d, "ERROR while decoding data");
-                               return false;
-                       }
-                       if(OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(d->decoder.ogg.stream) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA && OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(d->decoder.ogg.stream) != FLAC__STREAM_DECODER_END_OF_STREAM) {
-                               if(d->verbose) fprintf(stderr, "\n");
-                               print_error_with_state(d, "ERROR during decoding");
-                               return false;
-                       }
-               }
-               else
-#endif
-               {
-                       if(!FLAC__file_decoder_process_until_end_of_file(d->decoder.flac.file)) {
-                               if(d->verbose) fprintf(stderr, "\n");
-                               print_error_with_state(d, "ERROR while decoding data");
-                               return false;
-                       }
-                       if(FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_OK && FLAC__file_decoder_get_state(d->decoder.flac.file) != FLAC__FILE_DECODER_END_OF_FILE) {
-                               if(d->verbose) fprintf(stderr, "\n");
-                               print_error_with_state(d, "ERROR during decoding");
-                               return false;
-                       }
-               }
+       if(FLAC__stream_decoder_get_state(d->decoder) > FLAC__STREAM_DECODER_END_OF_STREAM && !d->aborting_due_to_until) {
+               flac__utils_printf(stderr, 2, "\n");
+               print_error_with_state(d, "ERROR during decoding");
+               return false;
        }
 
-       if(d->is_aiff_out && ((d->total_samples * d->channels * ((d->bps+7)/8)) & 1)) {
+       if(!d->analysis_mode && !d->test_only && (d->is_wave_out || d->is_aiff_out) && ((d->total_samples * d->channels * ((d->bps+7)/8)) & 1)) {
                if(flac__utils_fwrite("\000", 1, 1, d->fout) != 1) {
-                       print_error_with_state(d, "ERROR writing pad byte to AIFF SSND chunk");
+                       print_error_with_state(d, d->is_wave_out?
+                               "ERROR writing pad byte to WAVE data chunk" :
+                               "ERROR writing pad byte to AIFF SSND chunk"
+                       );
                        return false;
                }
        }
@@ -485,58 +444,37 @@ FLAC__bool DecoderSession_process(DecoderSession *d)
 
 int DecoderSession_finish_ok(DecoderSession *d)
 {
-       FLAC__bool md5_failure = false;
+       FLAC__bool ok = true, md5_failure = false;
 
-#ifdef FLAC__HAS_OGG
-       if(d->is_ogg) {
-               if(d->decoder.ogg.stream) {
-                       OggFLAC__stream_decoder_finish(d->decoder.ogg.stream);
-                       md5_failure = false;
-                       print_stats(d);
-                       OggFLAC__stream_decoder_delete(d->decoder.ogg.stream);
-               }
-       }
-       else
-#endif
-       {
-               if(d->decoder.flac.file) {
-                       md5_failure = !FLAC__file_decoder_finish(d->decoder.flac.file);
-                       print_stats(d);
-                       FLAC__file_decoder_delete(d->decoder.flac.file);
-               }
+       if(d->decoder) {
+               md5_failure = !FLAC__stream_decoder_finish(d->decoder) && !d->aborting_due_to_until;
+               print_stats(d);
+               FLAC__stream_decoder_delete(d->decoder);
        }
        if(d->analysis_mode)
                flac__analyze_finish(d->aopts);
        if(md5_failure) {
-               fprintf(stderr, "\r%s: WARNING, MD5 signature mismatch\n", d->inbasefilename);
+               flac__utils_printf(stderr, 1, "\r%s: ERROR, MD5 signature mismatch\n", d->inbasefilename);
+               ok = d->continue_through_decode_errors;
+       }
+       else if(!d->got_stream_info) {
+               flac__utils_printf(stderr, 1, "\r%s: WARNING, cannot check MD5 signature since there was no STREAMINFO\n", d->inbasefilename);
        }
        else {
-               if(d->verbose)
-                       fprintf(stderr, "\r%s: %s         \n", d->inbasefilename, d->test_only? "ok           ":d->analysis_mode?"done           ":"done");
+               flac__utils_printf(stderr, 2, "\r%s: %s         \n", d->inbasefilename, d->test_only? "ok           ":d->analysis_mode?"done           ":"done");
        }
-       DecoderSession_destroy(d, /*error_occurred=*/false);
-       if((d->is_wave_out || d->is_aiff_out) && d->wave_chunk_size_fixup.needs_fixup)
-               if(!fixup_wave_chunk_size(d->outfilename, d->is_wave_out, d->wave_chunk_size_fixup.riff_offset, d->wave_chunk_size_fixup.data_offset, d->wave_chunk_size_fixup.frames_offset, (FLAC__uint32)d->samples_processed, d->channels, d->bps))
+       DecoderSession_destroy(d, /*error_occurred=*/!ok);
+       if(!d->test_only && (d->is_wave_out || d->is_aiff_out) && (d->iff_headers_need_fixup || (!d->got_stream_info && strcmp(d->outfilename, "-"))))
+               if(!fixup_iff_headers(d))
                        return 1;
-       return 0;
+       return ok? 0 : 1;
 }
 
 int DecoderSession_finish_error(DecoderSession *d)
 {
-#ifdef FLAC__HAS_OGG
-       if(d->is_ogg) {
-               if(d->decoder.ogg.stream) {
-                       OggFLAC__stream_decoder_finish(d->decoder.ogg.stream);
-                       OggFLAC__stream_decoder_delete(d->decoder.ogg.stream);
-               }
-       }
-       else
-#endif
-       {
-               if(d->decoder.flac.file) {
-                       FLAC__file_decoder_finish(d->decoder.flac.file);
-                       FLAC__file_decoder_delete(d->decoder.flac.file);
-               }
+       if(d->decoder) {
+               (void)FLAC__stream_decoder_finish(d->decoder);
+               FLAC__stream_decoder_delete(d->decoder);
        }
        if(d->analysis_mode)
                flac__analyze_finish(d->aopts);
@@ -557,7 +495,7 @@ FLAC__bool canonicalize_until_specification(utils__SkipUntilSpecification *spec,
 
        /* in any other case the total samples in the input must be known */
        if(total_samples_in_input == 0) {
-               fprintf(stderr, "%s: ERROR, cannot use --until when FLAC metadata has total sample count of 0\n", inbasefilename);
+               flac__utils_printf(stderr, 1, "%s: ERROR, cannot use --until when FLAC metadata has total sample count of 0\n", inbasefilename);
                return false;
        }
 
@@ -574,21 +512,134 @@ FLAC__bool canonicalize_until_specification(utils__SkipUntilSpecification *spec,
 
        /* error check */
        if(spec->value.samples < 0) {
-               fprintf(stderr, "%s: ERROR, --until value is before beginning of input\n", inbasefilename);
+               flac__utils_printf(stderr, 1, "%s: ERROR, --until value is before beginning of input\n", inbasefilename);
                return false;
        }
        if((FLAC__uint64)spec->value.samples <= skip) {
-               fprintf(stderr, "%s: ERROR, --until value is before --skip point\n", inbasefilename);
+               flac__utils_printf(stderr, 1, "%s: ERROR, --until value is before --skip point\n", inbasefilename);
                return false;
        }
        if((FLAC__uint64)spec->value.samples > total_samples_in_input) {
-               fprintf(stderr, "%s: ERROR, --until value is after end of input\n", inbasefilename);
+               flac__utils_printf(stderr, 1, "%s: ERROR, --until value is after end of input\n", inbasefilename);
                return false;
        }
 
        return true;
 }
 
+FLAC__bool write_iff_headers(FILE *f, DecoderSession *decoder_session, FLAC__uint64 samples)
+{
+       const char *fmt_desc = decoder_session->is_wave_out? "WAVE" : "AIFF";
+       const FLAC__bool is_waveformatextensible = decoder_session->is_wave_out && (decoder_session->channel_mask == 2 || decoder_session->channel_mask > 3 || decoder_session->bps%8 || decoder_session->channels > 2);
+       FLAC__uint64 data_size = samples * decoder_session->channels * ((decoder_session->bps+7)/8);
+       const FLAC__uint32 aligned_data_size = (FLAC__uint32)((data_size+1) & (~1U)); /* we'll check for overflow later */
+       if(samples == 0) {
+               if(f == stdout) {
+                       flac__utils_printf(stderr, 1, "%s: WARNING, don't have accurate sample count available for %s header.\n", decoder_session->inbasefilename, fmt_desc);
+                       flac__utils_printf(stderr, 1, "             Generated %s file will have a data chunk size of 0.  Try\n", fmt_desc);
+                       flac__utils_printf(stderr, 1, "             decoding directly to a file instead.\n");
+               }
+               else {
+                       decoder_session->iff_headers_need_fixup = true;
+               }
+       }
+       if(data_size >= 0xFFFFFFDC) {
+               flac__utils_printf(stderr, 1, "%s: ERROR: stream is too big to fit in a single %s file chunk\n", decoder_session->inbasefilename, fmt_desc);
+               return false;
+       }
+       if(decoder_session->is_wave_out) {
+               if(flac__utils_fwrite("RIFF", 1, 4, f) != 4)
+                       return false;
+
+               if(!write_little_endian_uint32(f, aligned_data_size+(is_waveformatextensible?60:36))) /* filesize-8 */
+                       return false;
+
+               if(flac__utils_fwrite("WAVEfmt ", 1, 8, f) != 8)
+                       return false;
+
+               if(!write_little_endian_uint32(f, is_waveformatextensible? 40 : 16)) /* chunk size */
+                       return false;
+
+               if(!write_little_endian_uint16(f, (FLAC__uint16)(is_waveformatextensible? 65534 : 1))) /* compression code */
+                       return false;
+
+               if(!write_little_endian_uint16(f, (FLAC__uint16)(decoder_session->channels)))
+                       return false;
+
+               if(!write_little_endian_uint32(f, decoder_session->sample_rate))
+                       return false;
+
+               if(!write_little_endian_uint32(f, decoder_session->sample_rate * decoder_session->channels * ((decoder_session->bps+7) / 8)))
+                       return false;
+
+               if(!write_little_endian_uint16(f, (FLAC__uint16)(decoder_session->channels * ((decoder_session->bps+7) / 8)))) /* block align */
+                       return false;
+
+               if(!write_little_endian_uint16(f, (FLAC__uint16)(((decoder_session->bps+7)/8)*8))) /* bits per sample */
+                       return false;
+
+               if(is_waveformatextensible) {
+                       if(!write_little_endian_uint16(f, (FLAC__uint16)22)) /* cbSize */
+                               return false;
+
+                       if(!write_little_endian_uint16(f, (FLAC__uint16)decoder_session->bps)) /* validBitsPerSample */
+                               return false;
+
+                       if(!write_little_endian_uint32(f, decoder_session->channel_mask))
+                               return false;
+
+                       /* GUID = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}} */
+                       if(flac__utils_fwrite("\x01\x00\x00\x00\x00\x00\x10\x00\x80\x00\x00\xaa\x00\x38\x9b\x71", 1, 16, f) != 16)
+                               return false;
+               }
+
+               if(flac__utils_fwrite("data", 1, 4, f) != 4)
+                       return false;
+
+               if(!write_little_endian_uint32(f, (FLAC__uint32)data_size)) /* data size */
+                       return false;
+       }
+       else {
+               if(flac__utils_fwrite("FORM", 1, 4, f) != 4)
+                       return false;
+
+               if(!write_big_endian_uint32(f, aligned_data_size+46)) /* filesize-8 */
+                       return false;
+
+               if(flac__utils_fwrite("AIFFCOMM", 1, 8, f) != 8)
+                       return false;
+
+               if(flac__utils_fwrite("\000\000\000\022", 1, 4, f) != 4) /* chunk size = 18 */
+                       return false;
+
+               if(!write_big_endian_uint16(f, (FLAC__uint16)(decoder_session->channels)))
+                       return false;
+
+               if(!write_big_endian_uint32(f, (FLAC__uint32)samples))
+                       return false;
+
+               if(!write_big_endian_uint16(f, (FLAC__uint16)(decoder_session->bps)))
+                       return false;
+
+               if(!write_sane_extended(f, decoder_session->sample_rate))
+                       return false;
+
+               if(flac__utils_fwrite("SSND", 1, 4, f) != 4)
+                       return false;
+
+               if(!write_big_endian_uint32(f, (FLAC__uint32)data_size+8)) /* data size */
+                       return false;
+
+               if(!write_big_endian_uint32(f, 0/*offset*/))
+                       return false;
+
+               if(!write_big_endian_uint32(f, 0/*block_size*/))
+                       return false;
+       }
+
+       return true;
+}
+
 FLAC__bool write_little_endian_uint16(FILE *f, FLAC__uint16 val)
 {
        FLAC__byte *b = (FLAC__byte*)(&val);
@@ -662,89 +713,31 @@ FLAC__bool write_sane_extended(FILE *f, unsigned val)
        return true;
 }
 
-FLAC__bool fixup_wave_chunk_size(const char *outfilename, FLAC__bool is_wave_out, unsigned riff_offset, unsigned data_offset, unsigned frames_offset, FLAC__uint32 total_samples, unsigned channels, unsigned bps)
+FLAC__bool fixup_iff_headers(DecoderSession *d)
 {
-       const char *fmt_desc = (is_wave_out? "WAVE" : "AIFF");
-       FLAC__bool (*write_it)(FILE *, FLAC__uint32) = (is_wave_out? write_little_endian_uint32 : write_big_endian_uint32);
-       FILE *f = fopen(outfilename, "r+b");
-       FLAC__uint32 data_size, aligned_data_size;
+       const char *fmt_desc = (d->is_wave_out? "WAVE" : "AIFF");
+       FILE *f = fopen(d->outfilename, "r+b"); /* stream is positioned at beginning of file */
 
        if(0 == f) {
-               fprintf(stderr, "ERROR, couldn't open file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
+               flac__utils_printf(stderr, 1, "ERROR, couldn't open file %s while fixing up %s chunk size: %s\n", d->outfilename, fmt_desc, strerror(errno));
                return false;
        }
 
-       data_size = aligned_data_size = total_samples * channels * ((bps+7)/8);
-       if(!is_wave_out && (aligned_data_size & 1))
-               aligned_data_size++;
-
-       if(fseek(f, riff_offset, SEEK_SET) < 0) {
-               fprintf(stderr, "ERROR, couldn't seek in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
-               fclose(f);
-               return false;
-       }
-       if(!write_it(f, aligned_data_size + (is_wave_out? 36 : 46))) {
-               fprintf(stderr, "ERROR, couldn't write size in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
-               fclose(f);
-               return false;
-       }
-       if(!is_wave_out) {
-               if(fseek(f, frames_offset, SEEK_SET) < 0) {
-                       fprintf(stderr, "ERROR, couldn't seek in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
-                       fclose(f);
-                       return false;
-               }
-               if(!write_it(f, total_samples)) {
-                       fprintf(stderr, "ERROR, couldn't write size in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
-                       fclose(f);
-                       return false;
-               }
-       }
-       if(fseek(f, data_offset, SEEK_SET) < 0) {
-               fprintf(stderr, "ERROR, couldn't seek in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
-               fclose(f);
-               return false;
-       }
-       if(!write_it(f, data_size + (is_wave_out? 0 : 8))) {
-               fprintf(stderr, "ERROR, couldn't write size in file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
+       if(!write_iff_headers(f, d, d->samples_processed)) {
                fclose(f);
                return false;
        }
+
        fclose(f);
        return true;
 }
 
-#ifdef FLAC__HAS_OGG
-FLAC__StreamDecoderReadStatus read_callback(const OggFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-{
-       DecoderSession *decoder_session = (DecoderSession*)client_data;
-       FILE *fin = decoder_session->fin;
-       size_t bytes_read;
-
-       (void)decoder; /* avoid compiler warning */
-
-       if (decoder_session->abort_flag)
-               return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-
-       if(feof(fin))
-               return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-
-       bytes_read = fread(buffer, 1, *bytes, fin);
-
-       if(ferror(fin))
-               return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-
-       *bytes = (unsigned)bytes_read;
-
-       return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-}
-#endif
-
-FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
 {
        DecoderSession *decoder_session = (DecoderSession*)client_data;
        FILE *fout = decoder_session->fout;
        const unsigned bps = frame->header.bits_per_sample, channels = frame->header.channels;
+       const unsigned shift = ((decoder_session->is_wave_out || decoder_session->is_aiff_out) && (bps%8)? 8-(bps%8): 0);
        FLAC__bool is_big_endian = (decoder_session->is_aiff_out? true : (decoder_session->is_wave_out? false : decoder_session->is_big_endian));
        FLAC__bool is_unsigned_samples = (decoder_session->is_aiff_out? false : (decoder_session->is_wave_out? bps<=8 : decoder_session->is_unsigned_samples));
        unsigned wide_samples = frame->header.blocksize, wide_sample, sample, channel, byte;
@@ -754,31 +747,86 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
        FLAC__uint16 *u16buffer = (FLAC__uint16 *)s8buffer;
        FLAC__int32  *s32buffer = (FLAC__int32  *)s8buffer;
        FLAC__uint32 *u32buffer = (FLAC__uint32 *)s8buffer;
+       size_t bytes_to_write = 0;
 
        (void)decoder;
 
        if(decoder_session->abort_flag)
                return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-       if(bps != decoder_session->bps) {
-               fprintf(stderr, "%s: ERROR, bits-per-sample is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, bps, decoder_session->bps);
-               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+       /* sanity-check the bits-per-sample */
+       if(decoder_session->bps) {
+               if(bps != decoder_session->bps) {
+                       if(decoder_session->got_stream_info)
+                               flac__utils_printf(stderr, 1, "%s: ERROR, bits-per-sample is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, bps, decoder_session->bps);
+                       else
+                               flac__utils_printf(stderr, 1, "%s: ERROR, bits-per-sample is %u in this frame but %u in previous frames\n", decoder_session->inbasefilename, bps, decoder_session->bps);
+                       if(!decoder_session->continue_through_decode_errors)
+                               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
        }
-       if(channels != decoder_session->channels) {
-               fprintf(stderr, "%s: ERROR, channels is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, channels, decoder_session->channels);
-               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+       else {
+               /* must not have gotten STREAMINFO, save the bps from the frame header */
+               FLAC__ASSERT(!decoder_session->got_stream_info);
+               decoder_session->bps = bps;
        }
-       if(frame->header.sample_rate != decoder_session->sample_rate) {
-               fprintf(stderr, "%s: ERROR, sample rate is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, frame->header.sample_rate, decoder_session->sample_rate);
-               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+
+       /* sanity-check the #channels */
+       if(decoder_session->channels) {
+               if(channels != decoder_session->channels) {
+                       if(decoder_session->got_stream_info)
+                               flac__utils_printf(stderr, 1, "%s: ERROR, channels is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, channels, decoder_session->channels);
+                       else
+                               flac__utils_printf(stderr, 1, "%s: ERROR, channels is %u in this frame but %u in previous frames\n", decoder_session->inbasefilename, channels, decoder_session->channels);
+                       if(!decoder_session->continue_through_decode_errors)
+                               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
+       }
+       else {
+               /* must not have gotten STREAMINFO, save the #channels from the frame header */
+               FLAC__ASSERT(!decoder_session->got_stream_info);
+               decoder_session->channels = channels;
+       }
+
+       /* sanity-check the sample rate */
+       if(decoder_session->sample_rate) {
+               if(frame->header.sample_rate != decoder_session->sample_rate) {
+                       if(decoder_session->got_stream_info)
+                               flac__utils_printf(stderr, 1, "%s: ERROR, sample rate is %u in frame but %u in STREAMINFO\n", decoder_session->inbasefilename, frame->header.sample_rate, decoder_session->sample_rate);
+                       else
+                               flac__utils_printf(stderr, 1, "%s: ERROR, sample rate is %u in this frame but %u in previous frames\n", decoder_session->inbasefilename, frame->header.sample_rate, decoder_session->sample_rate);
+                       if(!decoder_session->continue_through_decode_errors)
+                               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
+       }
+       else {
+               /* must not have gotten STREAMINFO, save the sample rate from the frame header */
+               FLAC__ASSERT(!decoder_session->got_stream_info);
+               decoder_session->sample_rate = frame->header.sample_rate;
        }
 
        /*
         * limit the number of samples to accept based on --until
         */
        FLAC__ASSERT(!decoder_session->skip_specification->is_relative);
+       /* if we never got the total_samples from the metadata, the skip and until specs would never have been canonicalized, so protect against that: */
+       if(decoder_session->skip_specification->is_relative) {
+               if(decoder_session->skip_specification->value.samples == 0) /* special case for when no --skip was given */
+                       decoder_session->skip_specification->is_relative = false; /* convert to our meaning of beginning-of-stream */
+               else {
+                       flac__utils_printf(stderr, 1, "%s: ERROR, cannot use --skip because the total sample count was not found in the metadata\n", decoder_session->inbasefilename);
+                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
+       }
+       if(decoder_session->until_specification->is_relative) {
+               if(decoder_session->until_specification->value.samples == 0) /* special case for when no --until was given */
+                       decoder_session->until_specification->is_relative = false; /* convert to our meaning of end-of-stream */
+               else {
+                       flac__utils_printf(stderr, 1, "%s: ERROR, cannot use --until because the total sample count was not found in the metadata\n", decoder_session->inbasefilename);
+                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
+       }
        FLAC__ASSERT(decoder_session->skip_specification->value.samples >= 0);
-       FLAC__ASSERT(!decoder_session->until_specification->is_relative);
        FLAC__ASSERT(decoder_session->until_specification->value.samples >= 0);
        if(decoder_session->until_specification->value.samples > 0) {
                const FLAC__uint64 skip = (FLAC__uint64)decoder_session->skip_specification->value.samples;
@@ -787,20 +835,46 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
                FLAC__ASSERT(until >= input_samples_passed);
                if(input_samples_passed + wide_samples > until)
                        wide_samples = (unsigned)(until - input_samples_passed);
+               if (wide_samples == 0) {
+                       decoder_session->abort_flag = true;
+                       decoder_session->aborting_due_to_until = true;
+                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
        }
 
        if(wide_samples > 0) {
                decoder_session->samples_processed += wide_samples;
                decoder_session->frame_counter++;
 
-               if(decoder_session->verbose && !(decoder_session->frame_counter & 0x3f))
+               if(!(decoder_session->frame_counter & 0x3f))
                        print_stats(decoder_session);
 
                if(decoder_session->analysis_mode) {
                        flac__analyze_frame(frame, decoder_session->frame_counter-1, decoder_session->aopts, fout);
                }
                else if(!decoder_session->test_only) {
-                       if(bps == 8) {
+                       if(shift && !decoder_session->replaygain.apply) {
+                               for(wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                       for(channel = 0; channel < channels; channel++)
+                                               ((FLAC__int32**)buffer)[channel][wide_sample] <<= shift;/*@@@@@@un-const'ing the buffer is hacky but safe*/
+                       }
+                       if(decoder_session->replaygain.apply) {
+                               bytes_to_write = FLAC__replaygain_synthesis__apply_gain(
+                                       u8buffer,
+                                       !is_big_endian,
+                                       is_unsigned_samples,
+                                       buffer,
+                                       wide_samples,
+                                       channels,
+                                       bps, /* source_bps */
+                                       bps+shift, /* target_bps */
+                                       decoder_session->replaygain.scale,
+                                       decoder_session->replaygain.spec.limiter == RGSS_LIMIT__HARD, /* hard_limit */
+                                       decoder_session->replaygain.spec.noise_shaping != NOISE_SHAPING_NONE, /* do_dithering */
+                                       &decoder_session->replaygain.dither_context
+                               );
+                       }
+                       else if(bps+shift == 8) {
                                if(is_unsigned_samples) {
                                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                                for(channel = 0; channel < channels; channel++, sample++)
@@ -811,10 +885,9 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
                                                for(channel = 0; channel < channels; channel++, sample++)
                                                        s8buffer[sample] = (FLAC__int8)(buffer[channel][wide_sample]);
                                }
-                               if(flac__utils_fwrite(u8buffer, 1, sample, fout) != sample)
-                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+                               bytes_to_write = sample;
                        }
-                       else if(bps == 16) {
+                       else if(bps+shift == 16) {
                                if(is_unsigned_samples) {
                                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                                for(channel = 0; channel < channels; channel++, sample++)
@@ -834,10 +907,9 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
                                                u8buffer[byte+1] = tmp;
                                        }
                                }
-                               if(flac__utils_fwrite(u16buffer, 2, sample, fout) != sample)
-                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+                               bytes_to_write = 2 * sample;
                        }
-                       else if(bps == 24) {
+                       else if(bps+shift == 24) {
                                if(is_unsigned_samples) {
                                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                                for(channel = 0; channel < channels; channel++, sample++)
@@ -880,23 +952,35 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
                                                byte++;
                                        }
                                }
-                               if(flac__utils_fwrite(u8buffer, 3, sample, fout) != sample)
-                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+                               bytes_to_write = 3 * sample;
                        }
                        else {
                                FLAC__ASSERT(0);
+                               /* double protection */
+                               decoder_session->abort_flag = true;
+                               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
                        }
                }
        }
+       if(bytes_to_write > 0) {
+               if(flac__utils_fwrite(u8buffer, 1, bytes_to_write, fout) != bytes_to_write) {
+                       /* if a pipe closed when writing to stdout, we let it go without an error message */
+                       if(errno == EPIPE && decoder_session->fout == stdout)
+                               decoder_session->aborting_due_to_until = true;
+                       decoder_session->abort_flag = true;
+                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+               }
+       }
        return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
-void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 {
        DecoderSession *decoder_session = (DecoderSession*)client_data;
        (void)decoder;
        if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
                FLAC__uint64 skip, until;
+               decoder_session->got_stream_info = true;
                decoder_session->bps = metadata->data.stream_info.bits_per_sample;
                decoder_session->channels = metadata->data.stream_info.channels;
                decoder_session->sample_rate = metadata->data.stream_info.sample_rate;
@@ -907,15 +991,16 @@ void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata
 
                /* remember, metadata->data.stream_info.total_samples can be 0, meaning 'unknown' */
                if(metadata->data.stream_info.total_samples > 0 && skip >= metadata->data.stream_info.total_samples) {
-                       fprintf(stderr, "%s: ERROR trying to --skip more samples than in stream\n", decoder_session->inbasefilename);
+                       flac__utils_printf(stderr, 1, "%s: ERROR trying to --skip more samples than in stream\n", decoder_session->inbasefilename);
                        decoder_session->abort_flag = true;
                        return;
                }
                else if(metadata->data.stream_info.total_samples == 0 && skip > 0) {
-                       fprintf(stderr, "%s: ERROR, can't --skip when FLAC metadata has total sample count of 0\n", decoder_session->inbasefilename);
+                       flac__utils_printf(stderr, 1, "%s: ERROR, can't --skip when FLAC metadata has total sample count of 0\n", decoder_session->inbasefilename);
                        decoder_session->abort_flag = true;
                        return;
                }
+               FLAC__ASSERT(skip == 0 || 0 == decoder_session->cue_specification);
                decoder_session->total_samples = metadata->data.stream_info.total_samples - skip;
 
                /* note that we use metadata->data.stream_info.total_samples instead of decoder_session->total_samples */
@@ -926,180 +1011,120 @@ void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata
                FLAC__ASSERT(decoder_session->until_specification->value.samples >= 0);
                until = (FLAC__uint64)decoder_session->until_specification->value.samples;
 
-               if(until > 0)
+               if(until > 0) {
+                       FLAC__ASSERT(decoder_session->total_samples != 0);
+                       FLAC__ASSERT(0 == decoder_session->cue_specification);
                        decoder_session->total_samples -= (metadata->data.stream_info.total_samples - until);
+               }
 
-               if(decoder_session->bps != 8 && decoder_session->bps != 16 && decoder_session->bps != 24) {
-                       fprintf(stderr, "%s: ERROR: bits per sample is not 8/16/24\n", decoder_session->inbasefilename);
+               if(decoder_session->bps < 4 || decoder_session->bps > 24) {
+                       flac__utils_printf(stderr, 1, "%s: ERROR: bits per sample is %u, must be 4-24\n", decoder_session->inbasefilename, decoder_session->bps);
+                       decoder_session->abort_flag = true;
+                       return;
+               }
+       }
+       else if(metadata->type == FLAC__METADATA_TYPE_CUESHEET) {
+               /* remember, at this point, decoder_session->total_samples can be 0, meaning 'unknown' */
+               if(decoder_session->total_samples == 0) {
+                       flac__utils_printf(stderr, 1, "%s: ERROR can't use --cue when FLAC metadata has total sample count of 0\n", decoder_session->inbasefilename);
                        decoder_session->abort_flag = true;
                        return;
                }
 
-               /* write the WAVE/AIFF headers if necessary */
-               if(!decoder_session->analysis_mode && !decoder_session->test_only && (decoder_session->is_wave_out || decoder_session->is_aiff_out)) {
-                       const char *fmt_desc = decoder_session->is_wave_out? "WAVE" : "AIFF";
-                       FLAC__uint64 data_size = decoder_session->total_samples * decoder_session->channels * ((decoder_session->bps+7)/8);
-                       if(decoder_session->total_samples == 0) {
-                               if(decoder_session->fout == stdout) {
-                                       fprintf(stderr, "%s: WARNING, don't have accurate sample count available for %s header.\n", decoder_session->inbasefilename, fmt_desc);
-                                       fprintf(stderr, "             Generated %s file will have a data chunk size of 0.  Try\n", fmt_desc);
-                                       fprintf(stderr, "             decoding directly to a file instead.\n");
-                               }
-                               else {
-                                       decoder_session->wave_chunk_size_fixup.needs_fixup = true;
-                               }
-                       }
-                       if(data_size >= 0xFFFFFFDC) {
-                               fprintf(stderr, "%s: ERROR: stream is too big to fit in a single %s file chunk\n", decoder_session->inbasefilename, fmt_desc);
-                               decoder_session->abort_flag = true;
-                               return;
-                       }
-                       if(decoder_session->is_wave_out) {
-                               if(flac__utils_fwrite("RIFF", 1, 4, decoder_session->fout) != 4)
-                                       decoder_session->abort_flag = true;
-
-                               if(decoder_session->wave_chunk_size_fixup.needs_fixup)
-                                       decoder_session->wave_chunk_size_fixup.riff_offset = ftell(decoder_session->fout);
-
-                               if(!write_little_endian_uint32(decoder_session->fout, (FLAC__uint32)(data_size+36))) /* filesize-8 */
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("WAVEfmt ", 1, 8, decoder_session->fout) != 8)
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("\020\000\000\000", 1, 4, decoder_session->fout) != 4) /* chunk size = 16 */
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("\001\000", 1, 2, decoder_session->fout) != 2) /* compression code == 1 */
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_little_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->channels)))
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_little_endian_uint32(decoder_session->fout, decoder_session->sample_rate))
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_little_endian_uint32(decoder_session->fout, decoder_session->sample_rate * decoder_session->channels * ((decoder_session->bps+7) / 8))) /* @@@ or is it (sample_rate*channels*bps) / 8 ??? */
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_little_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->channels * ((decoder_session->bps+7) / 8)))) /* block align */
-                                       decoder_session->abort_flag = true;
+               flac__utils_canonicalize_cue_specification(decoder_session->cue_specification, &metadata->data.cue_sheet, decoder_session->total_samples, decoder_session->skip_specification, decoder_session->until_specification);
 
-                               if(!write_little_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->bps))) /* bits per sample */
-                                       decoder_session->abort_flag = true;
+               FLAC__ASSERT(!decoder_session->skip_specification->is_relative);
+               FLAC__ASSERT(decoder_session->skip_specification->value_is_samples);
 
-                               if(flac__utils_fwrite("data", 1, 4, decoder_session->fout) != 4)
-                                       decoder_session->abort_flag = true;
+               FLAC__ASSERT(!decoder_session->until_specification->is_relative);
+               FLAC__ASSERT(decoder_session->until_specification->value_is_samples);
 
-                               if(decoder_session->wave_chunk_size_fixup.needs_fixup)
-                                       decoder_session->wave_chunk_size_fixup.data_offset = ftell(decoder_session->fout);
+               FLAC__ASSERT(decoder_session->skip_specification->value.samples >= 0);
+               FLAC__ASSERT(decoder_session->until_specification->value.samples >= 0);
+               FLAC__ASSERT((FLAC__uint64)decoder_session->until_specification->value.samples <= decoder_session->total_samples);
+               FLAC__ASSERT(decoder_session->skip_specification->value.samples <= decoder_session->until_specification->value.samples);
 
-                               if(!write_little_endian_uint32(decoder_session->fout, (FLAC__uint32)data_size)) /* data size */
-                                       decoder_session->abort_flag = true;
+               decoder_session->total_samples = decoder_session->until_specification->value.samples - decoder_session->skip_specification->value.samples;
+       }
+       else if(metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
+               if (decoder_session->replaygain.spec.apply) {
+                       double reference, gain, peak;
+                       if (!(decoder_session->replaygain.apply = grabbag__replaygain_load_from_vorbiscomment(metadata, decoder_session->replaygain.spec.use_album_gain, /*strict=*/false, &reference, &gain, &peak))) {
+                               flac__utils_printf(stderr, 1, "%s: WARNING: can't get %s (or even %s) ReplayGain tags\n", decoder_session->inbasefilename, decoder_session->replaygain.spec.use_album_gain? "album":"track", decoder_session->replaygain.spec.use_album_gain? "track":"album");
                        }
                        else {
-                               const FLAC__uint32 aligned_data_size = (FLAC__uint32)((data_size+1) & (~1U));
-
-                               if(flac__utils_fwrite("FORM", 1, 4, decoder_session->fout) != 4)
-                                       decoder_session->abort_flag = true;
-
-                               if(decoder_session->wave_chunk_size_fixup.needs_fixup)
-                                       decoder_session->wave_chunk_size_fixup.riff_offset = ftell(decoder_session->fout);
-
-                               if(!write_big_endian_uint32(decoder_session->fout, (FLAC__uint32)(aligned_data_size+46))) /* filesize-8 */
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("AIFFCOMM", 1, 8, decoder_session->fout) != 8)
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("\000\000\000\022", 1, 4, decoder_session->fout) != 4) /* chunk size = 18 */
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_big_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->channels)))
-                                       decoder_session->abort_flag = true;
-
-                               if(decoder_session->wave_chunk_size_fixup.needs_fixup)
-                                       decoder_session->wave_chunk_size_fixup.frames_offset = ftell(decoder_session->fout);
-
-                               if(!write_big_endian_uint32(decoder_session->fout, (FLAC__uint32)decoder_session->total_samples))
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_big_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->bps)))
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_sane_extended(decoder_session->fout, decoder_session->sample_rate))
-                                       decoder_session->abort_flag = true;
-
-                               if(flac__utils_fwrite("SSND", 1, 4, decoder_session->fout) != 4)
-                                       decoder_session->abort_flag = true;
-
-                               if(decoder_session->wave_chunk_size_fixup.needs_fixup)
-                                       decoder_session->wave_chunk_size_fixup.data_offset = ftell(decoder_session->fout);
-
-                               if(!write_big_endian_uint32(decoder_session->fout, (FLAC__uint32)data_size+8)) /* data size */
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_big_endian_uint32(decoder_session->fout, 0/*offset*/))
-                                       decoder_session->abort_flag = true;
-
-                               if(!write_big_endian_uint32(decoder_session->fout, 0/*block_size*/))
-                                       decoder_session->abort_flag = true;
+                               const char *ls[] = { "no", "peak", "hard" };
+                               const char *ns[] = { "no", "low", "medium", "high" };
+                               decoder_session->replaygain.scale = grabbag__replaygain_compute_scale_factor(peak, gain, decoder_session->replaygain.spec.preamp, decoder_session->replaygain.spec.limiter == RGSS_LIMIT__PEAK);
+                               FLAC__ASSERT(decoder_session->bps > 0 && decoder_session->bps <= 32);
+                               FLAC__replaygain_synthesis__init_dither_context(&decoder_session->replaygain.dither_context, decoder_session->bps, decoder_session->replaygain.spec.noise_shaping);
+                               flac__utils_printf(stderr, 1, "%s: INFO: applying %s ReplayGain (gain=%0.2fdB+preamp=%0.1fdB, %s noise shaping, %s limiting) to output\n", decoder_session->inbasefilename, decoder_session->replaygain.spec.use_album_gain? "album":"track", gain, decoder_session->replaygain.spec.preamp, ns[decoder_session->replaygain.spec.noise_shaping], ls[decoder_session->replaygain.spec.limiter]);
+                               flac__utils_printf(stderr, 1, "%s: WARNING: applying ReplayGain is not lossless\n", decoder_session->inbasefilename);
                        }
                }
+               (void)flac__utils_get_channel_mask_tag(metadata, &decoder_session->channel_mask);
        }
 }
 
-void error_callback(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
 {
        DecoderSession *decoder_session = (DecoderSession*)client_data;
        (void)decoder;
-       fprintf(stderr, "%s: *** Got error code %d:%s\n", decoder_session->inbasefilename, status, FLAC__StreamDecoderErrorStatusString[status]);
-       if(!decoder_session->continue_through_decode_errors)
+       flac__utils_printf(stderr, 1, "%s: *** Got error code %d:%s\n", decoder_session->inbasefilename, status, FLAC__StreamDecoderErrorStatusString[status]);
+       if(!decoder_session->continue_through_decode_errors) {
                decoder_session->abort_flag = true;
+               if(status == FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM)
+                       decoder_session->aborting_due_to_unparseable = true;
+       }
 }
 
-void print_error_with_state(const DecoderSession *d, const char *message)
+void print_error_with_init_status(const DecoderSession *d, const char *message, FLAC__StreamDecoderInitStatus init_status)
 {
        const int ilen = strlen(d->inbasefilename) + 1;
 
-       fprintf(stderr, "\n%s: %s\n", d->inbasefilename, message);
+       flac__utils_printf(stderr, 1, "\n%s: %s\n", d->inbasefilename, message);
 
-#ifdef FLAC__HAS_OGG
-       if(d->is_ogg) {
-               const OggFLAC__StreamDecoderState osd_state = OggFLAC__stream_decoder_get_state(d->decoder.ogg.stream);
-               if(osd_state != OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR) {
-                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)osd_state, OggFLAC__StreamDecoderStateString[osd_state]);
-               }
-               else {
-                       const FLAC__StreamDecoderState fsd_state = OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(d->decoder.ogg.stream);
-                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsd_state, FLAC__StreamDecoderStateString[fsd_state]);
-               }
+       flac__utils_printf(stderr, 1, "%*s init status = %s\n", ilen, "", FLAC__StreamDecoderInitStatusString[init_status]);
+
+       /* print out some more info for some errors: */
+       if (init_status == FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE) {
+               flac__utils_printf(stderr, 1,
+                       "\n"
+                       "An error occurred opening the input file; it is likely that it does not exist\n"
+                       "or is not readable.\n"
+               );
        }
-       else
-#endif
-       {
-               const FLAC__FileDecoderState ffd_state = FLAC__file_decoder_get_state(d->decoder.flac.file);
-               if(ffd_state != FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR) {
-                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)ffd_state, FLAC__FileDecoderStateString[ffd_state]);
-               }
-               else {
-                       const FLAC__SeekableStreamDecoderState fssd_state = FLAC__file_decoder_get_seekable_stream_decoder_state(d->decoder.flac.file);
-                       if(fssd_state != FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
-                               fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fssd_state, FLAC__SeekableStreamDecoderStateString[fssd_state]);
-                       }
-                       else {
-                               const FLAC__StreamDecoderState fsd_state = FLAC__file_decoder_get_stream_decoder_state(d->decoder.flac.file);
-                               fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsd_state, FLAC__StreamDecoderStateString[fsd_state]);
-                       }
-               }
+}
+
+void print_error_with_state(const DecoderSession *d, const char *message)
+{
+       const int ilen = strlen(d->inbasefilename) + 1;
+
+       flac__utils_printf(stderr, 1, "\n%s: %s\n", d->inbasefilename, message);
+       flac__utils_printf(stderr, 1, "%*s state = %s\n", ilen, "", FLAC__stream_decoder_get_resolved_state_string(d->decoder));
+
+       /* print out some more info for some errors: */
+       if (d->aborting_due_to_unparseable) {
+               flac__utils_printf(stderr, 1,
+                       "\n"
+                       "The FLAC stream may have been created by a more advanced encoder.  Try\n"
+                       "  metaflac --show-vendor-tag %s\n"
+                       "If the version number is greater than %s, this decoder is probably\n"
+                       "not able to decode the file.  If the version number is not, the file\n"
+                       "may be corrupted, or you may have found a bug.  In this case please\n"
+                       "submit a bug report to\n"
+                       "    http://sourceforge.net/bugs/?func=addbug&group_id=13478\n"
+                       "Make sure to use the \"Monitor\" feature to monitor the bug status.\n",
+                       d->inbasefilename, FLAC__VERSION_STRING
+               );
        }
 }
 
 void print_stats(const DecoderSession *decoder_session)
 {
-       if(decoder_session->verbose) {
+       if(flac__utils_verbosity_ >= 2) {
 #if defined _MSC_VER || defined __MINGW32__
-               /* with VC++ you have to spoon feed it the casting */
+               /* with MSVC you have to spoon feed it the casting */
                const double progress = (double)(FLAC__int64)decoder_session->samples_processed / (double)(FLAC__int64)decoder_session->total_samples * 100.0;
 #else
                const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0;