ugh, it's FLAC__ASSERT() not FLAC__assert()
[platform/upstream/flac.git] / src / flac / decode.c
index ca11898..fec9b17 100644 (file)
@@ -1,5 +1,5 @@
 /* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001  Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if defined _WIN32 && !defined __CYGWIN__
 /* where MSVC puts unlink() */
 # include <io.h>
 #else
 # include <unistd.h>
 #endif
-#include <stdio.h> /* for FILE */
+#include <math.h> /* for floor() */
+#include <stdio.h> /* for FILE et al. */
 #include <string.h> /* for strcmp() */
 #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 {
-       FILE *fout;
-       bool abort_flag;
-       bool test_only;
-       bool is_wave_out;
-       bool is_big_endian;
-       bool is_unsigned_samples;
-       uint64 total_samples;
+#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;
+
+       struct {
+               replaygain_synthesis_spec_t spec;
+               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) */
+
+       const char *inbasefilename;
+       const char *outfilename;
+
+       FLAC__uint64 samples_processed;
+       unsigned frame_counter;
+       FLAC__bool abort_flag;
+
+       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 is_big_endian;
+       FLAC__bool is_unsigned_samples;
+       FLAC__uint64 total_samples;
        unsigned bps;
        unsigned channels;
        unsigned sample_rate;
-       bool verbose;
-       uint64 skip;
-       uint64 samples_processed;
-       unsigned frame_counter;
-} stream_info_struct;
 
-static FLAC__FileDecoder *decoder;
-static bool is_big_endian_host;
+       union {
+               union {
+                       FLAC__FileDecoder *file;
+               } flac;
+#ifdef FLAC__HAS_OGG
+               union {
+                       OggFLAC__StreamDecoder *stream;
+               } ogg;
+#endif
+       } decoder;
+
+#ifdef FLAC__HAS_OGG
+       FILE *fin;
+#endif
+       FILE *fout;
+} DecoderSession;
+
+
+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, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_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_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 void print_error_with_state(const DecoderSession *d, const char *message);
+static void print_stats(const DecoderSession *decoder_session);
 
-/* local routines */
-static bool init(const char *infile, stream_info_struct *stream_info);
-static bool write_little_endian_uint16(FILE *f, uint16 val);
-static bool write_little_endian_uint32(FILE *f, uint32 val);
-static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data);
-static void metadata_callback(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data);
-static void error_callback(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-static void print_stats(const stream_info_struct *stream_info);
 
-int decode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip)
+/*
+ * public routines
+ */
+int flac__decode_aiff(const char *infilename, const char *outfilename, FLAC__bool analysis_mode, analysis_options aopts, wav_decode_options_t options)
 {
-       bool md5_failure = false;
-       stream_info_struct stream_info;
-
-       decoder = 0;
-       stream_info.abort_flag = false;
-       stream_info.test_only = (outfile == 0);
-       stream_info.is_wave_out = true;
-       stream_info.verbose = verbose;
-       stream_info.skip = skip;
-       stream_info.samples_processed = 0;
-       stream_info.frame_counter = 0;
-
-       if(!stream_info.test_only) {
-               if(0 == strcmp(outfile, "-")) {
-                       stream_info.fout = stdout;
+       DecoderSession decoder_session;
+
+       if(!
+               DecoderSession_construct(
+                       &decoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.is_ogg,
+#else
+                       /*is_ogg=*/false,
+#endif
+                       options.common.verbose,
+                       /*is_aiff_out=*/true,
+                       /*is_wave_out=*/false,
+                       options.common.continue_through_decode_errors,
+                       options.common.replaygain_synthesis_spec,
+                       analysis_mode,
+                       aopts,
+                       &options.common.skip_specification,
+                       &options.common.until_specification,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
+
+       if(!DecoderSession_init_decoder(&decoder_session, options.common, infilename))
+               return DecoderSession_finish_error(&decoder_session);
+
+       if(!DecoderSession_process(&decoder_session))
+               return DecoderSession_finish_error(&decoder_session);
+
+       return DecoderSession_finish_ok(&decoder_session);
+}
+
+int flac__decode_wav(const char *infilename, const char *outfilename, FLAC__bool analysis_mode, analysis_options aopts, wav_decode_options_t options)
+{
+       DecoderSession decoder_session;
+
+       if(!
+               DecoderSession_construct(
+                       &decoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.is_ogg,
+#else
+                       /*is_ogg=*/false,
+#endif
+                       options.common.verbose,
+                       /*is_aiff_out=*/false,
+                       /*is_wave_out=*/true,
+                       options.common.continue_through_decode_errors,
+                       options.common.replaygain_synthesis_spec,
+                       analysis_mode,
+                       aopts,
+                       &options.common.skip_specification,
+                       &options.common.until_specification,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
+
+       if(!DecoderSession_init_decoder(&decoder_session, options.common, infilename))
+               return DecoderSession_finish_error(&decoder_session);
+
+       if(!DecoderSession_process(&decoder_session))
+               return DecoderSession_finish_error(&decoder_session);
+
+       return DecoderSession_finish_ok(&decoder_session);
+}
+
+int flac__decode_raw(const char *infilename, const char *outfilename, FLAC__bool analysis_mode, analysis_options aopts, raw_decode_options_t options)
+{
+       DecoderSession decoder_session;
+
+       decoder_session.is_big_endian = options.is_big_endian;
+       decoder_session.is_unsigned_samples = options.is_unsigned_samples;
+
+       if(!
+               DecoderSession_construct(
+                       &decoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.is_ogg,
+#else
+                       /*is_ogg=*/false,
+#endif
+                       options.common.verbose,
+                       /*is_aiff_out=*/false,
+                       /*is_wave_out=*/false,
+                       options.common.continue_through_decode_errors,
+                       options.common.replaygain_synthesis_spec,
+                       analysis_mode,
+                       aopts,
+                       &options.common.skip_specification,
+                       &options.common.until_specification,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
+
+       if(!DecoderSession_init_decoder(&decoder_session, options.common, infilename))
+               return DecoderSession_finish_error(&decoder_session);
+
+       if(!DecoderSession_process(&decoder_session))
+               return DecoderSession_finish_error(&decoder_session);
+
+       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, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool analysis_mode, analysis_options aopts, utils__SkipUntilSpecification *skip_specification, utils__SkipUntilSpecification *until_specification, const char *infilename, const char *outfilename)
+{
+#ifdef FLAC__HAS_OGG
+       d->is_ogg = is_ogg;
+#else
+       (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->replaygain.spec = replaygain_synthesis_spec;
+       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->inbasefilename = grabbag__file_get_basename(infilename);
+       d->outfilename = outfilename;
+
+       d->samples_processed = 0;
+       d->frame_counter = 0;
+       d->abort_flag = false;
+
+       d->wave_chunk_size_fixup.needs_fixup = false;
+
+       d->decoder.flac.file = 0;
+#ifdef FLAC__HAS_OGG
+       d->decoder.ogg.stream = 0;
+#endif
+
+#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));
+
+       if(!d->test_only) {
+               if(0 == strcmp(outfilename, "-")) {
+                       d->fout = grabbag__file_get_binary_stdout();
                }
                else {
-                       if(0 == (stream_info.fout = fopen(outfile, "wb"))) {
-                               fprintf(stderr, "ERROR: can't open output file %s\n", outfile);
+                       if(0 == (d->fout = fopen(outfilename, "wb"))) {
+                               fprintf(stderr, "%s: ERROR: can't open output file %s\n", d->inbasefilename, outfilename);
+                               DecoderSession_destroy(d, /*error_occurred=*/true);
                                return false;
                        }
                }
        }
 
-       if(!init(infile, &stream_info))
-               goto wav_abort_;
-
-       if(skip > 0) {
-               if(!FLAC__file_decoder_process_metadata(decoder)) {
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto wav_abort_;
-               }
-               if(!FLAC__file_decoder_seek_absolute(decoder, skip)) {
-                       fprintf(stderr, "%s: ERROR seeking while skipping bytes\n", infile);
-                       goto wav_abort_;
+#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;
+                       }
                }
-               if(!FLAC__file_decoder_process_remaining_frames(decoder)) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto wav_abort_;
+       }
+#endif
+
+       if(analysis_mode)
+               flac__analyze_init(aopts);
+
+       return true;
+}
+
+void DecoderSession_destroy(DecoderSession *d, FLAC__bool error_occurred)
+{
+       if(0 != d->fout && d->fout != stdout) {
+               fclose(d->fout);
+               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__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();
+
+               if(0 == decoder_session->decoder.ogg.stream) {
+                       fprintf(stderr, "%s: ERROR creating the decoder instance\n", decoder_session->inbasefilename);
+                       return false;
                }
-               if(decoder->state != FLAC__FILE_DECODER_OK && decoder->state != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto wav_abort_;
+
+               if(!decode_options.use_first_serial_number)
+                       OggFLAC__stream_decoder_set_serial_number(decoder_session->decoder.ogg.stream, decode_options.serial_number);
+               if (decoder_session->replaygain.spec.apply)
+                       OggFLAC__stream_decoder_set_metadata_respond(decoder_session->decoder.ogg.stream, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
+               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;
                }
        }
-       else {
-               if(!FLAC__file_decoder_process_whole_file(decoder)) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto wav_abort_;
+       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;
                }
-               if(decoder->state != FLAC__FILE_DECODER_OK && decoder->state != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding, state=%d:%s\n", infile, decoder->state, FLAC__FileDecoderStateString[decoder->state]);
-                       goto wav_abort_;
+
+               FLAC__file_decoder_set_md5_checking(decoder_session->decoder.flac.file, true);
+               FLAC__file_decoder_set_filename(decoder_session->decoder.flac.file, infilename);
+               if (decoder_session->replaygain.spec.apply)
+                       FLAC__file_decoder_set_metadata_respond(decoder_session->decoder.flac.file, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+               /*
+                * 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(decoder) {
-               if(decoder->state != FLAC__FILE_DECODER_UNINITIALIZED)
-                       md5_failure = !FLAC__file_decoder_finish(decoder);
-               print_stats(&stream_info);
-               FLAC__file_decoder_free_instance(decoder);
-       }
-       if(!stream_info.test_only)
-               fclose(stream_info.fout);
-       if(verbose)
-               printf("\n");
-       fflush(stdout);
-       if(md5_failure) {
-               fprintf(stderr, "%s: WARNING, MD5 signature mismatch\n", infile);
-               return 1;
-       }
-       else {
-               if(stream_info.test_only)
-                       printf("%s: ok\n", infile);
-       }
-       return 0;
-wav_abort_:
-       if(decoder) {
-               if(decoder->state != FLAC__FILE_DECODER_UNINITIALIZED)
-                       FLAC__file_decoder_finish(decoder);
-               FLAC__file_decoder_free_instance(decoder);
-       }
-       if(!stream_info.test_only) {
-               fclose(stream_info.fout);
-               unlink(outfile);
-       }
-       return 1;
+       return true;
 }
 
-int decode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool is_big_endian, bool is_unsigned_samples)
+FLAC__bool DecoderSession_process(DecoderSession *d)
 {
-       bool md5_failure = false;
-       stream_info_struct stream_info;
-
-       decoder = 0;
-       stream_info.abort_flag = false;
-       stream_info.test_only = (outfile == 0);
-       stream_info.is_wave_out = false;
-       stream_info.is_big_endian = is_big_endian;
-       stream_info.is_unsigned_samples = is_unsigned_samples;
-       stream_info.verbose = verbose;
-       stream_info.skip = skip;
-       stream_info.samples_processed = 0;
-       stream_info.frame_counter = 0;
-
-       if(!stream_info.test_only) {
-               if(0 == strcmp(outfile, "-")) {
-                       stream_info.fout = stdout;
+#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");
+                       return false;
                }
-               else {
-                       if(0 == (stream_info.fout = fopen(outfile, "wb"))) {
-                               fprintf(stderr, "ERROR: can't open output file %s\n", outfile);
-                               return false;
-                       }
+               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
+#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;
+               }
+               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");
+                       return false;
+               }
+       }
+       if(d->abort_flag)
+               return false;
 
-       if(!init(infile, &stream_info))
-               goto raw_abort_;
+       if(d->skip_specification->value.samples > 0) {
+               const FLAC__uint64 skip = (FLAC__uint64)d->skip_specification->value.samples;
 
-       if(skip > 0) {
-               if(!FLAC__file_decoder_process_metadata(decoder)) {
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto raw_abort_;
+#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;
                }
-               if(!FLAC__file_decoder_seek_absolute(decoder, skip)) {
-                       fprintf(stderr, "%s: ERROR seeking while skipping bytes\n", infile);
-                       goto raw_abort_;
+#endif
+               if(!FLAC__file_decoder_seek_absolute(d->decoder.flac.file, skip)) {
+                       print_error_with_state(d, "ERROR seeking while skipping bytes");
+                       return false;
                }
-               if(!FLAC__file_decoder_process_remaining_frames(decoder)) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto raw_abort_;
+               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(decoder->state != FLAC__FILE_DECODER_OK && decoder->state != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto raw_abort_;
+               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;
                }
        }
        else {
-               if(!FLAC__file_decoder_process_whole_file(decoder)) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto raw_abort_;
+#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;
+                       }
                }
-               if(decoder->state != FLAC__FILE_DECODER_OK && decoder->state != FLAC__FILE_DECODER_END_OF_FILE) {
-                       if(verbose) { printf("\n"); fflush(stdout); }
-                       fprintf(stderr, "%s: ERROR during decoding\n", infile);
-                       goto raw_abort_;
+               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(decoder) {
-               if(decoder->state != FLAC__FILE_DECODER_UNINITIALIZED)
-                       md5_failure = !FLAC__file_decoder_finish(decoder);
-               print_stats(&stream_info);
-               FLAC__file_decoder_free_instance(decoder);
+       if(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");
+                       return false;
+               }
        }
-       if(!stream_info.test_only)
-               fclose(stream_info.fout);
-       if(verbose)
-               printf("\n");
-       fflush(stdout);
+
+       return true;
+}
+
+int DecoderSession_finish_ok(DecoderSession *d)
+{
+       FLAC__bool 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->analysis_mode)
+               flac__analyze_finish(d->aopts);
        if(md5_failure) {
-               fprintf(stderr, "%s: WARNING, MD5 signature mismatch\n", infile);
-               return 1;
+               fprintf(stderr, "\r%s: WARNING, MD5 signature mismatch\n", d->inbasefilename);
        }
        else {
-               if(stream_info.test_only)
-                       printf("%s: ok\n", infile);
+               if(d->verbose)
+                       fprintf(stderr, "\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))
+                       return 1;
        return 0;
-raw_abort_:
-       if(decoder) {
-               if(decoder->state != FLAC__FILE_DECODER_UNINITIALIZED)
-                       FLAC__file_decoder_finish(decoder);
-               FLAC__file_decoder_free_instance(decoder);
+}
+
+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);
+               }
        }
-       if(!stream_info.test_only) {
-               fclose(stream_info.fout);
-               unlink(outfile);
+       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->analysis_mode)
+               flac__analyze_finish(d->aopts);
+       DecoderSession_destroy(d, /*error_occurred=*/true);
        return 1;
 }
 
-bool init(const char *infile, stream_info_struct *stream_info)
+FLAC__bool canonicalize_until_specification(utils__SkipUntilSpecification *spec, const char *inbasefilename, unsigned sample_rate, FLAC__uint64 skip, FLAC__uint64 total_samples_in_input)
 {
-       uint32 test = 1;
+       /* convert from mm:ss.sss to sample number if necessary */
+       flac__utils_canonicalize_skip_until_specification(spec, sample_rate);
 
-       is_big_endian_host = (*((byte*)(&test)))? false : true;
+       /* special case: if "--until=-0", use the special value '0' to mean "end-of-stream" */
+       if(spec->is_relative && spec->value.samples == 0) {
+               spec->is_relative = false;
+               return true;
+       }
 
-       decoder = FLAC__file_decoder_get_new_instance();
-       if(0 == decoder) {
-               fprintf(stderr, "ERROR creating the decoder instance\n");
+       /* 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);
                return false;
        }
-       decoder->check_md5 = true;
 
-       if(FLAC__file_decoder_init(decoder, infile, write_callback, metadata_callback, error_callback, stream_info) != FLAC__FILE_DECODER_OK) {
-               fprintf(stderr, "ERROR initializing decoder, state = %d\n", decoder->state);
+       FLAC__ASSERT(spec->value_is_samples);
+
+       /* convert relative specifications to absolute */
+       if(spec->is_relative) {
+               if(spec->value.samples <= 0)
+                       spec->value.samples += (FLAC__int64)total_samples_in_input;
+               else
+                       spec->value.samples += skip;
+               spec->is_relative = false;
+       }
+
+       /* error check */
+       if(spec->value.samples < 0) {
+               fprintf(stderr, "%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);
+               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);
                return false;
        }
 
        return true;
 }
 
-bool write_little_endian_uint16(FILE *f, uint16 val)
+FLAC__bool write_little_endian_uint16(FILE *f, FLAC__uint16 val)
 {
-       byte *b = (byte*)(&val);
-       if(is_big_endian_host) {
-               byte tmp;
+       FLAC__byte *b = (FLAC__byte*)(&val);
+       if(is_big_endian_host_) {
+               FLAC__byte tmp;
                tmp = b[1]; b[1] = b[0]; b[0] = tmp;
        }
-       return fwrite(b, 1, 2, f) == 2;
+       return flac__utils_fwrite(b, 1, 2, f) == 2;
 }
 
-bool write_little_endian_uint32(FILE *f, uint32 val)
+FLAC__bool write_little_endian_uint32(FILE *f, FLAC__uint32 val)
 {
-       byte *b = (byte*)(&val);
-       if(is_big_endian_host) {
-               byte tmp;
+       FLAC__byte *b = (FLAC__byte*)(&val);
+       if(is_big_endian_host_) {
+               FLAC__byte tmp;
                tmp = b[3]; b[3] = b[0]; b[0] = tmp;
                tmp = b[2]; b[2] = b[1]; b[1] = tmp;
        }
-       return fwrite(b, 1, 4, f) == 4;
+       return flac__utils_fwrite(b, 1, 4, f) == 4;
+}
+
+FLAC__bool write_big_endian_uint16(FILE *f, FLAC__uint16 val)
+{
+       FLAC__byte *b = (FLAC__byte*)(&val);
+       if(!is_big_endian_host_) {
+               FLAC__byte tmp;
+               tmp = b[1]; b[1] = b[0]; b[0] = tmp;
+       }
+       return flac__utils_fwrite(b, 1, 2, f) == 2;
+}
+
+FLAC__bool write_big_endian_uint32(FILE *f, FLAC__uint32 val)
+{
+       FLAC__byte *b = (FLAC__byte*)(&val);
+       if(!is_big_endian_host_) {
+               FLAC__byte tmp;
+               tmp = b[3]; b[3] = b[0]; b[0] = tmp;
+               tmp = b[2]; b[2] = b[1]; b[1] = tmp;
+       }
+       return flac__utils_fwrite(b, 1, 4, f) == 4;
+}
+
+FLAC__bool write_sane_extended(FILE *f, unsigned val)
+       /* Write to 'f' a SANE extended representation of 'val'.  Return false if
+       * the write succeeds; return true otherwise.
+       *
+       * SANE extended is an 80-bit IEEE-754 representation with sign bit, 15 bits
+       * of exponent, and 64 bits of significand (mantissa).  Unlike most IEEE-754
+       * representations, it does not imply a 1 above the MSB of the significand.
+       *
+       * Preconditions:
+       *  val!=0U
+       */
+{
+       unsigned int shift, exponent;
+
+       FLAC__ASSERT(val!=0U); /* handling 0 would require a special case */
+
+       for(shift= 0U; (val>>(31-shift))==0U; ++shift)
+               ;
+       val<<= shift;
+       exponent= 63U-(shift+32U); /* add 32 for unused second word */
+
+       if(!write_big_endian_uint16(f, (FLAC__uint16)(exponent+0x3FFF)))
+               return false;
+       if(!write_big_endian_uint32(f, val))
+               return false;
+       if(!write_big_endian_uint32(f, 0)) /* unused second word */
+               return false;
+
+       return true;
 }
 
-FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data)
+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)
 {
-       stream_info_struct *stream_info = (stream_info_struct *)client_data;
-       FILE *fout = stream_info->fout;
-       unsigned bps = stream_info->bps, channels = stream_info->channels;
-       bool is_big_endian = (stream_info->is_wave_out? false : stream_info->is_big_endian);
-       bool is_unsigned_samples = (stream_info->is_wave_out? bps==8 : stream_info->is_unsigned_samples);
-       unsigned wide_samples = header->blocksize, wide_sample, sample, channel, byte;
-       static signed char scbuffer[FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * ((FLAC__MAX_BITS_PER_SAMPLE+7)>>3)]; /* WATCHOUT: can be up to 2 megs */
-       unsigned char *ucbuffer = (unsigned char *)scbuffer;
-       signed short *ssbuffer = (signed short *)scbuffer;
-       unsigned short *usbuffer = (unsigned short *)scbuffer;
+       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;
+
+       if(0 == f) {
+               fprintf(stderr, "ERROR, couldn't open file %s while fixing up %s chunk size\n", outfilename, fmt_desc);
+               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);
+               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)
+{
+       DecoderSession *decoder_session = (DecoderSession*)client_data;
+       FILE *fout = decoder_session->fout;
+       const unsigned bps = frame->header.bits_per_sample, channels = frame->header.channels;
+       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;
+       static FLAC__int8 s8buffer[FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int32)]; /* WATCHOUT: can be up to 2 megs */
+       FLAC__uint8  *u8buffer  = (FLAC__uint8  *)s8buffer;
+       FLAC__int16  *s16buffer = (FLAC__int16  *)s8buffer;
+       FLAC__uint16 *u16buffer = (FLAC__uint16 *)s8buffer;
+       FLAC__int32  *s32buffer = (FLAC__int32  *)s8buffer;
+       FLAC__uint32 *u32buffer = (FLAC__uint32 *)s8buffer;
 
        (void)decoder;
 
-       if(stream_info->abort_flag)
-               return FLAC__STREAM_DECODER_WRITE_ABORT;
+       if(decoder_session->abort_flag)
+               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-       stream_info->samples_processed += wide_samples;
-       stream_info->frame_counter++;
+       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;
+       }
+       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;
+       }
+       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;
+       }
 
-       if(stream_info->verbose && !(stream_info->frame_counter & 0x1f))
-               print_stats(stream_info);
+       /*
+        * limit the number of samples to accept based on --until
+        */
+       FLAC__ASSERT(!decoder_session->skip_specification->is_relative);
+       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;
+               const FLAC__uint64 until = (FLAC__uint64)decoder_session->until_specification->value.samples;
+               const FLAC__uint64 input_samples_passed = skip + decoder_session->samples_processed;
+               FLAC__ASSERT(until >= input_samples_passed);
+               if(input_samples_passed + wide_samples > until)
+                       wide_samples = (unsigned)(until - input_samples_passed);
+       }
 
-       if(!stream_info->test_only) {
-               if(bps == 8) {
-                       if(is_unsigned_samples) {
-                               for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
-                                       for(channel = 0; channel < channels; channel++, sample++)
-                                               ucbuffer[sample] = buffer[channel][wide_sample] + 128;
-                       }
-                       else {
-                               for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
-                                       for(channel = 0; channel < channels; channel++, sample++)
-                                               scbuffer[sample] = buffer[channel][wide_sample];
+       if(wide_samples > 0) {
+               decoder_session->samples_processed += wide_samples;
+               decoder_session->frame_counter++;
+
+               if(decoder_session->verbose && !(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 (decoder_session->replaygain.spec.apply) {
+                               const size_t n = FLAC__replaygain_synthesis__apply_gain(
+                                       u8buffer,
+                                       is_big_endian,
+                                       is_unsigned_samples,
+                                       buffer,
+                                       wide_samples,
+                                       channels,
+                                       bps, /* source_bps */
+                                       bps, /* 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
+                               );
+                               if(flac__utils_fwrite(u8buffer, 1, n, fout) != n)
+                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
                        }
-                       if(fwrite(ucbuffer, 1, sample, fout) != sample)
-                               return FLAC__STREAM_DECODER_WRITE_ABORT;
-               }
-               else { /* bps == 16 */
-                       if(is_unsigned_samples) {
-                               for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
-                                       for(channel = 0; channel < channels; channel++, sample++)
-                                               usbuffer[sample] = buffer[channel][wide_sample] + 32768;
+                       else if(bps == 8) {
+                               if(is_unsigned_samples) {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               for(channel = 0; channel < channels; channel++, sample++)
+                                                       u8buffer[sample] = (FLAC__uint8)(buffer[channel][wide_sample] + 0x80);
+                               }
+                               else {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               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;
                        }
-                       else {
-                               for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
-                                       for(channel = 0; channel < channels; channel++, sample++)
-                                               ssbuffer[sample] = buffer[channel][wide_sample];
+                       else if(bps == 16) {
+                               if(is_unsigned_samples) {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               for(channel = 0; channel < channels; channel++, sample++)
+                                                       u16buffer[sample] = (FLAC__uint16)(buffer[channel][wide_sample] + 0x8000);
+                               }
+                               else {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               for(channel = 0; channel < channels; channel++, sample++)
+                                                       s16buffer[sample] = (FLAC__int16)(buffer[channel][wide_sample]);
+                               }
+                               if(is_big_endian != is_big_endian_host_) {
+                                       unsigned char tmp;
+                                       const unsigned bytes = sample * 2;
+                                       for(byte = 0; byte < bytes; byte += 2) {
+                                               tmp = u8buffer[byte];
+                                               u8buffer[byte] = u8buffer[byte+1];
+                                               u8buffer[byte+1] = tmp;
+                                       }
+                               }
+                               if(flac__utils_fwrite(u16buffer, 2, sample, fout) != sample)
+                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
                        }
-                       if(is_big_endian != is_big_endian_host) {
-                               unsigned char tmp;
-                               for(byte = 0; byte < sample<<1; byte += 2) {
-                                       tmp = ucbuffer[byte];
-                                       ucbuffer[byte] = ucbuffer[byte+1];
-                                       ucbuffer[byte+1] = tmp;
+                       else if(bps == 24) {
+                               if(is_unsigned_samples) {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               for(channel = 0; channel < channels; channel++, sample++)
+                                                       u32buffer[sample] = buffer[channel][wide_sample] + 0x800000;
+                               }
+                               else {
+                                       for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
+                                               for(channel = 0; channel < channels; channel++, sample++)
+                                                       s32buffer[sample] = buffer[channel][wide_sample];
+                               }
+                               if(is_big_endian != is_big_endian_host_) {
+                                       unsigned char tmp;
+                                       const unsigned bytes = sample * 4;
+                                       for(byte = 0; byte < bytes; byte += 4) {
+                                               tmp = u8buffer[byte];
+                                               u8buffer[byte] = u8buffer[byte+3];
+                                               u8buffer[byte+3] = tmp;
+                                               tmp = u8buffer[byte+1];
+                                               u8buffer[byte+1] = u8buffer[byte+2];
+                                               u8buffer[byte+2] = tmp;
+                                       }
                                }
+                               if(is_big_endian) {
+                                       unsigned lbyte;
+                                       const unsigned bytes = sample * 4;
+                                       for(lbyte = byte = 0; byte < bytes; ) {
+                                               byte++;
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                       }
+                               }
+                               else {
+                                       unsigned lbyte;
+                                       const unsigned bytes = sample * 4;
+                                       for(lbyte = byte = 0; byte < bytes; ) {
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                               u8buffer[lbyte++] = u8buffer[byte++];
+                                               byte++;
+                                       }
+                               }
+                               if(flac__utils_fwrite(u8buffer, 3, sample, fout) != sample)
+                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+                       }
+                       else {
+                               FLAC__ASSERT(0);
                        }
-                       if(fwrite(usbuffer, 2, sample, fout) != sample)
-                               return FLAC__STREAM_DECODER_WRITE_ABORT;
                }
        }
-       return FLAC__STREAM_DECODER_WRITE_CONTINUE;
+       return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
-void metadata_callback(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data)
+void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 {
-       stream_info_struct *stream_info = (stream_info_struct *)client_data;
+       DecoderSession *decoder_session = (DecoderSession*)client_data;
        (void)decoder;
-       if(metadata->type == FLAC__METADATA_TYPE_ENCODING) {
-               stream_info->total_samples = metadata->data.encoding.total_samples - stream_info->skip;
-               stream_info->bps = metadata->data.encoding.bits_per_sample;
-               stream_info->channels = metadata->data.encoding.channels;
-               stream_info->sample_rate = metadata->data.encoding.sample_rate;
-
-               if(stream_info->bps != 8 && stream_info->bps != 16) {
-                       fprintf(stderr, "ERROR: bits per sample is not 8 or 16\n");
-                       stream_info->abort_flag = true;
+       if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+               FLAC__uint64 skip, until;
+               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;
+
+               flac__utils_canonicalize_skip_until_specification(decoder_session->skip_specification, decoder_session->sample_rate);
+               FLAC__ASSERT(decoder_session->skip_specification->value.samples >= 0);
+               skip = (FLAC__uint64)decoder_session->skip_specification->value.samples;
+
+               /* 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);
+                       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);
+                       decoder_session->abort_flag = true;
                        return;
                }
+               decoder_session->total_samples = metadata->data.stream_info.total_samples - skip;
 
-               /* write the WAVE headers if necessary */
-               if(!stream_info->test_only && stream_info->is_wave_out) {
-                       uint64 data_size = stream_info->total_samples * stream_info->channels * ((stream_info->bps+7)/8);
+               /* note that we use metadata->data.stream_info.total_samples instead of decoder_session->total_samples */
+               if(!canonicalize_until_specification(decoder_session->until_specification, decoder_session->inbasefilename, decoder_session->sample_rate, skip, metadata->data.stream_info.total_samples)) {
+                       decoder_session->abort_flag = true;
+                       return;
+               }
+               FLAC__ASSERT(decoder_session->until_specification->value.samples >= 0);
+               until = (FLAC__uint64)decoder_session->until_specification->value.samples;
+
+               if(until > 0)
+                       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);
+                       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, "ERROR: stream is too big for a wave file\n");
-                               stream_info->abort_flag = true;
+                               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(fwrite("RIFF", 1, 4, stream_info->fout) != 4) stream_info->abort_flag = true;
-                       if(!write_little_endian_uint32(stream_info->fout, (uint32)(data_size+36))) stream_info->abort_flag = true; /* filesize-8 */
-                       if(fwrite("WAVEfmt ", 1, 8, stream_info->fout) != 8) stream_info->abort_flag = true;
-                       if(fwrite("\020\000\000\000", 1, 4, stream_info->fout) != 4) stream_info->abort_flag = true; /* chunk size = 16 */
-                       if(fwrite("\001\000", 1, 2, stream_info->fout) != 2) stream_info->abort_flag = true; /* compression code == 1 */
-                       if(!write_little_endian_uint16(stream_info->fout, (uint16)(stream_info->channels))) stream_info->abort_flag = true;
-                       if(!write_little_endian_uint32(stream_info->fout, stream_info->sample_rate)) stream_info->abort_flag = true;
-                       if(!write_little_endian_uint32(stream_info->fout, stream_info->sample_rate * stream_info->channels * ((stream_info->bps+7) / 8))) stream_info->abort_flag = true; /* @@@ or is it (sample_rate*channels*bps) / 8 ??? */
-                       if(!write_little_endian_uint16(stream_info->fout, (uint16)(stream_info->channels * ((stream_info->bps+7) / 8)))) stream_info->abort_flag = true; /* block align */
-                       if(!write_little_endian_uint16(stream_info->fout, (uint16)(stream_info->bps))) stream_info->abort_flag = true; /* bits per sample */
-                       if(fwrite("data", 1, 4, stream_info->fout) != 4) stream_info->abort_flag = true;
-                       if(!write_little_endian_uint32(stream_info->fout, (uint32)data_size)) stream_info->abort_flag = true; /* data size */
+                       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;
+
+                               if(!write_little_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->bps))) /* bits per sample */
+                                       decoder_session->abort_flag = true;
+
+                               if(flac__utils_fwrite("data", 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_little_endian_uint32(decoder_session->fout, (FLAC__uint32)data_size)) /* data size */
+                                       decoder_session->abort_flag = true;
+                       }
+                       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;
+                       }
+               }
+       }
+       else if(metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
+               if (decoder_session->replaygain.spec.apply) {
+                       double gain, peak;
+                       if (!(decoder_session->replaygain.spec.apply = grabbag__replaygain_load_from_vorbiscomment(metadata, decoder_session->replaygain.spec.use_album_gain, &gain, &peak))) {
+                               fprintf(stderr, "%s: WARNING: can't get %s ReplayGain tag\n", decoder_session->inbasefilename, decoder_session->replaygain.spec.use_album_gain? "album":"track");
+                       }
+                       else {
+                               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);
+                               fprintf(stderr, "%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]);
+                               fprintf(stderr, "%s: WARNING: applying ReplayGain is not lossless\n", decoder_session->inbasefilename);
+                       }
                }
        }
 }
 
-void error_callback(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+void error_callback(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
 {
-       stream_info_struct *stream_info = (stream_info_struct *)client_data;
+       DecoderSession *decoder_session = (DecoderSession*)client_data;
        (void)decoder;
-       fprintf(stderr, "*** Got error code %d\n", status);
-       stream_info->abort_flag = true;
+       fprintf(stderr, "%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;
 }
 
-void print_stats(const stream_info_struct *stream_info)
+void print_error_with_state(const DecoderSession *d, const char *message)
 {
-       if(stream_info->verbose) {
-               printf("\r%s %u of %u samples, %6.2f%% complete",
-                       stream_info->test_only? "tested" : "wrote",
-                       (unsigned)stream_info->samples_processed,
-                       (unsigned)stream_info->total_samples,
-#ifdef _MSC_VER
-                       /* with VC++ you have to spoon feed it the casting */
-                       (double)(int64)stream_info->samples_processed / (double)(int64)stream_info->total_samples * 100.0
+       const int ilen = strlen(d->inbasefilename) + 1;
+
+       fprintf(stderr, "\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]);
+               }
+       }
+       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_stats(const DecoderSession *decoder_session)
+{
+       if(decoder_session->verbose) {
+#if defined _MSC_VER || defined __MINGW32__
+               /* with VC++ 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
-                       (double)stream_info->samples_processed / (double)stream_info->total_samples * 100.0
+               const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0;
 #endif
-               );
-               fflush(stdout);
+               if(decoder_session->total_samples > 0) {
+                       fprintf(stderr, "\r%s: %s%u%% complete",
+                               decoder_session->inbasefilename,
+                               decoder_session->test_only? "testing, " : decoder_session->analysis_mode? "analyzing, " : "",
+                               (unsigned)floor(progress + 0.5)
+                       );
+               }
+               else {
+                       fprintf(stderr, "\r%s: %s %u samples",
+                               decoder_session->inbasefilename,
+                               decoder_session->test_only? "tested" : decoder_session->analysis_mode? "analyzed" : "wrote",
+                               (unsigned)decoder_session->samples_processed
+                       );
+               }
        }
 }