add utils.c, utils.h
[flac.git] / src / flac / encode.c
index f22addb..02da8eb 100644 (file)
@@ -1,5 +1,5 @@
 /* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001  Josh Coalson
+ * Copyright (C) 2000,2001,2002  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.
  */
 
-/*@@@ need to "_finish()" the verify decoder */
-
-#include <assert.h>
 #if defined _WIN32 && !defined __CYGWIN__
 /* where MSVC puts unlink() */
 # include <io.h>
 #else
 # include <unistd.h>
 #endif
-#include <stdio.h> /* for FILE et al. */
+#include <limits.h> /* for LONG_MAX */
+#include <math.h> /* for floor() */
+#include <stdarg.h>
+#include <stdio.h> /* for FILE etc. */
 #include <stdlib.h> /* for malloc */
 #include <string.h> /* for strcmp() */
 #include "FLAC/all.h"
+#include "share/grabbag.h"
 #include "encode.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef FLAC__HAS_OGG
+#include "OggFLAC/stream_encoder.h"
+#endif
+
 #ifdef min
 #undef min
 #endif
 #define min(x,y) ((x)<(y)?(x):(y))
 
+/* this MUST be >= 588 so that sector aligning can take place with one read */
 #define CHUNK_OF_SAMPLES 2048
 
-typedef enum {
-       FLAC__VERIFY_OK,
-       FLAC__VERIFY_FAILED_IN_FRAME,
-       FLAC__VERIFY_FAILED_IN_METADATA
-} verify_code;
-
-static const char *verify_code_string[] = {
-       "FLAC__VERIFY_OK",
-       "FLAC__VERIFY_FAILED_IN_FRAME",
-       "FLAC__VERIFY_FAILED_IN_METADATA"
-};
-
 typedef struct {
-       int32 *original[FLAC__MAX_CHANNELS];
-       unsigned size; /* of each original[] in samples */
-       unsigned tail; /* in wide samples */
-       const byte *encoded_signal;
-       unsigned encoded_signal_capacity;
-       unsigned encoded_bytes;
-       bool into_frames;
-       verify_code result;
-       FLAC__StreamDecoder *decoder;
-} verify_fifo_struct;
+#ifdef FLAC__HAS_OGG
+       FLAC__bool use_ogg;
+#endif
+       FLAC__bool verify;
+       FLAC__bool verbose;
+       FLAC__bool is_stdout;
+       const char *inbasefilename;
+       const char *outfilename;
+
+       FLAC__bool replay_gain;
+       unsigned channels;
+       unsigned bits_per_sample;
+       unsigned sample_rate;
+       FLAC__uint64 unencoded_size;
+       FLAC__uint64 total_samples_to_encode;
+       FLAC__uint64 bytes_written;
+       FLAC__uint64 samples_written;
+       unsigned blocksize;
+       unsigned stats_mask;
 
-typedef struct {
+       /*
+        * We use flac.stream for encoding native FLAC to stdout
+        * We use flac.file for encoding native FLAC to a regular file
+        * We use ogg.stream for encoding Ogg FLAC to either stdout or a regular file
+        */
+       union {
+               union {
+                       FLAC__StreamEncoder *stream;
+                       FLAC__FileEncoder *file;
+               } flac;
+#ifdef FLAC__HAS_OGG
+               union {
+                       OggFLAC__StreamEncoder *stream;
+               } ogg;
+#endif
+       } encoder;
+
+       FILE *fin;
        FILE *fout;
-       const char *outfile;
-       FLAC__Encoder *encoder;
-       bool verify;
-       bool verbose;
-       uint64 unencoded_size;
-       uint64 total_samples_to_encode;
-       uint64 bytes_written;
-       uint64 samples_written;
-       uint64 stream_offset; /* i.e. number of bytes before the first byte of the the first frame's header */
-       unsigned current_frame;
-       verify_fifo_struct verify_fifo;
-       FLAC__StreamMetaData_SeekTable seek_table;
-       unsigned first_seek_point_to_check;
-} encoder_wrapper_struct;
-
-static bool is_big_endian_host;
-
-static unsigned char ucbuffer[CHUNK_OF_SAMPLES*FLAC__MAX_CHANNELS*((FLAC__MAX_BITS_PER_SAMPLE+7)/8)];
-static signed char *scbuffer = (signed char *)ucbuffer;
-static uint16 *usbuffer = (uint16 *)ucbuffer;
-static int16 *ssbuffer = (int16 *)ucbuffer;
-
-static int32 in[FLAC__MAX_CHANNELS][CHUNK_OF_SAMPLES];
-static int32 *input[FLAC__MAX_CHANNELS];
-
-/* local routines */
-static bool init(encoder_wrapper_struct *encoder_wrapper);
-static bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, unsigned padding, char *requested_seek_points, int num_requested_seek_points, encoder_wrapper_struct *encoder_wrapper);
-static bool convert_to_seek_table(char *requested_seek_points, int num_requested_seek_points, uint64 stream_samples, unsigned blocksize, FLAC__StreamMetaData_SeekTable *seek_table);
-static void append_point_to_seek_table(FLAC__StreamMetaData_SeekTable *seek_table, uint64 sample, uint64 stream_samples, uint64 blocksize);
-static int seekpoint_compare(const FLAC__StreamMetaData_SeekPoint *l, const FLAC__StreamMetaData_SeekPoint *r);
-static void format_input(unsigned wide_samples, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, encoder_wrapper_struct *encoder_wrapper);
-static FLAC__EncoderWriteStatus write_callback(const FLAC__Encoder *encoder, const byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data);
-static void metadata_callback(const FLAC__Encoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data);
-static FLAC__StreamDecoderReadStatus verify_read_callback(const FLAC__StreamDecoder *decoder, byte buffer[], unsigned *bytes, void *client_data);
-static FLAC__StreamDecoderWriteStatus verify_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data);
-static void verify_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data);
-static void verify_error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-static void print_stats(const encoder_wrapper_struct *encoder_wrapper);
-static bool read_little_endian_uint16(FILE *f, uint16 *val, bool eof_ok);
-static bool read_little_endian_uint32(FILE *f, uint32 *val, bool eof_ok);
-static bool write_big_endian_uint16(FILE *f, uint16 val);
-static bool write_big_endian_uint64(FILE *f, uint64 val);
-
-int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding, char *requested_seek_points, int num_requested_seek_points)
+       FLAC__StreamMetadata *seek_table_template;
+} EncoderSession;
+
+
+static FLAC__bool is_big_endian_host_;
+
+static unsigned char ucbuffer_[CHUNK_OF_SAMPLES*FLAC__MAX_CHANNELS*((FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE+7)/8)];
+static signed char *scbuffer_ = (signed char *)ucbuffer_;
+static FLAC__uint16 *usbuffer_ = (FLAC__uint16 *)ucbuffer_;
+static FLAC__int16 *ssbuffer_ = (FLAC__int16 *)ucbuffer_;
+
+static FLAC__int32 in_[FLAC__MAX_CHANNELS][CHUNK_OF_SAMPLES];
+static FLAC__int32 *input_[FLAC__MAX_CHANNELS];
+
+
+/*
+ * unpublished debug routines from the FLAC libs
+ */
+extern FLAC__bool FLAC__stream_encoder_disable_constant_subframes(FLAC__StreamEncoder *encoder, FLAC__bool value);
+extern FLAC__bool FLAC__stream_encoder_disable_fixed_subframes(FLAC__StreamEncoder *encoder, FLAC__bool value);
+extern FLAC__bool FLAC__stream_encoder_disable_verbatim_subframes(FLAC__StreamEncoder *encoder, FLAC__bool value);
+extern FLAC__bool FLAC__file_encoder_disable_constant_subframes(FLAC__FileEncoder *encoder, FLAC__bool value);
+extern FLAC__bool FLAC__file_encoder_disable_fixed_subframes(FLAC__FileEncoder *encoder, FLAC__bool value);
+extern FLAC__bool FLAC__file_encoder_disable_verbatim_subframes(FLAC__FileEncoder *encoder, FLAC__bool value);
+extern FLAC__bool OggFLAC__stream_encoder_disable_constant_subframes(OggFLAC__StreamEncoder *encoder, FLAC__bool value);
+extern FLAC__bool OggFLAC__stream_encoder_disable_fixed_subframes(OggFLAC__StreamEncoder *encoder, FLAC__bool value);
+extern FLAC__bool OggFLAC__stream_encoder_disable_verbatim_subframes(OggFLAC__StreamEncoder *encoder, FLAC__bool value);
+
+/*
+ * local routines
+ */
+static FLAC__bool EncoderSession_construct(EncoderSession *e, FLAC__bool use_ogg, FLAC__bool verify, FLAC__bool verbose, FILE *infile, const char *infilename, const char *outfilename);
+static void EncoderSession_destroy(EncoderSession *e);
+static int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero);
+static int EncoderSession_finish_error(EncoderSession *e);
+static FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t options, unsigned channels, unsigned bps, unsigned sample_rate);
+static FLAC__bool EncoderSession_process(EncoderSession *e, const FLAC__int32 * const buffer[], unsigned samples);
+static FLAC__bool convert_to_seek_table_template(const char *requested_seek_points, int num_requested_seek_points, FLAC__StreamMetadata *cuesheet, EncoderSession *e);
+static void format_input(FLAC__int32 *dest[], unsigned wide_samples, FLAC__bool is_big_endian, FLAC__bool is_unsigned_samples, unsigned channels, unsigned bps);
+#ifdef FLAC__HAS_OGG
+static FLAC__StreamEncoderWriteStatus ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data);
+#endif
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data);
+static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void flac_file_encoder_progress_callback(const FLAC__FileEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);
+static FLAC__bool parse_cuesheet_(FLAC__StreamMetadata **cuesheet, const char *cuesheet_filename, const char *inbasefilename, FLAC__uint64 lead_out_offset);
+static void print_stats(const EncoderSession *encoder_session);
+static void print_error_with_state(const EncoderSession *e, const char *message);
+static void print_verify_error(EncoderSession *e);
+static FLAC__bool read_little_endian_uint16(FILE *f, FLAC__uint16 *val, FLAC__bool eof_ok, const char *fn);
+static FLAC__bool read_little_endian_uint32(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn);
+static FLAC__bool read_big_endian_uint16(FILE *f, FLAC__uint16 *val, FLAC__bool eof_ok, const char *fn);
+static FLAC__bool read_big_endian_uint32(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn);
+static FLAC__bool read_sane_extended(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn);
+
+/*
+ * public routines
+ */
+int
+flac__encode_aif(FILE *infile, long infilesize, const char *infilename, const char *outfilename,
+       const FLAC__byte *lookahead, unsigned lookahead_length, wav_encode_options_t options)
 {
-       encoder_wrapper_struct encoder_wrapper;
-       FILE *fin;
-       bool is_unsigned_samples;
-       unsigned channels, bps, sample_rate, data_bytes;
-       size_t bytes_per_wide_sample, bytes_read;
-       uint16 x;
-       uint32 xx;
+       EncoderSession encoder_session;
+       FLAC__uint16 x;
+       FLAC__uint32 xx;
+       unsigned int channels= 0U, bps= 0U, sample_rate= 0U, sample_frames= 0U;
+       FLAC__bool got_comm_chunk= false, got_ssnd_chunk= false;
+       int info_align_carry= -1, info_align_zero= -1;
+
+       FLAC__ASSERT(!options.common.sector_align || options.common.skip == 0);
+
+       (void)infilesize; /* silence compiler warning about unused parameter */
+       (void)lookahead; /* silence compiler warning about unused parameter */
+       (void)lookahead_length; /* silence compiler warning about unused parameter */
+
+       if(!
+               EncoderSession_construct(
+                       &encoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.use_ogg,
+#else
+                       /*use_ogg=*/false,
+#endif
+                       options.common.verify,
+                       options.common.verbose,
+                       infile,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
 
-       encoder_wrapper.encoder = 0;
-       encoder_wrapper.verify = verify;
-       encoder_wrapper.verbose = verbose;
-       encoder_wrapper.bytes_written = 0;
-       encoder_wrapper.samples_written = 0;
-       encoder_wrapper.outfile = outfile;
-       encoder_wrapper.seek_table.points = 0;
-       encoder_wrapper.first_seek_point_to_check = 0;
+       /* lookahead[] already has "FORMxxxxAIFF", do sub-chunks */
 
-       if(0 == strcmp(infile, "-")) {
-               fin = stdin;
-       }
-       else {
-               if(0 == (fin = fopen(infile, "rb"))) {
-                       fprintf(stderr, "ERROR: can't open input file %s\n", infile);
-                       return false;
-               }
-       }
-       if(0 == strcmp(outfile, "-")) {
-               encoder_wrapper.fout = stdout;
-       }
-       else {
-               if(0 == (encoder_wrapper.fout = fopen(outfile, "wb"))) {
-                       fprintf(stderr, "ERROR: can't open output file %s\n", outfile);
-                       fclose(fin);
-                       return false;
-               }
-       }
+       while(1) {
+               size_t c= 0U;
+               char chunk_id[4];
 
-       if(!init(&encoder_wrapper))
-               goto wav_abort_;
+               /* chunk identifier; really conservative about behavior of fread() and feof() */
+               if(feof(infile) || ((c= fread(chunk_id, 1U, 4U, infile)), c==0U && feof(infile)))
+                       break;
+               else if(c<4U || feof(infile)) {
+                       fprintf(stderr, "%s: ERROR: incomplete chunk identifier\n", encoder_session.inbasefilename);
+                       return EncoderSession_finish_error(&encoder_session);
+               }
 
-       /*
-        * check the RIFF chunk
-        */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       if(xx != 0x46464952) { /* "RIFF" */
-               fprintf(stderr, "ERROR: no RIFF header\n");
-               goto wav_abort_;
-       }
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
+               if(got_comm_chunk==false && !strncmp(chunk_id, "COMM", 4)) { /* common chunk */
+                       unsigned long skip;
 
-       /*
-        * now process the WAVE chunk
-        */
-       if(!read_little_endian_uint32(fin, &xx, true))
-               goto wav_end_;
-       if(xx != 0x45564157) { /* "WAVE" */
-               fprintf(stderr, "ERROR: no WAVE header\n");
-               goto wav_abort_;
-       }
-
-       /* do the format sub-chunk */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       if(xx != 0x20746d66) { /* "fmt " */
-               fprintf(stderr, "ERROR: no format sub-chunk\n");
-               goto wav_abort_;
-       }
-       /* fmt chunk size */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       if(xx != 16) {
-               fprintf(stderr, "ERROR: unsupported chunk\n");
-               goto wav_abort_;
-       }
-       /* compression code */
-       if(!read_little_endian_uint16(fin, &x, false))
-               goto wav_abort_;
-       if(x != 1) {
-               fprintf(stderr, "ERROR: unsupported compression type %u\n", (unsigned)x);
-               goto wav_abort_;
-       }
-       /* number of channels */
-       if(!read_little_endian_uint16(fin, &x, false))
-               goto wav_abort_;
-       if(x == 0 || x > FLAC__MAX_CHANNELS) {
-               fprintf(stderr, "ERROR: unsupported number channels %u\n", (unsigned)x);
-               goto wav_abort_;
-       }
-       channels = x;
-       /* sample rate */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       if(xx == 0 || xx > FLAC__MAX_SAMPLE_RATE) {
-               fprintf(stderr, "ERROR: unsupported sample rate %u\n", (unsigned)xx);
-               goto wav_abort_;
-       }
-       sample_rate = xx;
-       /* avg bytes per second (ignored) */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       /* block align (ignored) */
-       if(!read_little_endian_uint16(fin, &x, false))
-               goto wav_abort_;
-       /* bits per sample */
-       if(!read_little_endian_uint16(fin, &x, false))
-               goto wav_abort_;
-       if(x != 8 && x != 16) {
-               fprintf(stderr, "ERROR: unsupported bits per sample %u\n", (unsigned)x);
-               goto wav_abort_;
-       }
-       bps = x;
-       is_unsigned_samples = (x == 8);
-
-       /* do the data sub-chunk */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       if(xx != 0x61746164) { /* "data" */
-               fprintf(stderr, "ERROR: no data sub-chunk\n");
-               goto wav_abort_;
-       }
-       /* data size */
-       if(!read_little_endian_uint32(fin, &xx, false))
-               goto wav_abort_;
-       data_bytes = xx;
-
-       bytes_per_wide_sample = channels * (bps >> 3);
-
-       if(skip > 0) {
-               if(fin != stdin) {
-                       if(-1 == fseek(fin, bytes_per_wide_sample * (unsigned)skip, SEEK_CUR)) {
-                               fprintf(stderr, "ERROR seeking while skipping samples in input file %s\n", infile);
-                               goto wav_abort_;
+                       /* COMM chunk size */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(xx<18U) {
+                               fprintf(stderr, "%s: ERROR: non-standard 'COMM' chunk has length = %u\n", encoder_session.inbasefilename, (unsigned int)xx);
+                               return EncoderSession_finish_error(&encoder_session);
                        }
-               }
-               else {
-                       int64 left;
-                       unsigned need;
-                       for(left = (int64)skip; left > 0; left -= CHUNK_OF_SAMPLES) {
-                               need = min(left, CHUNK_OF_SAMPLES);
-                               if(fread(ucbuffer, 1, bytes_per_wide_sample * need, fin) < need) {
-                                       fprintf(stderr, "ERROR seeking while skipping samples in input file %s\n", infile);
-                                       goto wav_abort_;
+                       else if(xx!=18U)
+                               fprintf(stderr, "%s: WARNING: non-standard 'COMM' chunk has length = %u\n", encoder_session.inbasefilename, (unsigned int)xx);
+                       skip= (xx-18U)+(xx & 1U);
+
+                       /* number of channels */
+                       if(!read_big_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(x==0U || x>FLAC__MAX_CHANNELS) {
+                               fprintf(stderr, "%s: ERROR: unsupported number channels %u\n", encoder_session.inbasefilename, (unsigned int)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && x!=2U) {
+                               fprintf(stderr, "%s: ERROR: file has %u channels, must be 2 for --sector-align\n", encoder_session.inbasefilename, (unsigned int)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       channels= x;
+
+                       /* number of sample frames */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       sample_frames= xx;
+
+                       /* bits per sample */
+                       if(!read_big_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(x!=8U && x!=16U && x!=24U) {
+                               fprintf(stderr, "%s: ERROR: unsupported bits per sample %u\n", encoder_session.inbasefilename, (unsigned int)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && x!=16U) {
+                               fprintf(stderr, "%s: ERROR: file has %u bits per sample, must be 16 for --sector-align\n", encoder_session.inbasefilename, (unsigned int)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       bps= x;
+
+                       /* sample rate */
+                       if(!read_sane_extended(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(!FLAC__format_sample_rate_is_valid(xx)) {
+                               fprintf(stderr, "%s: ERROR: unsupported sample rate %u\n", encoder_session.inbasefilename, (unsigned int)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && xx!=44100U) {
+                               fprintf(stderr, "%s: ERROR: file's sample rate is %u, must be 44100 for --sector-align\n", encoder_session.inbasefilename, (unsigned int)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       sample_rate= xx;
+
+                       /* skip any extra data in the COMM chunk */
+                       FLAC__ASSERT(skip<=LONG_MAX);
+                       while(skip>0U && fseek(infile, skip, SEEK_CUR)<0) {
+                               unsigned int need= min(skip, sizeof ucbuffer_);
+                               if(fread(ucbuffer_, 1U, need, infile)<need) {
+                                       fprintf(stderr, "%s: ERROR during read while skipping extra COMM data\n", encoder_session.inbasefilename);
+                                       return EncoderSession_finish_error(&encoder_session);
                                }
+                               skip-= need;
                        }
+
+                       got_comm_chunk= true;
                }
-       }
+               else if(got_ssnd_chunk==false && !strncmp(chunk_id, "SSND", 4)) { /* sound data chunk */
+                       unsigned int offset= 0U, block_size= 0U, align_remainder= 0U, data_bytes;
+                       size_t bytes_per_frame= channels*(bps>>3);
+                       FLAC__bool pad= false;
+
+                       if(got_comm_chunk==false) {
+                               fprintf(stderr, "%s: ERROR: got 'SSND' chunk before 'COMM' chunk\n", encoder_session.inbasefilename);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
 
-       encoder_wrapper.total_samples_to_encode = data_bytes / bytes_per_wide_sample - skip;
-       encoder_wrapper.unencoded_size = encoder_wrapper.total_samples_to_encode * bytes_per_wide_sample + 44; /* 44 for the size of the WAV headers */
+                       /* SSND chunk size */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(xx!=(sample_frames*bytes_per_frame + 8U)) {
+                               fprintf(stderr, "%s: ERROR: SSND chunk size inconsistent with sample frame count\n", encoder_session.inbasefilename);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       data_bytes= xx;
+                       pad= (data_bytes & 1U) ? true : false;
+
+                       /* offset */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(xx!=0U) {
+                               fprintf(stderr, "%s: ERROR: offset is %u; must be 0\n", encoder_session.inbasefilename, (unsigned int)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       offset= xx;
+
+                       /* block size */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else if(xx!=0U) {
+                               fprintf(stderr, "%s: ERROR: block size is %u; must be 0\n", encoder_session.inbasefilename, (unsigned int)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       block_size= xx;
+
+                       if(options.common.skip>0U) {
+                               FLAC__uint64 remaining= options.common.skip*bytes_per_frame;
+
+                               /* do 1<<30 bytes at a time, since 1<<30 is a nice round number, and */
+                               /* is guaranteed to be less than LONG_MAX */
+                               for(; remaining>0U; remaining-= remaining>(1U<<30) ? remaining : (1U<<30))
+                               {
+                                       unsigned long skip= (unsigned long)(remaining % (1U<<30));
+
+                                       FLAC__ASSERT(skip<=LONG_MAX);
+                                       while(skip>0 && fseek(infile, skip, SEEK_CUR)<0) {
+                                               unsigned int need= min(skip, sizeof ucbuffer_);
+                                               if(fread(ucbuffer_, 1U, need, infile)<need) {
+                                                       fprintf(stderr, "%s: ERROR during read while skipping samples\n", encoder_session.inbasefilename);
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               skip-= need;
+                                       }
+                               }
+                       }
 
-       if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, padding, requested_seek_points, num_requested_seek_points, &encoder_wrapper))
-               goto wav_abort_;
+                       data_bytes-= (8U + (unsigned int)options.common.skip*bytes_per_frame); /*@@@ WATCHOUT: 4GB limit */
+                       encoder_session.total_samples_to_encode= data_bytes/bytes_per_frame + *options.common.align_reservoir_samples;
+                       if(options.common.sector_align) {
+                               align_remainder= (unsigned int)(encoder_session.total_samples_to_encode % 588U);
+                               if(options.common.is_last_file)
+                                       encoder_session.total_samples_to_encode+= (588U-align_remainder); /* will pad with zeroes */
+                               else
+                                       encoder_session.total_samples_to_encode-= align_remainder; /* will stop short and carry over to next file */
+                       }
 
-       encoder_wrapper.verify_fifo.into_frames = true;
+                       /* +54 for the size of the AIFF headers; this is just an estimate for the progress indicator and doesn't need to be exact */
+                       encoder_session.unencoded_size= encoder_session.total_samples_to_encode*bytes_per_frame+54;
 
-       while(data_bytes > 0) {
-               bytes_read = fread(ucbuffer, sizeof(unsigned char), CHUNK_OF_SAMPLES * bytes_per_wide_sample, fin);
-               if(bytes_read == 0) {
-                       if(ferror(fin)) {
-                               fprintf(stderr, "ERROR reading from %s\n", infile);
-                               goto wav_abort_;
+                       if(!EncoderSession_init_encoder(&encoder_session, options.common, channels, bps, sample_rate))
+                               return EncoderSession_finish_error(&encoder_session);
+
+                       /* first do any samples in the reservoir */
+                       if(options.common.sector_align && *options.common.align_reservoir_samples>0U) {
+
+                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 *const *)options.common.align_reservoir, *options.common.align_reservoir_samples)) {
+                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
                        }
-                       else if(feof(fin))
-                               break;
-               }
-               else {
-                       if(bytes_read > data_bytes)
-                               bytes_read = data_bytes; /* chop off anything after the end of the data chunk */
-                       if(bytes_read % bytes_per_wide_sample != 0) {
-                               fprintf(stderr, "ERROR, got partial sample from input file %s\n", infile);
-                               goto wav_abort_;
+
+                       /* decrement the data_bytes counter if we need to align the file */
+                       if(options.common.sector_align) {
+                               if(options.common.is_last_file)
+                                       *options.common.align_reservoir_samples= 0U;
+                               else {
+                                       *options.common.align_reservoir_samples= align_remainder;
+                                       data_bytes-= (*options.common.align_reservoir_samples)*bytes_per_frame;
+                               }
                        }
-                       else {
-                               unsigned wide_samples = bytes_read / bytes_per_wide_sample;
-                               format_input(wide_samples, false, is_unsigned_samples, channels, bps, &encoder_wrapper);
 
-                               /* NOTE: some versions of GCC can't figure out const-ness right and will give you an 'incompatible pointer type' warning on arg 2 here: */
-                               if(!FLAC__encoder_process(encoder_wrapper.encoder, input, wide_samples)) {
-                                       fprintf(stderr, "ERROR during encoding, state = %d:%s\n", encoder_wrapper.encoder->state, FLAC__EncoderStateString[encoder_wrapper.encoder->state]);
-                                       goto wav_abort_;
+                       /* now do from the file */
+                       while(data_bytes>0) {
+                               size_t bytes_read= fread(ucbuffer_, 1U, min(data_bytes, CHUNK_OF_SAMPLES*bytes_per_frame), infile);
+
+                               if(bytes_read==0U) {
+                                       if(ferror(infile)) {
+                                               fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       else if(feof(infile)) {
+                                               fprintf(stderr, "%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
+                                               data_bytes= 0;
+                                       }
+                               }
+                               else {
+                                       if(bytes_read % bytes_per_frame != 0U) {
+                                               fprintf(stderr, "%s: ERROR: got partial sample\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       else {
+                                               unsigned int frames= bytes_read/bytes_per_frame;
+                                               format_input(input_, frames, true, false, channels, bps);
+
+                                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 *const *)input_, frames)) {
+                                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               else
+                                                       data_bytes-= bytes_read;
+                                       }
                                }
-                               data_bytes -= bytes_read;
                        }
-               }
-       }
 
-wav_end_:
-       if(encoder_wrapper.encoder) {
-               if(encoder_wrapper.encoder->state == FLAC__ENCODER_OK)
-                       FLAC__encoder_finish(encoder_wrapper.encoder);
-               FLAC__encoder_free_instance(encoder_wrapper.encoder);
-       }
-       if(encoder_wrapper.verbose && encoder_wrapper.total_samples_to_encode > 0) {
-               print_stats(&encoder_wrapper);
-               printf("\n");
-       }
-       if(0 != encoder_wrapper.seek_table.points)
-               free(encoder_wrapper.seek_table.points);
-       if(verify) {
-               if(encoder_wrapper.verify_fifo.result != FLAC__VERIFY_OK) {
-                       printf("Verify FAILED! (%s)  Do not use %s\n", verify_code_string[encoder_wrapper.verify_fifo.result], outfile);
-                       return 1;
+                       /* now read unaligned samples into reservoir or pad with zeroes if necessary */
+                       if(options.common.sector_align) {
+                               if(options.common.is_last_file) {
+                                       unsigned int pad_frames= 588U-align_remainder;
+
+                                       if(pad_frames<588U) {
+                                               unsigned int i;
+
+                                               info_align_zero= pad_frames;
+                                               for(i= 0U; i<channels; ++i)
+                                                       memset(input_[i], 0, pad_frames*(bps>>3));
+
+                                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 *const *)input_, pad_frames)) {
+                                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                       }
+                               }
+                               else {
+                                       if(*options.common.align_reservoir_samples > 0) {
+                                               size_t bytes_read= fread(ucbuffer_, 1U, (*options.common.align_reservoir_samples)*bytes_per_frame, infile);
+
+                                               FLAC__ASSERT(CHUNK_OF_SAMPLES>=588U);
+                                               if(bytes_read==0U && ferror(infile)) {
+                                                       fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_frame)
+                                                       fprintf(stderr, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)bytes_read, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
+                                               else {
+                                                       info_align_carry= *options.common.align_reservoir_samples;
+                                                       format_input(options.common.align_reservoir, *options.common.align_reservoir_samples, true, false, channels, bps);
+                                               }
+                                       }
+                               }
+                       }
+
+                       if(pad==true) {
+                               unsigned char tmp;
+
+                               if(fread(&tmp, 1U, 1U, infile)<1U) {
+                                       fprintf(stderr, "%s: ERROR during read of SSND pad byte\n", encoder_session.inbasefilename);
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
+                       }
+
+                       got_ssnd_chunk= true;
                }
-               else {
-                       printf("Verify succeeded\n");
+               else { /* other chunk */
+                       if(!strncmp(chunk_id, "COMM", 4))
+                               fprintf(stderr, "%s: WARNING: skipping extra 'COMM' chunk\n", encoder_session.inbasefilename);
+                       else if(!strncmp(chunk_id, "SSND", 4))
+                               fprintf(stderr, "%s: WARNING: skipping extra 'SSND' chunk\n", encoder_session.inbasefilename);
+                       else
+                               fprintf(stderr, "%s: WARNING: skipping unknown chunk '%s'\n", encoder_session.inbasefilename, chunk_id);
+
+                       /* chunk size */
+                       if(!read_big_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       else {
+                               unsigned long skip= xx+(xx & 1U);
+
+                               FLAC__ASSERT(skip<=LONG_MAX);
+                               while(skip>0U && fseek(infile, skip, SEEK_CUR)<0) {
+                                       unsigned int need= min(skip, sizeof ucbuffer_);
+                                       if(fread(ucbuffer_, 1U, need, infile)<need) {
+                                               fprintf(stderr, "%s: ERROR during read while skipping unknown chunk\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       skip-= need;
+                               }
+                       }
                }
        }
-       fclose(fin);
-       return 0;
-wav_abort_:
-       if(encoder_wrapper.verbose && encoder_wrapper.total_samples_to_encode > 0)
-               printf("\n");
-       if(encoder_wrapper.encoder) {
-               if(encoder_wrapper.encoder->state == FLAC__ENCODER_OK)
-                       FLAC__encoder_finish(encoder_wrapper.encoder);
-               FLAC__encoder_free_instance(encoder_wrapper.encoder);
-       }
-       if(0 != encoder_wrapper.seek_table.points)
-               free(encoder_wrapper.seek_table.points);
-       if(verify) {
-               if(encoder_wrapper.verify_fifo.result != FLAC__VERIFY_OK) {
-                       printf("Verify FAILED! (%s)  Do not use %s\n", verify_code_string[encoder_wrapper.verify_fifo.result], outfile);
-                       return 1;
-               }
-               else {
-                       printf("Verify succeeded\n");
-               }
+
+       if(got_ssnd_chunk==false && sample_frames!=0U) {
+               fprintf(stderr, "%s: ERROR: missing SSND chunk\n", encoder_session.inbasefilename);
+               return EncoderSession_finish_error(&encoder_session);
        }
-       fclose(fin);
-       unlink(outfile);
-       return 1;
+
+       return EncoderSession_finish_ok(&encoder_session, info_align_carry, info_align_zero);
 }
 
-int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding, char *requested_seek_points, int num_requested_seek_points, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, unsigned sample_rate)
+int flac__encode_wav(FILE *infile, long infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, wav_encode_options_t options)
 {
-       encoder_wrapper_struct encoder_wrapper;
-       FILE *fin;
-       size_t bytes_read;
-       const size_t bytes_per_wide_sample = channels * (bps >> 3);
+       EncoderSession encoder_session;
+       FLAC__bool is_unsigned_samples = false;
+       unsigned channels = 0, bps = 0, sample_rate = 0, data_bytes;
+       size_t bytes_per_wide_sample, bytes_read;
+       FLAC__uint16 x;
+       FLAC__uint32 xx;
+       FLAC__bool got_fmt_chunk = false, got_data_chunk = false;
+       unsigned align_remainder = 0;
+       int info_align_carry = -1, info_align_zero = -1;
+
+       FLAC__ASSERT(!options.common.sector_align || options.common.skip == 0);
+
+       (void)infilesize;
+       (void)lookahead;
+       (void)lookahead_length;
+
+       if(!
+               EncoderSession_construct(
+                       &encoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.use_ogg,
+#else
+                       /*use_ogg=*/false,
+#endif
+                       options.common.verify,
+                       options.common.verbose,
+                       infile,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
 
-       encoder_wrapper.encoder = 0;
-       encoder_wrapper.verify = verify;
-       encoder_wrapper.verbose = verbose;
-       encoder_wrapper.bytes_written = 0;
-       encoder_wrapper.samples_written = 0;
-       encoder_wrapper.outfile = outfile;
-       encoder_wrapper.seek_table.points = 0;
-       encoder_wrapper.first_seek_point_to_check = 0;
+       /*
+        * lookahead[] already has "RIFFxxxxWAVE", do sub-chunks
+        */
+       while(!feof(infile)) {
+               if(!read_little_endian_uint32(infile, &xx, true, encoder_session.inbasefilename))
+                       return EncoderSession_finish_error(&encoder_session);
+               if(feof(infile))
+                       break;
+               if(xx == 0x20746d66 && !got_fmt_chunk) { /* "fmt " */
+                       /* fmt sub-chunk size */
+                       if(!read_little_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(xx < 16) {
+                               fprintf(stderr, "%s: ERROR: found non-standard 'fmt ' sub-chunk which has length = %u\n", encoder_session.inbasefilename, (unsigned)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(xx != 16 && xx != 18) {
+                               fprintf(stderr, "%s: WARNING: found non-standard 'fmt ' sub-chunk which has length = %u\n", encoder_session.inbasefilename, (unsigned)xx);
+                       }
+                       data_bytes = xx;
+                       /* compression code */
+                       if(!read_little_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(x != 1) {
+                               fprintf(stderr, "%s: ERROR: unsupported compression type %u\n", encoder_session.inbasefilename, (unsigned)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       /* number of channels */
+                       if(!read_little_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(x == 0 || x > FLAC__MAX_CHANNELS) {
+                               fprintf(stderr, "%s: ERROR: unsupported number channels %u\n", encoder_session.inbasefilename, (unsigned)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && x != 2) {
+                               fprintf(stderr, "%s: ERROR: file has %u channels, must be 2 for --sector-align\n", encoder_session.inbasefilename, (unsigned)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       channels = x;
+                       /* sample rate */
+                       if(!read_little_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(!FLAC__format_sample_rate_is_valid(xx)) {
+                               fprintf(stderr, "%s: ERROR: unsupported sample rate %u\n", encoder_session.inbasefilename, (unsigned)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && xx != 44100) {
+                               fprintf(stderr, "%s: ERROR: file's sample rate is %u, must be 44100 for --sector-align\n", encoder_session.inbasefilename, (unsigned)xx);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       sample_rate = xx;
+                       /* avg bytes per second (ignored) */
+                       if(!read_little_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       /* block align (ignored) */
+                       if(!read_little_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       /* bits per sample */
+                       if(!read_little_endian_uint16(infile, &x, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(x != 8 && x != 16 && x != 24) {
+                               fprintf(stderr, "%s: ERROR: unsupported bits per sample %u\n", encoder_session.inbasefilename, (unsigned)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       else if(options.common.sector_align && x != 16) {
+                               fprintf(stderr, "%s: ERROR: file has %u bits per sample, must be 16 for --sector-align\n", encoder_session.inbasefilename, (unsigned)x);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       bps = x;
+                       is_unsigned_samples = (x == 8);
+
+                       /* skip any extra data in the fmt sub-chunk */
+                       data_bytes -= 16;
+                       if(data_bytes > 0) {
+                               unsigned left, need;
+                               for(left = data_bytes; left > 0; ) {
+                                       need = min(left, CHUNK_OF_SAMPLES);
+                                       if(fread(ucbuffer_, 1U, need, infile) < need) {
+                                               fprintf(stderr, "%s: ERROR during read while skipping samples\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       left -= need;
+                               }
+                       }
 
-       if(0 == strcmp(infile, "-")) {
-               fin = stdin;
-       }
-       else {
-               if(0 == (fin = fopen(infile, "rb"))) {
-                       fprintf(stderr, "ERROR: can't open input file %s\n", infile);
-                       return false;
+                       got_fmt_chunk = true;
                }
-       }
-       if(0 == strcmp(outfile, "-")) {
-               encoder_wrapper.fout = stdout;
-       }
-       else {
-               if(0 == (encoder_wrapper.fout = fopen(outfile, "wb"))) {
-                       fprintf(stderr, "ERROR: can't open output file %s\n", outfile);
-                       fclose(fin);
-                       return false;
+               else if(xx == 0x61746164 && !got_data_chunk && got_fmt_chunk) { /* "data" */
+                       /* data size */
+                       if(!read_little_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       data_bytes = xx;
+
+                       bytes_per_wide_sample = channels * (bps >> 3);
+
+                       if(options.common.skip > 0) {
+                               if(fseek(infile, bytes_per_wide_sample * (unsigned)options.common.skip, SEEK_CUR) < 0) {
+                                       /* can't seek input, read ahead manually... */
+                                       unsigned left, need;
+                                       for(left = (unsigned)options.common.skip; left > 0; ) { /*@@@ WATCHOUT: 4GB limit */
+                                               need = min(left, CHUNK_OF_SAMPLES);
+                                               if(fread(ucbuffer_, bytes_per_wide_sample, need, infile) < need) {
+                                                       fprintf(stderr, "%s: ERROR during read while skipping samples\n", encoder_session.inbasefilename);
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               left -= need;
+                                       }
+                               }
+                       }
+
+                       data_bytes -= (unsigned)options.common.skip * bytes_per_wide_sample; /*@@@ WATCHOUT: 4GB limit */
+                       encoder_session.total_samples_to_encode = data_bytes / bytes_per_wide_sample + *options.common.align_reservoir_samples;
+                       if(options.common.sector_align) {
+                               align_remainder = (unsigned)(encoder_session.total_samples_to_encode % 588);
+                               if(options.common.is_last_file)
+                                       encoder_session.total_samples_to_encode += (588-align_remainder); /* will pad with zeroes */
+                               else
+                                       encoder_session.total_samples_to_encode -= align_remainder; /* will stop short and carry over to next file */
+                       }
+
+                       /* +44 for the size of the WAV headers; this is just an estimate for the progress indicator and doesn't need to be exact */
+                       encoder_session.unencoded_size = encoder_session.total_samples_to_encode * bytes_per_wide_sample + 44;
+
+                       if(!EncoderSession_init_encoder(&encoder_session, options.common, channels, bps, sample_rate))
+                               return EncoderSession_finish_error(&encoder_session);
+
+                       /*
+                        * first do any samples in the reservoir
+                        */
+                       if(options.common.sector_align && *options.common.align_reservoir_samples > 0) {
+                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)options.common.align_reservoir, *options.common.align_reservoir_samples)) {
+                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
+                       }
+
+                       /*
+                        * decrement the data_bytes counter if we need to align the file
+                        */
+                       if(options.common.sector_align) {
+                               if(options.common.is_last_file) {
+                                       *options.common.align_reservoir_samples = 0;
+                               }
+                               else {
+                                       *options.common.align_reservoir_samples = align_remainder;
+                                       data_bytes -= (*options.common.align_reservoir_samples) * bytes_per_wide_sample;
+                               }
+                       }
+
+                       /*
+                        * now do from the file
+                        */
+                       while(data_bytes > 0) {
+                               bytes_read = fread(ucbuffer_, sizeof(unsigned char), min(data_bytes, CHUNK_OF_SAMPLES * bytes_per_wide_sample), infile);
+                               if(bytes_read == 0) {
+                                       if(ferror(infile)) {
+                                               fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       else if(feof(infile)) {
+                                               fprintf(stderr, "%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
+                                               data_bytes = 0;
+                                       }
+                               }
+                               else {
+                                       if(bytes_read % bytes_per_wide_sample != 0) {
+                                               fprintf(stderr, "%s: ERROR: got partial sample\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       else {
+                                               unsigned wide_samples = bytes_read / bytes_per_wide_sample;
+                                               format_input(input_, wide_samples, false, is_unsigned_samples, channels, bps);
+
+                                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)input_, wide_samples)) {
+                                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               data_bytes -= bytes_read;
+                                       }
+                               }
+                       }
+
+                       /*
+                        * now read unaligned samples into reservoir or pad with zeroes if necessary
+                        */
+                       if(options.common.sector_align) {
+                               if(options.common.is_last_file) {
+                                       unsigned wide_samples = 588 - align_remainder;
+                                       if(wide_samples < 588) {
+                                               unsigned channel;
+
+                                               info_align_zero = wide_samples;
+                                               data_bytes = wide_samples * (bps >> 3);
+                                               for(channel = 0; channel < channels; channel++)
+                                                       memset(input_[channel], 0, data_bytes);
+
+                                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)input_, wide_samples)) {
+                                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                       }
+                               }
+                               else {
+                                       if(*options.common.align_reservoir_samples > 0) {
+                                               FLAC__ASSERT(CHUNK_OF_SAMPLES >= 588);
+                                               bytes_read = fread(ucbuffer_, sizeof(unsigned char), (*options.common.align_reservoir_samples) * bytes_per_wide_sample, infile);
+                                               if(bytes_read == 0 && ferror(infile)) {
+                                                       fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                                                       return EncoderSession_finish_error(&encoder_session);
+                                               }
+                                               else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
+                                                       fprintf(stderr, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
+                                                       data_bytes = 0;
+                                               }
+                                               else {
+                                                       info_align_carry = *options.common.align_reservoir_samples;
+                                                       format_input(options.common.align_reservoir, *options.common.align_reservoir_samples, false, is_unsigned_samples, channels, bps);
+                                               }
+                                       }
+                               }
+                       }
+
+                       got_data_chunk = true;
+               }
+               else {
+                       if(xx == 0x20746d66 && got_fmt_chunk) { /* "fmt " */
+                               fprintf(stderr, "%s: WARNING: skipping extra 'fmt ' sub-chunk\n", encoder_session.inbasefilename);
+                       }
+                       else if(xx == 0x61746164) { /* "data" */
+                               if(got_data_chunk) {
+                                       fprintf(stderr, "%s: WARNING: skipping extra 'data' sub-chunk\n", encoder_session.inbasefilename);
+                               }
+                               else if(!got_fmt_chunk) {
+                                       fprintf(stderr, "%s: ERROR: got 'data' sub-chunk before 'fmt' sub-chunk\n", encoder_session.inbasefilename);
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
+                               else {
+                                       FLAC__ASSERT(0);
+                               }
+                       }
+                       else {
+                               fprintf(stderr, "%s: WARNING: skipping unknown sub-chunk '%c%c%c%c'\n", encoder_session.inbasefilename, (char)(xx&255), (char)((xx>>8)&255), (char)((xx>>16)&255), (char)(xx>>24));
+                       }
+                       /* sub-chunk size */
+                       if(!read_little_endian_uint32(infile, &xx, false, encoder_session.inbasefilename))
+                               return EncoderSession_finish_error(&encoder_session);
+                       if(fseek(infile, xx, SEEK_CUR) < 0) {
+                               /* can't seek input, read ahead manually... */
+                               unsigned left, need;
+                               const unsigned chunk = sizeof(ucbuffer_);
+                               for(left = xx; left > 0; ) {
+                                       need = min(left, chunk);
+                                       if(fread(ucbuffer_, 1, need, infile) < need) {
+                                               fprintf(stderr, "%s: ERROR during read while skipping unsupported sub-chunk\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       left -= need;
+                               }
+                       }
                }
        }
 
-       if(!init(&encoder_wrapper))
-               goto raw_abort_;
+       return EncoderSession_finish_ok(&encoder_session, info_align_carry, info_align_zero);
+}
+
+int flac__encode_raw(FILE *infile, long infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, raw_encode_options_t options)
+{
+       EncoderSession encoder_session;
+       size_t bytes_read;
+       const size_t bytes_per_wide_sample = options.channels * (options.bps >> 3);
+       unsigned align_remainder = 0;
+       int info_align_carry = -1, info_align_zero = -1;
+
+       FLAC__ASSERT(!options.common.sector_align || options.common.skip == 0);
+       FLAC__ASSERT(!options.common.sector_align || options.channels == 2);
+       FLAC__ASSERT(!options.common.sector_align || options.bps == 16);
+       FLAC__ASSERT(!options.common.sector_align || options.sample_rate == 44100);
+       FLAC__ASSERT(!options.common.sector_align || infilesize >= 0);
+       FLAC__ASSERT(!options.common.replay_gain || options.common.skip == 0);
+       FLAC__ASSERT(!options.common.replay_gain || options.channels <= 2);
+       FLAC__ASSERT(!options.common.replay_gain || grabbag__replaygain_is_valid_sample_frequency(options.sample_rate));
+
+       if(!
+               EncoderSession_construct(
+                       &encoder_session,
+#ifdef FLAC__HAS_OGG
+                       options.common.use_ogg,
+#else
+                       /*use_ogg=*/false,
+#endif
+                       options.common.verify,
+                       options.common.verbose,
+                       infile,
+                       infilename,
+                       outfilename
+               )
+       )
+               return 1;
 
        /* get the file length */
-       if(0 != fseek(fin, 0, SEEK_END)) {
-               encoder_wrapper.total_samples_to_encode = encoder_wrapper.unencoded_size = 0;
+       if(infilesize < 0) {
+               encoder_session.total_samples_to_encode = encoder_session.unencoded_size = 0;
        }
        else {
-               long filesize;
-               fflush(fin);
-               if(-1 == (filesize = ftell(fin))) {
-                       encoder_wrapper.total_samples_to_encode = encoder_wrapper.unencoded_size = 0;
+               if(options.common.sector_align) {
+                       FLAC__ASSERT(options.common.skip == 0);
+                       encoder_session.total_samples_to_encode = (unsigned)infilesize / bytes_per_wide_sample + *options.common.align_reservoir_samples;
+                       align_remainder = (unsigned)(encoder_session.total_samples_to_encode % 588);
+                       if(options.common.is_last_file)
+                               encoder_session.total_samples_to_encode += (588-align_remainder); /* will pad with zeroes */
+                       else
+                               encoder_session.total_samples_to_encode -= align_remainder; /* will stop short and carry over to next file */
                }
                else {
-                       encoder_wrapper.unencoded_size = filesize - skip * bytes_per_wide_sample;
-                       encoder_wrapper.total_samples_to_encode = filesize / bytes_per_wide_sample - skip;
+                       encoder_session.total_samples_to_encode = (unsigned)infilesize / bytes_per_wide_sample - options.common.skip;
                }
-       }
 
-       if(skip > 0) {
-               if(fin != stdin) {
-                       if(-1 == fseek(fin, bytes_per_wide_sample * (unsigned)skip, SEEK_SET)) {
-                               fprintf(stderr, "ERROR seeking while skipping samples in input file %s\n", infile);
-                               goto raw_abort_;
+               encoder_session.unencoded_size = encoder_session.total_samples_to_encode * bytes_per_wide_sample;
+       }
+
+       if(encoder_session.verbose && encoder_session.total_samples_to_encode <= 0)
+               fprintf(stderr, "(No runtime statistics possible; please wait for encoding to finish...)\n");
+
+       if(options.common.skip > 0) {
+               unsigned skip_bytes = bytes_per_wide_sample * (unsigned)options.common.skip;
+               if(skip_bytes > lookahead_length) {
+                       skip_bytes -= lookahead_length;
+                       lookahead_length = 0;
+                       if(fseek(infile, (long)skip_bytes, SEEK_CUR) < 0) {
+                               /* can't seek input, read ahead manually... */
+                               unsigned left, need;
+                               const unsigned chunk = sizeof(ucbuffer_);
+                               for(left = skip_bytes; left > 0; ) {
+                                       need = min(left, chunk);
+                                       if(fread(ucbuffer_, 1, need, infile) < need) {
+                                               fprintf(stderr, "%s: ERROR during read while skipping samples\n", encoder_session.inbasefilename);
+                                               return EncoderSession_finish_error(&encoder_session);
+                                       }
+                                       left -= need;
+                               }
                        }
                }
                else {
-                       int64 left;
-                       unsigned need;
-                       for(left = (int64)skip; left > 0; left -= CHUNK_OF_SAMPLES) {
-                               need = min(left, CHUNK_OF_SAMPLES);
-                               if(fread(ucbuffer, 1, bytes_per_wide_sample * need, fin) < need) {
-                                       fprintf(stderr, "ERROR seeking while skipping samples in input file %s\n", infile);
-                                       goto raw_abort_;
-                               }
-                       }
+                       lookahead += skip_bytes;
+                       lookahead_length -= skip_bytes;
                }
        }
-       else {
-               fseek(fin, 0, SEEK_SET);
+
+       if(!EncoderSession_init_encoder(&encoder_session, options.common, options.channels, options.bps, options.sample_rate))
+               return EncoderSession_finish_error(&encoder_session);
+
+       /*
+        * first do any samples in the reservoir
+        */
+       if(options.common.sector_align && *options.common.align_reservoir_samples > 0) {
+               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)options.common.align_reservoir, *options.common.align_reservoir_samples)) {
+                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                       return EncoderSession_finish_error(&encoder_session);
+               }
        }
 
-       if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, padding, requested_seek_points, num_requested_seek_points, &encoder_wrapper))
-               goto raw_abort_;
+       /*
+        * decrement infilesize if we need to align the file
+        */
+       if(options.common.sector_align) {
+               FLAC__ASSERT(infilesize >= 0);
+               if(options.common.is_last_file) {
+                       *options.common.align_reservoir_samples = 0;
+               }
+               else {
+                       *options.common.align_reservoir_samples = align_remainder;
+                       infilesize -= (long)((*options.common.align_reservoir_samples) * bytes_per_wide_sample);
+               }
+       }
 
-       encoder_wrapper.verify_fifo.into_frames = true;
+       /*
+        * now do from the file
+        */
+       while(!feof(infile)) {
+               if(lookahead_length > 0) {
+                       FLAC__ASSERT(lookahead_length < CHUNK_OF_SAMPLES * bytes_per_wide_sample);
+                       memcpy(ucbuffer_, lookahead, lookahead_length);
+                       bytes_read = fread(ucbuffer_+lookahead_length, sizeof(unsigned char), CHUNK_OF_SAMPLES * bytes_per_wide_sample - lookahead_length, infile) + lookahead_length;
+                       if(ferror(infile)) {
+                               fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                               return EncoderSession_finish_error(&encoder_session);
+                       }
+                       lookahead_length = 0;
+               }
+               else
+                       bytes_read = fread(ucbuffer_, sizeof(unsigned char), CHUNK_OF_SAMPLES * bytes_per_wide_sample, infile);
 
-       while(!feof(fin)) {
-               bytes_read = fread(ucbuffer, sizeof(unsigned char), CHUNK_OF_SAMPLES * bytes_per_wide_sample, fin);
                if(bytes_read == 0) {
-                       if(ferror(fin)) {
-                               fprintf(stderr, "ERROR reading from %s\n", infile);
-                               goto raw_abort_;
+                       if(ferror(infile)) {
+                               fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                               return EncoderSession_finish_error(&encoder_session);
                        }
                }
                else if(bytes_read % bytes_per_wide_sample != 0) {
-                       fprintf(stderr, "ERROR, got partial sample from input file %s\n", infile);
-                       goto raw_abort_;
+                       fprintf(stderr, "%s: ERROR: got partial sample\n", encoder_session.inbasefilename);
+                       return EncoderSession_finish_error(&encoder_session);
                }
                else {
                        unsigned wide_samples = bytes_read / bytes_per_wide_sample;
-                       format_input(wide_samples, is_big_endian, is_unsigned_samples, channels, bps, &encoder_wrapper);
+                       format_input(input_, wide_samples, options.is_big_endian, options.is_unsigned_samples, options.channels, options.bps);
 
-                       /* NOTE: some versions of GCC can't figure out const-ness right and will give you an 'incompatible pointer type' warning on arg 2 here: */
-                       if(!FLAC__encoder_process(encoder_wrapper.encoder, input, wide_samples)) {
-                               fprintf(stderr, "ERROR during encoding, state = %d:%s\n", encoder_wrapper.encoder->state, FLAC__EncoderStateString[encoder_wrapper.encoder->state]);
-                               goto raw_abort_;
+                       if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)input_, wide_samples)) {
+                               print_error_with_state(&encoder_session, "ERROR during encoding");
+                               return EncoderSession_finish_error(&encoder_session);
                        }
                }
        }
 
-       if(encoder_wrapper.encoder) {
-               if(encoder_wrapper.encoder->state == FLAC__ENCODER_OK)
-                       FLAC__encoder_finish(encoder_wrapper.encoder);
-               FLAC__encoder_free_instance(encoder_wrapper.encoder);
-       }
-       if(encoder_wrapper.verbose && encoder_wrapper.total_samples_to_encode > 0) {
-               print_stats(&encoder_wrapper);
-               printf("\n");
-       }
-       if(0 != encoder_wrapper.seek_table.points)
-               free(encoder_wrapper.seek_table.points);
-       if(verify) {
-               if(encoder_wrapper.verify_fifo.result != FLAC__VERIFY_OK) {
-                       printf("Verify FAILED! (%s)  Do not use %s\n", verify_code_string[encoder_wrapper.verify_fifo.result], outfile);
-                       return 1;
-               }
-               else {
-                       printf("Verify succeeded\n");
-               }
-       }
-       fclose(fin);
-       return 0;
-raw_abort_:
-       if(encoder_wrapper.verbose && encoder_wrapper.total_samples_to_encode > 0)
-               printf("\n");
-       if(encoder_wrapper.encoder) {
-               if(encoder_wrapper.encoder->state == FLAC__ENCODER_OK)
-                       FLAC__encoder_finish(encoder_wrapper.encoder);
-               FLAC__encoder_free_instance(encoder_wrapper.encoder);
-       }
-       if(0 != encoder_wrapper.seek_table.points)
-               free(encoder_wrapper.seek_table.points);
-       if(verify) {
-               if(encoder_wrapper.verify_fifo.result != FLAC__VERIFY_OK) {
-                       printf("Verify FAILED! (%s)  Do not use %s\n", verify_code_string[encoder_wrapper.verify_fifo.result], outfile);
-                       return 1;
+       /*
+        * now read unaligned samples into reservoir or pad with zeroes if necessary
+        */
+       if(options.common.sector_align) {
+               if(options.common.is_last_file) {
+                       unsigned wide_samples = 588 - align_remainder;
+                       if(wide_samples < 588) {
+                               unsigned channel, data_bytes;
+
+                               info_align_zero = wide_samples;
+                               data_bytes = wide_samples * (options.bps >> 3);
+                               for(channel = 0; channel < options.channels; channel++)
+                                       memset(input_[channel], 0, data_bytes);
+
+                               if(!EncoderSession_process(&encoder_session, (const FLAC__int32 * const *)input_, wide_samples)) {
+                                       print_error_with_state(&encoder_session, "ERROR during encoding");
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
+                       }
                }
                else {
-                       printf("Verify succeeded\n");
+                       if(*options.common.align_reservoir_samples > 0) {
+                               FLAC__ASSERT(CHUNK_OF_SAMPLES >= 588);
+                               bytes_read = fread(ucbuffer_, sizeof(unsigned char), (*options.common.align_reservoir_samples) * bytes_per_wide_sample, infile);
+                               if(bytes_read == 0 && ferror(infile)) {
+                                       fprintf(stderr, "%s: ERROR during read\n", encoder_session.inbasefilename);
+                                       return EncoderSession_finish_error(&encoder_session);
+                               }
+                               else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
+                                       fprintf(stderr, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
+                               }
+                               else {
+                                       info_align_carry = *options.common.align_reservoir_samples;
+                                       format_input(options.common.align_reservoir, *options.common.align_reservoir_samples, false, options.is_unsigned_samples, options.channels, options.bps);
+                               }
+                       }
                }
        }
-       fclose(fin);
-       unlink(outfile);
-       return 1;
+
+       return EncoderSession_finish_ok(&encoder_session, info_align_carry, info_align_zero);
 }
 
-bool init(encoder_wrapper_struct *encoder_wrapper)
+FLAC__bool EncoderSession_construct(EncoderSession *e, FLAC__bool use_ogg, FLAC__bool verify, FLAC__bool verbose, FILE *infile, const char *infilename, const char *outfilename)
 {
        unsigned i;
-       uint32 test = 1;
+       FLAC__uint32 test = 1;
 
-       is_big_endian_host = (*((byte*)(&test)))? false : true;
+       /*
+        * initialize globals
+        */
+
+       is_big_endian_host_ = (*((FLAC__byte*)(&test)))? false : true;
 
        for(i = 0; i < FLAC__MAX_CHANNELS; i++)
-               input[i] = &(in[i][0]);
+               input_[i] = &(in_[i][0]);
 
-       encoder_wrapper->encoder = FLAC__encoder_get_new_instance();
-       if(0 == encoder_wrapper->encoder) {
-               fprintf(stderr, "ERROR creating the encoder instance\n");
-               return false;
-       }
 
-       return true;
-}
+       /*
+        * initialize instance
+        */
 
-bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, unsigned padding, char *requested_seek_points, int num_requested_seek_points, encoder_wrapper_struct *encoder_wrapper)
-{
-       unsigned i;
+#ifdef FLAC__HAS_OGG
+       e->use_ogg = use_ogg;
+#else
+       (void)use_ogg;
+#endif
+       e->verify = verify;
+       e->verbose = verbose;
 
-       if(channels != 2)
-               do_mid_side = loose_mid_side = false;
-
-       if(encoder_wrapper->verify) {
-               /* set up the fifo which will hold the original signal to compare against */
-               encoder_wrapper->verify_fifo.size = blocksize + CHUNK_OF_SAMPLES;
-               for(i = 0; i < channels; i++) {
-                       if(0 == (encoder_wrapper->verify_fifo.original[i] = (int32*)malloc(sizeof(int32) * encoder_wrapper->verify_fifo.size))) {
-                               fprintf(stderr, "ERROR allocating verify buffers\n");
+       e->is_stdout = (0 == strcmp(outfilename, "-"));
+
+       e->inbasefilename = grabbag__file_get_basename(infilename);
+       e->outfilename = outfilename;
+
+       e->unencoded_size = 0;
+       e->total_samples_to_encode = 0;
+       e->bytes_written = 0;
+       e->samples_written = 0;
+       e->blocksize = 0;
+       e->stats_mask = 0;
+
+       e->encoder.flac.stream = 0;
+       e->encoder.flac.file = 0;
+#ifdef FLAC__HAS_OGG
+       e->encoder.ogg.stream = 0;
+#endif
+
+       e->fin = infile;
+       e->fout = 0;
+       e->seek_table_template = 0;
+
+       if(e->is_stdout) {
+               e->fout = grabbag__file_get_binary_stdout();
+       }
+#ifdef FLAC__HAS_OGG
+       else {
+               if(e->use_ogg) {
+                       if(0 == (e->fout = fopen(outfilename, "wb"))) {
+                               fprintf(stderr, "%s: ERROR: can't open output file %s\n", e->inbasefilename, outfilename);
+                               EncoderSession_destroy(e);
                                return false;
                        }
                }
-               encoder_wrapper->verify_fifo.tail = 0;
-               encoder_wrapper->verify_fifo.into_frames = false;
-               encoder_wrapper->verify_fifo.result = FLAC__VERIFY_OK;
-
-               /* set up a stream decoder for verification */
-               encoder_wrapper->verify_fifo.decoder = FLAC__stream_decoder_get_new_instance();
-               if(0 == encoder_wrapper->verify_fifo.decoder) {
-                       fprintf(stderr, "ERROR creating the verify decoder instance\n");
+       }
+#endif
+
+       if(0 == (e->seek_table_template = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE))) {
+               fprintf(stderr, "%s: ERROR allocating memory for seek table\n", e->inbasefilename);
+               return false;
+       }
+
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               e->encoder.ogg.stream = OggFLAC__stream_encoder_new();
+               if(0 == e->encoder.ogg.stream) {
+                       fprintf(stderr, "%s: ERROR creating the encoder instance\n", e->inbasefilename);
+                       EncoderSession_destroy(e);
+                       return false;
+               }
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               e->encoder.flac.stream = FLAC__stream_encoder_new();
+               if(0 == e->encoder.flac.stream) {
+                       fprintf(stderr, "%s: ERROR creating the encoder instance\n", e->inbasefilename);
+                       EncoderSession_destroy(e);
                        return false;
                }
-               if(FLAC__stream_decoder_init(encoder_wrapper->verify_fifo.decoder, verify_read_callback, verify_write_callback, verify_metadata_callback, verify_error_callback, encoder_wrapper) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) {
-                       fprintf(stderr, "ERROR initializing decoder, state = %d:%s\n", encoder_wrapper->verify_fifo.decoder->state, FLAC__StreamDecoderStateString[encoder_wrapper->verify_fifo.decoder->state]);
+       }
+       else {
+               e->encoder.flac.file = FLAC__file_encoder_new();
+               if(0 == e->encoder.flac.file) {
+                       fprintf(stderr, "%s: ERROR creating the encoder instance\n", e->inbasefilename);
+                       EncoderSession_destroy(e);
                        return false;
                }
        }
 
-       if(!convert_to_seek_table(requested_seek_points, num_requested_seek_points, encoder_wrapper->total_samples_to_encode, blocksize, &encoder_wrapper->seek_table)) {
-               fprintf(stderr, "ERROR allocating seek table\n");
-               return false;
+       return true;
+}
+
+void EncoderSession_destroy(EncoderSession *e)
+{
+       if(e->fin != stdin)
+               fclose(e->fin);
+
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               if(0 != e->encoder.ogg.stream) {
+                       OggFLAC__stream_encoder_delete(e->encoder.ogg.stream);
+                       e->encoder.ogg.stream = 0;
+               }
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               if(0 != e->encoder.flac.stream) {
+                       FLAC__stream_encoder_delete(e->encoder.flac.stream);
+                       e->encoder.flac.stream = 0;
+               }
+       }
+       else {
+               if(0 != e->encoder.flac.file) {
+                       FLAC__file_encoder_delete(e->encoder.flac.file);
+                       e->encoder.flac.file = 0;
+               }
        }
 
-       if(encoder_wrapper->verbose && encoder_wrapper->seek_table.num_points > 0) {
-               if(encoder_wrapper->total_samples_to_encode > 0)
-                       printf("seek points (%llu total samples):", encoder_wrapper->total_samples_to_encode);
-               else
-                       printf("seek points (total samples unknown):");
-               for(i = 0; i < encoder_wrapper->seek_table.num_points; i++) {
-                       if(encoder_wrapper->seek_table.points[i].sample_number != FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER)
-                               printf(" %llu", encoder_wrapper->seek_table.points[i].sample_number);
-                       else
-                               printf(" X");
+       if(0 != e->seek_table_template) {
+               FLAC__metadata_object_delete(e->seek_table_template);
+               e->seek_table_template = 0;
+       }
+}
+
+int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero)
+{
+       FLAC__StreamEncoderState fse_state = FLAC__STREAM_ENCODER_OK;
+       int ret = 0;
+
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               if(e->encoder.ogg.stream) {
+                       fse_state = OggFLAC__stream_encoder_get_FLAC_stream_encoder_state(e->encoder.ogg.stream);
+                       OggFLAC__stream_encoder_finish(e->encoder.ogg.stream);
+               }
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               if(e->encoder.flac.stream) {
+                       fse_state = FLAC__stream_encoder_get_state(e->encoder.flac.stream);
+                       FLAC__stream_encoder_finish(e->encoder.flac.stream);
+               }
+       }
+       else {
+               if(e->encoder.flac.file) {
+                       fse_state = FLAC__file_encoder_get_stream_encoder_state(e->encoder.flac.file);
+                       FLAC__file_encoder_finish(e->encoder.flac.file);
                }
-               printf("\n");
-       }
-
-       encoder_wrapper->encoder->streamable_subset = !lax;
-       encoder_wrapper->encoder->channels = channels;
-       encoder_wrapper->encoder->bits_per_sample = bps;
-       encoder_wrapper->encoder->sample_rate = sample_rate;
-       encoder_wrapper->encoder->blocksize = blocksize;
-       encoder_wrapper->encoder->qlp_coeff_precision = qlp_coeff_precision;
-       encoder_wrapper->encoder->max_lpc_order = max_lpc_order;
-       encoder_wrapper->encoder->do_mid_side_stereo = do_mid_side;
-       encoder_wrapper->encoder->loose_mid_side_stereo = loose_mid_side;
-       encoder_wrapper->encoder->do_exhaustive_model_search = do_exhaustive_model_search;
-       encoder_wrapper->encoder->do_qlp_coeff_prec_search = do_qlp_coeff_prec_search;
-       encoder_wrapper->encoder->rice_optimization_level = rice_optimization_level;
-       encoder_wrapper->encoder->total_samples_estimate = encoder_wrapper->total_samples_to_encode;
-       encoder_wrapper->encoder->seek_table = (encoder_wrapper->seek_table.num_points > 0)? &encoder_wrapper->seek_table : 0;
-       encoder_wrapper->encoder->padding = padding;
-
-       if(FLAC__encoder_init(encoder_wrapper->encoder, write_callback, metadata_callback, encoder_wrapper) != FLAC__ENCODER_OK) {
-               fprintf(stderr, "ERROR initializing encoder, state = %d:%s\n", encoder_wrapper->encoder->state, FLAC__EncoderStateString[encoder_wrapper->encoder->state]);
-               return false;
        }
 
-       /* the above call write all the metadata, so we save the stream offset now */
-       encoder_wrapper->stream_offset = encoder_wrapper->bytes_written;
+       if(e->verbose && e->total_samples_to_encode > 0) {
+               print_stats(e);
+               fprintf(stderr, "\n");
+       }
 
-       return true;
+       if(fse_state == FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) {
+               print_verify_error(e);
+               ret = 1;
+       }
+       else {
+               if(info_align_carry >= 0)
+                       fprintf(stderr, "%s: INFO: sector alignment causing %d samples to be carried over\n", e->inbasefilename, info_align_carry);
+               if(info_align_zero >= 0)
+                       fprintf(stderr, "%s: INFO: sector alignment causing %d zero samples to be appended\n", e->inbasefilename, info_align_zero);
+       }
+
+       EncoderSession_destroy(e);
+
+       return ret;
 }
 
-bool convert_to_seek_table(char *requested_seek_points, int num_requested_seek_points, uint64 stream_samples, unsigned blocksize, FLAC__StreamMetaData_SeekTable *seek_table)
+int EncoderSession_finish_error(EncoderSession *e)
 {
-       unsigned i, j, real_points, placeholders;
-       char *pt = requested_seek_points, *q;
-       bool first;
+       FLAC__StreamEncoderState fse_state;
 
-       seek_table->num_points = 0;
+       if(e->verbose && e->total_samples_to_encode > 0)
+               fprintf(stderr, "\n");
 
-       if(num_requested_seek_points == 0)
-               return true;
-
-       if(num_requested_seek_points < 0) {
-               strcpy(requested_seek_points, "100x<");
-               num_requested_seek_points = 1;
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               fse_state = OggFLAC__stream_encoder_get_FLAC_stream_encoder_state(e->encoder.ogg.stream);
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               fse_state = FLAC__stream_encoder_get_state(e->encoder.flac.stream);
        }
+       else {
+               fse_state = FLAC__file_encoder_get_stream_encoder_state(e->encoder.flac.file);
+       }
+
+       if(fse_state == FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA)
+               print_verify_error(e);
+       else
+               unlink(e->outfilename);
 
-       /* first count how many individual seek point we may need */
-       real_points = placeholders = 0;
-       for(i = 0; i < (unsigned)num_requested_seek_points; i++) {
-               q = strchr(pt, '<');
-               assert(0 != q);
-               *q = '\0';
+       EncoderSession_destroy(e);
+
+       return 1;
+}
 
-               if(0 == strcmp(pt, "X")) { /* -S X */
-                       placeholders++;
+FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t options, unsigned channels, unsigned bps, unsigned sample_rate)
+{
+       unsigned num_metadata;
+       FLAC__StreamMetadata padding, *cuesheet = 0;
+       FLAC__StreamMetadata *metadata[4];
+
+       e->replay_gain = options.replay_gain;
+       e->channels = channels;
+       e->bits_per_sample = bps;
+       e->sample_rate = sample_rate;
+
+       if(e->replay_gain) {
+               if(channels != 1 && channels != 2) {
+                       fprintf(stderr, "%s: ERROR, number of channels (%u) must be 1 or 2 for --replay-gain\n", e->inbasefilename, channels);
+                       return false;
                }
-               else if(pt[strlen(pt)-1] == 'x') { /* -S #x */
-                       if(stream_samples > 0) /* we can only do these if we know the number of samples to encode up front */
-                               real_points += (unsigned)atoi(pt);
+               if(!grabbag__replaygain_is_valid_sample_frequency(sample_rate)) {
+                       fprintf(stderr, "%s: ERROR, invalid sample rate (%u) for --replay-gain\n", e->inbasefilename, sample_rate);
+                       return false;
                }
-               else { /* -S # */
-                       real_points++;
+               if(options.is_first_file) {
+                       if(!grabbag__replaygain_init(sample_rate)) {
+                               fprintf(stderr, "%s: ERROR initializing ReplayGain stage\n", e->inbasefilename);
+                               return false;
+                       }
                }
-               *q++ = '<';
-
-               pt = q;
        }
-       pt = requested_seek_points;
 
-       /* make some space */
-       if(0 == (seek_table->points = (FLAC__StreamMetaData_SeekPoint*)malloc(sizeof(FLAC__StreamMetaData_SeekPoint) * (real_points+placeholders))))
+       if(channels != 2)
+               options.do_mid_side = options.loose_mid_side = false;
+
+       if(!parse_cuesheet_(&cuesheet, options.cuesheet_filename, e->inbasefilename, e->total_samples_to_encode))
                return false;
 
-       /* initialize the seek_table.  we set frame_samples to zero to signify the points have not yet been hit by a frame write yet. */
-       for(i = 0; i < real_points+placeholders; i++) {
-               seek_table->points[i].sample_number = FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
-               seek_table->points[i].stream_offset = 0;
-               seek_table->points[i].frame_samples = 0;
+       if(!convert_to_seek_table_template(options.requested_seek_points, options.num_requested_seek_points, options.cued_seekpoints? cuesheet : 0, e)) {
+               fprintf(stderr, "%s: ERROR allocating memory for seek table\n", e->inbasefilename);
+               if(0 != cuesheet)
+                       free(cuesheet);
+               return false;
        }
 
-       for(i = 0; i < (unsigned)num_requested_seek_points; i++) {
-               q = strchr(pt, '<');
-               assert(0 != q);
-               *q++ = '\0';
-
-               if(0 == strcmp(pt, "X")) { /* -S X */
-                       ; /* we append placeholders later */
-               }
-               else if(pt[strlen(pt)-1] == 'x') { /* -S #x */
-                       if(stream_samples > 0) { /* we can only do these if we know the number of samples to encode up front */
-                               unsigned j, n;
-                               n = (unsigned)atoi(pt);
-                               for(j = 0; j < n; j++)
-                                       append_point_to_seek_table(seek_table, stream_samples * (uint64)j / (uint64)n, stream_samples, blocksize);
-                       }
+       num_metadata = 0;
+       if(e->seek_table_template->data.seek_table.num_points > 0) {
+               e->seek_table_template->is_last = false; /* the encoder will set this for us */
+               metadata[num_metadata++] = e->seek_table_template;
+       }
+       if(0 != cuesheet)
+               metadata[num_metadata++] = cuesheet;
+       metadata[num_metadata++] = options.vorbis_comment;
+       if(options.padding > 0) {
+               padding.is_last = false; /* the encoder will set this for us */
+               padding.type = FLAC__METADATA_TYPE_PADDING;
+               padding.length = (unsigned)options.padding;
+               metadata[num_metadata++] = &padding;
+       }
+
+       e->blocksize = options.blocksize;
+       e->stats_mask = (options.do_exhaustive_model_search || options.do_qlp_coeff_prec_search)? 0x0f : 0x3f;
+
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               if(options.has_serial_number)
+                       OggFLAC__stream_encoder_set_serial_number(e->encoder.ogg.stream, options.serial_number);
+               OggFLAC__stream_encoder_set_verify(e->encoder.ogg.stream, options.verify);
+               OggFLAC__stream_encoder_set_streamable_subset(e->encoder.ogg.stream, !options.lax);
+               OggFLAC__stream_encoder_set_do_mid_side_stereo(e->encoder.ogg.stream, options.do_mid_side);
+               OggFLAC__stream_encoder_set_loose_mid_side_stereo(e->encoder.ogg.stream, options.loose_mid_side);
+               OggFLAC__stream_encoder_set_channels(e->encoder.ogg.stream, channels);
+               OggFLAC__stream_encoder_set_bits_per_sample(e->encoder.ogg.stream, bps);
+               OggFLAC__stream_encoder_set_sample_rate(e->encoder.ogg.stream, sample_rate);
+               OggFLAC__stream_encoder_set_blocksize(e->encoder.ogg.stream, options.blocksize);
+               OggFLAC__stream_encoder_set_max_lpc_order(e->encoder.ogg.stream, options.max_lpc_order);
+               OggFLAC__stream_encoder_set_qlp_coeff_precision(e->encoder.ogg.stream, options.qlp_coeff_precision);
+               OggFLAC__stream_encoder_set_do_qlp_coeff_prec_search(e->encoder.ogg.stream, options.do_qlp_coeff_prec_search);
+               OggFLAC__stream_encoder_set_do_escape_coding(e->encoder.ogg.stream, options.do_escape_coding);
+               OggFLAC__stream_encoder_set_do_exhaustive_model_search(e->encoder.ogg.stream, options.do_exhaustive_model_search);
+               OggFLAC__stream_encoder_set_min_residual_partition_order(e->encoder.ogg.stream, options.min_residual_partition_order);
+               OggFLAC__stream_encoder_set_max_residual_partition_order(e->encoder.ogg.stream, options.max_residual_partition_order);
+               OggFLAC__stream_encoder_set_rice_parameter_search_dist(e->encoder.ogg.stream, options.rice_parameter_search_dist);
+               OggFLAC__stream_encoder_set_total_samples_estimate(e->encoder.ogg.stream, e->total_samples_to_encode);
+               OggFLAC__stream_encoder_set_metadata(e->encoder.ogg.stream, (num_metadata > 0)? metadata : 0, num_metadata);
+               OggFLAC__stream_encoder_set_write_callback(e->encoder.ogg.stream, ogg_stream_encoder_write_callback);
+               OggFLAC__stream_encoder_set_client_data(e->encoder.ogg.stream, e);
+
+               OggFLAC__stream_encoder_disable_constant_subframes(e->encoder.ogg.stream, options.debug.disable_constant_subframes);
+               OggFLAC__stream_encoder_disable_fixed_subframes(e->encoder.ogg.stream, options.debug.disable_fixed_subframes);
+               OggFLAC__stream_encoder_disable_verbatim_subframes(e->encoder.ogg.stream, options.debug.disable_verbatim_subframes);
+
+               if(OggFLAC__stream_encoder_init(e->encoder.ogg.stream) != FLAC__STREAM_ENCODER_OK) {
+                       print_error_with_state(e, "ERROR initializing encoder");
+                       if(0 != cuesheet)
+                               free(cuesheet);
+                       return false;
                }
-               else { /* -S # */
-                       append_point_to_seek_table(seek_table, (uint64)atoi(pt), stream_samples, blocksize);
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               FLAC__stream_encoder_set_verify(e->encoder.flac.stream, options.verify);
+               FLAC__stream_encoder_set_streamable_subset(e->encoder.flac.stream, !options.lax);
+               FLAC__stream_encoder_set_do_mid_side_stereo(e->encoder.flac.stream, options.do_mid_side);
+               FLAC__stream_encoder_set_loose_mid_side_stereo(e->encoder.flac.stream, options.loose_mid_side);
+               FLAC__stream_encoder_set_channels(e->encoder.flac.stream, channels);
+               FLAC__stream_encoder_set_bits_per_sample(e->encoder.flac.stream, bps);
+               FLAC__stream_encoder_set_sample_rate(e->encoder.flac.stream, sample_rate);
+               FLAC__stream_encoder_set_blocksize(e->encoder.flac.stream, options.blocksize);
+               FLAC__stream_encoder_set_max_lpc_order(e->encoder.flac.stream, options.max_lpc_order);
+               FLAC__stream_encoder_set_qlp_coeff_precision(e->encoder.flac.stream, options.qlp_coeff_precision);
+               FLAC__stream_encoder_set_do_qlp_coeff_prec_search(e->encoder.flac.stream, options.do_qlp_coeff_prec_search);
+               FLAC__stream_encoder_set_do_escape_coding(e->encoder.flac.stream, options.do_escape_coding);
+               FLAC__stream_encoder_set_do_exhaustive_model_search(e->encoder.flac.stream, options.do_exhaustive_model_search);
+               FLAC__stream_encoder_set_min_residual_partition_order(e->encoder.flac.stream, options.min_residual_partition_order);
+               FLAC__stream_encoder_set_max_residual_partition_order(e->encoder.flac.stream, options.max_residual_partition_order);
+               FLAC__stream_encoder_set_rice_parameter_search_dist(e->encoder.flac.stream, options.rice_parameter_search_dist);
+               FLAC__stream_encoder_set_total_samples_estimate(e->encoder.flac.stream, e->total_samples_to_encode);
+               FLAC__stream_encoder_set_metadata(e->encoder.flac.stream, (num_metadata > 0)? metadata : 0, num_metadata);
+               FLAC__stream_encoder_set_write_callback(e->encoder.flac.stream, flac_stream_encoder_write_callback);
+               FLAC__stream_encoder_set_metadata_callback(e->encoder.flac.stream, flac_stream_encoder_metadata_callback);
+               FLAC__stream_encoder_set_client_data(e->encoder.flac.stream, e);
+
+               FLAC__stream_encoder_disable_constant_subframes(e->encoder.flac.stream, options.debug.disable_constant_subframes);
+               FLAC__stream_encoder_disable_fixed_subframes(e->encoder.flac.stream, options.debug.disable_fixed_subframes);
+               FLAC__stream_encoder_disable_verbatim_subframes(e->encoder.flac.stream, options.debug.disable_verbatim_subframes);
+
+               if(FLAC__stream_encoder_init(e->encoder.flac.stream) != FLAC__STREAM_ENCODER_OK) {
+                       print_error_with_state(e, "ERROR initializing encoder");
+                       if(0 != cuesheet)
+                               free(cuesheet);
+                       return false;
                }
-
-               pt = q;
        }
-
-       /* sort the seekpoints */
-       qsort(seek_table->points, seek_table->num_points, sizeof(FLAC__StreamMetaData_SeekPoint), (int (*)(const void *, const void *))seekpoint_compare);
-
-       /* uniqify the seekpoints */
-       first = false;
-       for(i = j = 0; i < seek_table->num_points; i++) {
-               if(!first) {
-                       if(seek_table->points[i].sample_number == seek_table->points[j-1].sample_number)
-                               continue;
+       else {
+               FLAC__file_encoder_set_filename(e->encoder.flac.file, e->outfilename);
+               FLAC__file_encoder_set_verify(e->encoder.flac.file, options.verify);
+               FLAC__file_encoder_set_streamable_subset(e->encoder.flac.file, !options.lax);
+               FLAC__file_encoder_set_do_mid_side_stereo(e->encoder.flac.file, options.do_mid_side);
+               FLAC__file_encoder_set_loose_mid_side_stereo(e->encoder.flac.file, options.loose_mid_side);
+               FLAC__file_encoder_set_channels(e->encoder.flac.file, channels);
+               FLAC__file_encoder_set_bits_per_sample(e->encoder.flac.file, bps);
+               FLAC__file_encoder_set_sample_rate(e->encoder.flac.file, sample_rate);
+               FLAC__file_encoder_set_blocksize(e->encoder.flac.file, options.blocksize);
+               FLAC__file_encoder_set_max_lpc_order(e->encoder.flac.file, options.max_lpc_order);
+               FLAC__file_encoder_set_qlp_coeff_precision(e->encoder.flac.file, options.qlp_coeff_precision);
+               FLAC__file_encoder_set_do_qlp_coeff_prec_search(e->encoder.flac.file, options.do_qlp_coeff_prec_search);
+               FLAC__file_encoder_set_do_escape_coding(e->encoder.flac.file, options.do_escape_coding);
+               FLAC__file_encoder_set_do_exhaustive_model_search(e->encoder.flac.file, options.do_exhaustive_model_search);
+               FLAC__file_encoder_set_min_residual_partition_order(e->encoder.flac.file, options.min_residual_partition_order);
+               FLAC__file_encoder_set_max_residual_partition_order(e->encoder.flac.file, options.max_residual_partition_order);
+               FLAC__file_encoder_set_rice_parameter_search_dist(e->encoder.flac.file, options.rice_parameter_search_dist);
+               FLAC__file_encoder_set_total_samples_estimate(e->encoder.flac.file, e->total_samples_to_encode);
+               FLAC__file_encoder_set_metadata(e->encoder.flac.file, (num_metadata > 0)? metadata : 0, num_metadata);
+               FLAC__file_encoder_set_progress_callback(e->encoder.flac.file, flac_file_encoder_progress_callback);
+               FLAC__file_encoder_set_client_data(e->encoder.flac.file, e);
+
+               FLAC__file_encoder_disable_constant_subframes(e->encoder.flac.file, options.debug.disable_constant_subframes);
+               FLAC__file_encoder_disable_fixed_subframes(e->encoder.flac.file, options.debug.disable_fixed_subframes);
+               FLAC__file_encoder_disable_verbatim_subframes(e->encoder.flac.file, options.debug.disable_verbatim_subframes);
+
+               if(FLAC__file_encoder_init(e->encoder.flac.file) != FLAC__FILE_ENCODER_OK) {
+                       print_error_with_state(e, "ERROR initializing encoder");
+                       if(0 != cuesheet)
+                               free(cuesheet);
+                       return false;
                }
-               first = false;
-               seek_table->points[j++] = seek_table->points[i];
        }
-       seek_table->num_points = j;
 
-       /* append placeholders */
-       for(i = 0, j = seek_table->num_points; i < placeholders; i++, j++)
-               seek_table->points[j].sample_number = FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
-       seek_table->num_points += placeholders;
+       if(0 != cuesheet)
+               free(cuesheet);
 
        return true;
 }
 
-void append_point_to_seek_table(FLAC__StreamMetaData_SeekTable *seek_table, uint64 sample, uint64 stream_samples, uint64 blocksize)
+FLAC__bool EncoderSession_process(EncoderSession *e, const FLAC__int32 * const buffer[], unsigned samples)
 {
-       const uint64 target_sample = (sample / blocksize) * blocksize;
+       if(e->replay_gain) {
+               if(!grabbag__replaygain_analyze(buffer, e->channels==2, e->bits_per_sample, samples))
+                       fprintf(stderr, "%s: WARNING, error while calculating ReplayGain\n", e->inbasefilename);
+       }
 
-       if(stream_samples == 0 || target_sample < stream_samples)
-               seek_table->points[seek_table->num_points++].sample_number = target_sample;
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               return OggFLAC__stream_encoder_process(e->encoder.ogg.stream, buffer, samples);
+       }
+       else
+#endif
+       if(e->is_stdout) {
+               return FLAC__stream_encoder_process(e->encoder.flac.stream, buffer, samples);
+       }
+       else {
+               return FLAC__file_encoder_process(e->encoder.flac.file, buffer, samples);
+       }
 }
 
-int seekpoint_compare(const FLAC__StreamMetaData_SeekPoint *l, const FLAC__StreamMetaData_SeekPoint *r)
+FLAC__bool convert_to_seek_table_template(const char *requested_seek_points, int num_requested_seek_points, FLAC__StreamMetadata *cuesheet, EncoderSession *e)
 {
-       /* we don't just 'return l->sample_number - r->sample_number' since the result (int64) might overflow an 'int' */
-       if(l->sample_number == r->sample_number)
-               return 0;
-       else if(l->sample_number < r->sample_number)
-               return -1;
+       FLAC__bool only_placeholders;
+       FLAC__bool has_real_points;
+
+       if(num_requested_seek_points == 0 && 0 == cuesheet)
+               return true;
+
+       if(num_requested_seek_points < 0) {
+               requested_seek_points = "100x;";
+               num_requested_seek_points = 1;
+       }
+
+       if(e->is_stdout)
+               only_placeholders = true;
+#ifdef FLAC__HAS_OGG
+       else if(e->use_ogg)
+               only_placeholders = true;
+#endif
        else
-               return 1;
+               only_placeholders = false;
+
+       if(num_requested_seek_points > 0) {
+               if(!grabbag__seektable_convert_specification_to_template(requested_seek_points, only_placeholders, e->total_samples_to_encode, e->sample_rate, e->seek_table_template, &has_real_points))
+                       return false;
+       }
+
+       if(0 != cuesheet) {
+               unsigned i, j;
+               const FLAC__StreamMetadata_CueSheet *cs = &cuesheet->data.cue_sheet;
+               for(i = 0; i < cs->num_tracks; i++) {
+                       const FLAC__StreamMetadata_CueSheet_Track *tr = cs->tracks+i;
+                       for(j = 0; j < tr->num_indices; j++) {
+                               if(!FLAC__metadata_object_seektable_template_append_point(e->seek_table_template, tr->offset + tr->indices[j].offset))
+                                       return false;
+                               has_real_points = true;
+                       }
+               }
+               if(has_real_points)
+                       if(!FLAC__metadata_object_seektable_template_sort(e->seek_table_template, /*compact=*/true))
+                               return false;
+       }
+
+       if(has_real_points) {
+               if(e->is_stdout)
+                       fprintf(stderr, "%s: WARNING, cannot write back seekpoints when encoding to stdout\n", e->inbasefilename);
+#ifdef FLAC__HAS_OGG
+               else if(e->use_ogg)
+                       fprintf(stderr, "%s: WARNING, cannot write back seekpoints when encoding to Ogg\n", e->inbasefilename);
+#endif
+       }
+
+       return true;
 }
 
-void format_input(unsigned wide_samples, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, encoder_wrapper_struct *encoder_wrapper)
+void format_input(FLAC__int32 *dest[], unsigned wide_samples, FLAC__bool is_big_endian, FLAC__bool is_unsigned_samples, unsigned channels, unsigned bps)
 {
        unsigned wide_sample, sample, channel, byte;
 
@@ -718,33 +1432,33 @@ void format_input(unsigned wide_samples, bool is_big_endian, bool is_unsigned_sa
                if(is_unsigned_samples) {
                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++)
-                                       input[channel][wide_sample] = (int32)ucbuffer[sample] - 0x80;
+                                       dest[channel][wide_sample] = (FLAC__int32)ucbuffer_[sample] - 0x80;
                }
                else {
                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++)
-                                       input[channel][wide_sample] = (int32)scbuffer[sample];
+                                       dest[channel][wide_sample] = (FLAC__int32)scbuffer_[sample];
                }
        }
        else if(bps == 16) {
-               if(is_big_endian != is_big_endian_host) {
+               if(is_big_endian != is_big_endian_host_) {
                        unsigned char tmp;
                        const unsigned bytes = wide_samples * channels * (bps >> 3);
                        for(byte = 0; byte < bytes; byte += 2) {
-                               tmp = ucbuffer[byte];
-                               ucbuffer[byte] = ucbuffer[byte+1];
-                               ucbuffer[byte+1] = tmp;
+                               tmp = ucbuffer_[byte];
+                               ucbuffer_[byte] = ucbuffer_[byte+1];
+                               ucbuffer_[byte+1] = tmp;
                        }
                }
                if(is_unsigned_samples) {
                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++)
-                                       input[channel][wide_sample] = (int32)usbuffer[sample] - 0x8000;
+                                       dest[channel][wide_sample] = (FLAC__int32)usbuffer_[sample] - 0x8000;
                }
                else {
                        for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++)
-                                       input[channel][wide_sample] = (int32)ssbuffer[sample];
+                                       dest[channel][wide_sample] = (FLAC__int32)ssbuffer_[sample];
                }
        }
        else if(bps == 24) {
@@ -752,311 +1466,291 @@ void format_input(unsigned wide_samples, bool is_big_endian, bool is_unsigned_sa
                        unsigned char tmp;
                        const unsigned bytes = wide_samples * channels * (bps >> 3);
                        for(byte = 0; byte < bytes; byte += 3) {
-                               tmp = ucbuffer[byte];
-                               ucbuffer[byte] = ucbuffer[byte+2];
-                               ucbuffer[byte+2] = tmp;
+                               tmp = ucbuffer_[byte];
+                               ucbuffer_[byte] = ucbuffer_[byte+2];
+                               ucbuffer_[byte+2] = tmp;
                        }
                }
                if(is_unsigned_samples) {
                        for(byte = sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++) {
-                                       input[channel][wide_sample]  = ucbuffer[byte++]; input[channel][wide_sample] <<= 8;
-                                       input[channel][wide_sample] |= ucbuffer[byte++]; input[channel][wide_sample] <<= 8;
-                                       input[channel][wide_sample] |= ucbuffer[byte++];
-                                       input[channel][wide_sample] -= 0x800000;
+                                       dest[channel][wide_sample]  = ucbuffer_[byte++]; dest[channel][wide_sample] <<= 8;
+                                       dest[channel][wide_sample] |= ucbuffer_[byte++]; dest[channel][wide_sample] <<= 8;
+                                       dest[channel][wide_sample] |= ucbuffer_[byte++];
+                                       dest[channel][wide_sample] -= 0x800000;
                                }
                }
                else {
                        for(byte = sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++)
                                for(channel = 0; channel < channels; channel++, sample++) {
-                                       input[channel][wide_sample]  = scbuffer[byte++]; input[channel][wide_sample] <<= 8;
-                                       input[channel][wide_sample] |= ucbuffer[byte++]; input[channel][wide_sample] <<= 8;
-                                       input[channel][wide_sample] |= ucbuffer[byte++];
+                                       dest[channel][wide_sample]  = scbuffer_[byte++]; dest[channel][wide_sample] <<= 8;
+                                       dest[channel][wide_sample] |= ucbuffer_[byte++]; dest[channel][wide_sample] <<= 8;
+                                       dest[channel][wide_sample] |= ucbuffer_[byte++];
                                }
                }
        }
        else {
-               assert(0);
-       }
-
-       if(encoder_wrapper->verify) {
-               for(channel = 0; channel < channels; channel++)
-                       memcpy(&encoder_wrapper->verify_fifo.original[channel][encoder_wrapper->verify_fifo.tail], &input[channel][0], sizeof(int32) * wide_samples);
-               encoder_wrapper->verify_fifo.tail += wide_samples;
-               assert(encoder_wrapper->verify_fifo.tail <= encoder_wrapper->verify_fifo.size);
+               FLAC__ASSERT(0);
        }
 }
 
-FLAC__EncoderWriteStatus write_callback(const FLAC__Encoder *encoder, const byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+#ifdef FLAC__HAS_OGG
+FLAC__StreamEncoderWriteStatus ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
 {
-       encoder_wrapper_struct *encoder_wrapper = (encoder_wrapper_struct *)client_data;
-       unsigned mask = (encoder->do_exhaustive_model_search || encoder->do_qlp_coeff_prec_search)? 0x07 : 0x1f;
-
-       /* mark the current seek point if hit (if stream_offset == 0 that means we're still writing metadata and haven't hit the first frame yet) */
-       if(encoder_wrapper->stream_offset > 0 && encoder_wrapper->seek_table.num_points > 0) {
-               uint64 current_sample = (uint64)current_frame * (uint64)encoder->blocksize, test_sample;
-               unsigned i;
-               for(i = encoder_wrapper->first_seek_point_to_check; i < encoder_wrapper->seek_table.num_points; i++) {
-                       test_sample = encoder_wrapper->seek_table.points[i].sample_number;
-                       if(test_sample > current_sample) {
-                               break;
-                       }
-                       else if(test_sample == current_sample) {
-                               encoder_wrapper->seek_table.points[i].stream_offset = encoder_wrapper->bytes_written - encoder_wrapper->stream_offset;
-                               encoder_wrapper->seek_table.points[i].frame_samples = encoder->blocksize;
-                               encoder_wrapper->first_seek_point_to_check++;
-                               break;
-                       }
-                       else {
-                               encoder_wrapper->first_seek_point_to_check++;
-                       }
-               }
-       }
+       EncoderSession *encoder_session = (EncoderSession*)client_data;
 
-       encoder_wrapper->bytes_written += bytes;
-       encoder_wrapper->samples_written += samples;
-       encoder_wrapper->current_frame = current_frame;
+       (void)encoder;
 
-       if(samples && encoder_wrapper->verbose && encoder_wrapper->total_samples_to_encode > 0 && !(current_frame & mask))
-               print_stats(encoder_wrapper);
+       encoder_session->bytes_written += bytes;
+       /*
+        * With Ogg FLAC we don't get one write callback per frame and
+        * we don't have good number for 'samples', so we estimate based
+        * on the frame number and the knowledge that all blocks (except
+        * the last) are the same size.
+        */
+       (void)samples;
+       encoder_session->samples_written = (current_frame+1) * encoder_session->blocksize;
 
-       if(encoder_wrapper->verify) {
-               encoder_wrapper->verify_fifo.encoded_signal = buffer;
-               encoder_wrapper->verify_fifo.encoded_bytes = bytes;
-               if(encoder_wrapper->verify_fifo.into_frames) {
-                       if(!FLAC__stream_decoder_process_one_frame(encoder_wrapper->verify_fifo.decoder)) {
-                               encoder_wrapper->verify_fifo.result = FLAC__VERIFY_FAILED_IN_FRAME;
-                               return FLAC__ENCODER_WRITE_FATAL_ERROR;
-                       }
-               }
-               else {
-                       if(!FLAC__stream_decoder_process_metadata(encoder_wrapper->verify_fifo.decoder)) {
-                               encoder_wrapper->verify_fifo.result = FLAC__VERIFY_FAILED_IN_METADATA;
-                               return FLAC__ENCODER_WRITE_FATAL_ERROR;
-                       }
-               }
-       }
+       if(encoder_session->verbose && encoder_session->total_samples_to_encode > 0 && !(current_frame & encoder_session->stats_mask))
+               print_stats(encoder_session);
 
-       if(fwrite(buffer, sizeof(byte), bytes, encoder_wrapper->fout) == bytes)
-               return FLAC__ENCODER_WRITE_OK;
+       if(fwrite(buffer, sizeof(FLAC__byte), bytes, encoder_session->fout) == bytes)
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
        else
-               return FLAC__ENCODER_WRITE_FATAL_ERROR;
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 }
+#endif
 
-void metadata_callback(const FLAC__Encoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data)
+FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
 {
-       encoder_wrapper_struct *encoder_wrapper = (encoder_wrapper_struct *)client_data;
-       byte b;
-       FILE *f;
-       const uint64 samples = metadata->data.stream_info.total_samples;
-       const unsigned min_framesize = metadata->data.stream_info.min_framesize;
-       const unsigned max_framesize = metadata->data.stream_info.max_framesize;
+       EncoderSession *encoder_session = (EncoderSession*)client_data;
+
+       (void)encoder;
 
-       assert(metadata->type == FLAC__METADATA_TYPE_STREAMINFO);
+       encoder_session->bytes_written += bytes;
+       encoder_session->samples_written += samples;
 
+       if(samples && encoder_session->verbose && encoder_session->total_samples_to_encode > 0 && !(current_frame & encoder_session->stats_mask))
+               print_stats(encoder_session);
+
+       if(fwrite(buffer, sizeof(FLAC__byte), bytes, encoder_session->fout) == bytes)
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
+       else
+               return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
+}
+
+void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
        /*
-        * we get called by the encoder when the encoding process has
-        * finished so that we can update the STREAMINFO and SEEKTABLE
-        * blocks.
+        * Nothing to do; if we get here, we're decoding to stdout, in
+        * which case we can't seek backwards to write new metadata.
         */
+       (void)encoder, (void)metadata, (void)client_data;
+}
+
+void flac_file_encoder_progress_callback(const FLAC__FileEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
+{
+       EncoderSession *encoder_session = (EncoderSession*)client_data;
 
-       (void)encoder; /* silence compiler warning about unused parameter */
+       (void)encoder, (void)total_frames_estimate;
 
-       if(encoder_wrapper->fout == stdout)
-               return;
+       encoder_session->bytes_written = bytes_written;
+       encoder_session->samples_written = samples_written;
 
-       fclose(encoder_wrapper->fout);
-       if(0 == (f = fopen(encoder_wrapper->outfile, "r+b")))
-               return;
+       if(encoder_session->verbose && encoder_session->total_samples_to_encode > 0 && !((frames_written-1) & encoder_session->stats_mask))
+               print_stats(encoder_session);
+}
 
-       /* all this is based on intimate knowledge of the stream header
-        * layout, but a change to the header format that would break this
-        * would also break all streams encoded in the previous format.
-        */
+FLAC__bool parse_cuesheet_(FLAC__StreamMetadata **cuesheet, const char *cuesheet_filename, const char *inbasefilename, FLAC__uint64 lead_out_offset)
+{
+       FILE *f;
+       unsigned last_line_read;
+       const char *error_message;
 
-       if(-1 == fseek(f, 26, SEEK_SET)) goto samples_;
-       fwrite(metadata->data.stream_info.md5sum, 1, 16, f);
-
-samples_:
-       if(-1 == fseek(f, 21, SEEK_SET)) goto framesize_;
-       if(fread(&b, 1, 1, f) != 1) goto framesize_;
-       if(-1 == fseek(f, 21, SEEK_SET)) goto framesize_;
-       b = (b & 0xf0) | (byte)((samples >> 32) & 0x0F);
-       if(fwrite(&b, 1, 1, f) != 1) goto framesize_;
-       b = (byte)((samples >> 24) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto framesize_;
-       b = (byte)((samples >> 16) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto framesize_;
-       b = (byte)((samples >> 8) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto framesize_;
-       b = (byte)(samples & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto framesize_;
-
-framesize_:
-       if(-1 == fseek(f, 12, SEEK_SET)) goto seektable_;
-       b = (byte)((min_framesize >> 16) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-       b = (byte)((min_framesize >> 8) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-       b = (byte)(min_framesize & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-       b = (byte)((max_framesize >> 16) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-       b = (byte)((max_framesize >> 8) & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-       b = (byte)(max_framesize & 0xFF);
-       if(fwrite(&b, 1, 1, f) != 1) goto seektable_;
-
-seektable_:
-       if(encoder_wrapper->seek_table.num_points > 0) {
-               long pos;
-               unsigned i;
-
-               /* convert any unused seek points to placeholders */
-               for(i = 0; i < encoder_wrapper->seek_table.num_points; i++) {
-                       if(encoder_wrapper->seek_table.points[i].sample_number == FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER)
-                               break;
-                       else if(encoder_wrapper->seek_table.points[i].frame_samples == 0)
-                               encoder_wrapper->seek_table.points[i].sample_number = FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
-               }
+       if(0 == cuesheet_filename)
+               return true;
 
-               /* the offset of the seek table data 'pos' should be after then stream sync and STREAMINFO block and SEEKTABLE header */
-               pos = (FLAC__STREAM_SYNC_LEN + FLAC__STREAM_METADATA_IS_LAST_LEN + FLAC__STREAM_METADATA_TYPE_LEN + FLAC__STREAM_METADATA_LENGTH_LEN) / 8;
-               pos += metadata->length;
-               pos += (FLAC__STREAM_METADATA_IS_LAST_LEN + FLAC__STREAM_METADATA_TYPE_LEN + FLAC__STREAM_METADATA_LENGTH_LEN) / 8;
-               if(-1 == fseek(f, pos, SEEK_SET)) goto end_;
-               for(i = 0; i < encoder_wrapper->seek_table.num_points; i++) {
-                       if(!write_big_endian_uint64(f, encoder_wrapper->seek_table.points[i].sample_number)) goto end_;
-                       if(!write_big_endian_uint64(f, encoder_wrapper->seek_table.points[i].stream_offset)) goto end_;
-                       if(!write_big_endian_uint16(f, encoder_wrapper->seek_table.points[i].frame_samples)) goto end_;
-               }
+       if(lead_out_offset == 0) {
+               fprintf(stderr, "%s: ERROR cannot import cuesheet when the number of input samples to encode is unknown\n", inbasefilename);
+               return false;
        }
 
-end_:
+       if(0 == (f = fopen(cuesheet_filename, "r"))) {
+               fprintf(stderr, "%s: ERROR opening cuesheet \"%s\" for reading\n", inbasefilename, cuesheet_filename);
+               return false;
+       }
+
+       *cuesheet = grabbag__cuesheet_parse(f, &error_message, &last_line_read, /*@@@@is_cdda=*/true, lead_out_offset);
+
        fclose(f);
-       return;
+
+       if(0 == *cuesheet) {
+               fprintf(stderr, "%s: ERROR parsing cuesheet \"%s\" on line %u: %s\n", inbasefilename, cuesheet_filename, last_line_read, error_message);
+               return false;
+       }
+
+       return true;
 }
 
-FLAC__StreamDecoderReadStatus verify_read_callback(const FLAC__StreamDecoder *decoder, byte buffer[], unsigned *bytes, void *client_data)
+void print_stats(const EncoderSession *encoder_session)
 {
-       encoder_wrapper_struct *encoder_wrapper = (encoder_wrapper_struct *)client_data;
-       const unsigned encoded_bytes = encoder_wrapper->verify_fifo.encoded_bytes;
-       (void)decoder;
+       const FLAC__uint64 samples_written = min(encoder_session->total_samples_to_encode, encoder_session->samples_written);
+#if defined _MSC_VER || defined __MINGW32__
+       /* with VC++ you have to spoon feed it the casting */
+       const double progress = (double)(FLAC__int64)samples_written / (double)(FLAC__int64)encoder_session->total_samples_to_encode;
+       const double ratio = (double)(FLAC__int64)encoder_session->bytes_written / ((double)(FLAC__int64)encoder_session->unencoded_size * progress);
+#else
+       const double progress = (double)samples_written / (double)encoder_session->total_samples_to_encode;
+       const double ratio = (double)encoder_session->bytes_written / ((double)encoder_session->unencoded_size * progress);
+#endif
 
-       if(encoded_bytes <= *bytes) {
-               *bytes = encoded_bytes;
-               memcpy(buffer, encoder_wrapper->verify_fifo.encoded_signal, *bytes);
+       if(samples_written == encoder_session->total_samples_to_encode) {
+               fprintf(stderr, "\r%s:%s wrote %u bytes, ratio=%0.3f",
+                       encoder_session->inbasefilename,
+                       encoder_session->verify? " Verify OK," : "",
+                       (unsigned)encoder_session->bytes_written,
+                       ratio
+               );
        }
        else {
-               memcpy(buffer, encoder_wrapper->verify_fifo.encoded_signal, *bytes);
-               encoder_wrapper->verify_fifo.encoded_signal += *bytes;
-               encoder_wrapper->verify_fifo.encoded_bytes -= *bytes;
+               fprintf(stderr, "\r%s: %u%% complete, ratio=%0.3f", encoder_session->inbasefilename, (unsigned)floor(progress * 100.0 + 0.5), ratio);
        }
-
-       return FLAC__STREAM_DECODER_READ_CONTINUE;
 }
 
-FLAC__StreamDecoderWriteStatus verify_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data)
+void print_error_with_state(const EncoderSession *e, const char *message)
 {
-       encoder_wrapper_struct *encoder_wrapper = (encoder_wrapper_struct *)client_data;
-       unsigned channel, l, r;
-
-       for(channel = 0; channel < decoder->channels; channel++) {
-               if(0 != memcmp(buffer[channel], encoder_wrapper->verify_fifo.original[channel], sizeof(int32) * decoder->blocksize)) {
-                       fprintf(stderr, "\nERROR: mismatch in decoded data, verify FAILED!\n");
-                       fprintf(stderr, "       Please submit a bug report to http://sourceforge.net/bugs/?func=addbug&group_id=13478\n");
-                       return FLAC__STREAM_DECODER_WRITE_ABORT;
+       const int ilen = strlen(e->inbasefilename) + 1;
+
+       fprintf(stderr, "\n%s: %s\n", e->inbasefilename, message);
+
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               const OggFLAC__StreamEncoderState ose_state = OggFLAC__stream_encoder_get_state(e->encoder.ogg.stream);
+               if(ose_state != OggFLAC__STREAM_ENCODER_FLAC_STREAM_ENCODER_ERROR) {
+                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)ose_state, OggFLAC__StreamEncoderStateString[ose_state]);
+               }
+               else {
+                       const FLAC__StreamEncoderState fse_state = OggFLAC__stream_encoder_get_FLAC_stream_encoder_state(e->encoder.ogg.stream);
+                       if(fse_state != FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) {
+                               fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fse_state, FLAC__StreamEncoderStateString[fse_state]);
+                       }
+                       else {
+                               const FLAC__StreamDecoderState fsd_state = OggFLAC__stream_encoder_get_verify_decoder_state(e->encoder.ogg.stream);
+                               fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsd_state, FLAC__StreamDecoderStateString[fsd_state]);
+                       }
                }
        }
-       /* dequeue the frame from the fifo */
-       for(channel = 0; channel < decoder->channels; channel++) {
-               for(l = 0, r = frame->header.blocksize; r < encoder_wrapper->verify_fifo.tail; l++, r++) {
-                       encoder_wrapper->verify_fifo.original[channel][l] = encoder_wrapper->verify_fifo.original[channel][r];
+       else
+#endif
+       if(e->is_stdout) {
+               const FLAC__StreamEncoderState fse_state = FLAC__stream_encoder_get_state(e->encoder.flac.stream);
+               if(fse_state != FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) {
+                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fse_state, FLAC__StreamEncoderStateString[fse_state]);
+               }
+               else {
+                       const FLAC__StreamDecoderState fsd_state = FLAC__stream_encoder_get_verify_decoder_state(e->encoder.flac.stream);
+                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsd_state, FLAC__StreamDecoderStateString[fsd_state]);
+               }
+       }
+       else {
+               const FLAC__FileEncoderState ffe_state = FLAC__file_encoder_get_state(e->encoder.flac.file);
+               if(ffe_state != FLAC__FILE_ENCODER_SEEKABLE_STREAM_ENCODER_ERROR) {
+                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)ffe_state, FLAC__FileEncoderStateString[ffe_state]);
+               }
+               else {
+                       const FLAC__SeekableStreamEncoderState fsse_state = FLAC__file_encoder_get_seekable_stream_encoder_state(e->encoder.flac.file);
+                       if(fsse_state != FLAC__SEEKABLE_STREAM_ENCODER_STREAM_ENCODER_ERROR) {
+                               fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsse_state, FLAC__SeekableStreamEncoderStateString[fsse_state]);
+                       }
+                       else {
+                               const FLAC__StreamEncoderState fse_state = FLAC__file_encoder_get_stream_encoder_state(e->encoder.flac.file);
+                               if(fse_state != FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) {
+                                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fse_state, FLAC__StreamEncoderStateString[fse_state]);
+                               }
+                               else {
+                                       const FLAC__StreamDecoderState fsd_state = FLAC__file_encoder_get_verify_decoder_state(e->encoder.flac.file);
+                                       fprintf(stderr, "%*s state = %d:%s\n", ilen, "", (int)fsd_state, FLAC__StreamDecoderStateString[fsd_state]);
+                               }
+                       }
                }
        }
-       encoder_wrapper->verify_fifo.tail -= frame->header.blocksize;
-       return FLAC__STREAM_DECODER_WRITE_CONTINUE;
-}
-
-void verify_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data)
-{
-       (void)decoder;
-       (void)metadata;
-       (void)client_data;
 }
 
-void verify_error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+void print_verify_error(EncoderSession *e)
 {
-       (void)decoder;
-       (void)client_data;
-       fprintf(stderr, "\nERROR: verification decoder returned error %d:%s\n", status, FLAC__StreamDecoderErrorStatusString[status]);
-}
+       FLAC__uint64 absolute_sample;
+       unsigned frame_number;
+       unsigned channel;
+       unsigned sample;
+       FLAC__int32 expected;
+       FLAC__int32 got;
 
-void print_stats(const encoder_wrapper_struct *encoder_wrapper)
-{
-#ifdef _MSC_VER
-       /* with VC++ you have to spoon feed it the casting */
-       double progress = (double)(int64)encoder_wrapper->samples_written / (double)(int64)encoder_wrapper->total_samples_to_encode;
-#else
-       double progress = (double)encoder_wrapper->samples_written / (double)encoder_wrapper->total_samples_to_encode;
-#endif
-       printf("\r%0.2f%% complete: frame %u, wrote %u bytes, %u of %u samples, ratio = %5.3f",
-               progress * 100.0, encoder_wrapper->current_frame,
-               (unsigned)encoder_wrapper->bytes_written, (unsigned)encoder_wrapper->samples_written, (unsigned)encoder_wrapper->total_samples_to_encode,
-#ifdef _MSC_VER
-               /* with VC++ you have to spoon feed it the casting */
-               (double)(int64)encoder_wrapper->bytes_written / ((double)(int64)encoder_wrapper->unencoded_size * progress)
-#else
-               (double)encoder_wrapper->bytes_written / ((double)encoder_wrapper->unencoded_size * progress)
+#ifdef FLAC__HAS_OGG
+       if(e->use_ogg) {
+               OggFLAC__stream_encoder_get_verify_decoder_error_stats(e->encoder.ogg.stream, &absolute_sample, &frame_number, &channel, &sample, &expected, &got);
+       }
+       else
 #endif
-       );
-       fflush(stdout);
+       if(e->is_stdout) {
+               FLAC__stream_encoder_get_verify_decoder_error_stats(e->encoder.flac.stream, &absolute_sample, &frame_number, &channel, &sample, &expected, &got);
+       }
+       else {
+               FLAC__file_encoder_get_verify_decoder_error_stats(e->encoder.flac.file, &absolute_sample, &frame_number, &channel, &sample, &expected, &got);
+       }
+
+       fprintf(stderr, "%s: ERROR: mismatch in decoded data, verify FAILED!\n", e->inbasefilename);
+       fprintf(stderr, "       Absolute sample=%u, frame=%u, channel=%u, sample=%u, expected %d, got %d\n", (unsigned)absolute_sample, frame_number, channel, sample, expected, got);
+       fprintf(stderr, "       Please submit a bug report to\n");
+       fprintf(stderr, "           http://sourceforge.net/bugs/?func=addbug&group_id=13478\n");
+       fprintf(stderr, "       Make sure to include an email contact in the comment and/or use the\n");
+       fprintf(stderr, "       \"Monitor\" feature to monitor the bug status.\n");
+       fprintf(stderr, "Verify FAILED!  Do not trust %s\n", e->outfilename);
 }
 
-bool read_little_endian_uint16(FILE *f, uint16 *val, bool eof_ok)
+FLAC__bool read_little_endian_uint16(FILE *f, FLAC__uint16 *val, FLAC__bool eof_ok, const char *fn)
 {
        size_t bytes_read = fread(val, 1, 2, f);
 
        if(bytes_read == 0) {
                if(!eof_ok) {
-                       fprintf(stderr, "ERROR: unexpected EOF\n");
+                       fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
                        return false;
                }
                else
                        return true;
        }
        else if(bytes_read < 2) {
-               fprintf(stderr, "ERROR: unexpected EOF\n");
+               fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
                return false;
        }
        else {
-               if(is_big_endian_host) {
-                       byte tmp, *b = (byte*)val;
+               if(is_big_endian_host_) {
+                       FLAC__byte tmp, *b = (FLAC__byte*)val;
                        tmp = b[1]; b[1] = b[0]; b[0] = tmp;
                }
                return true;
        }
 }
 
-bool read_little_endian_uint32(FILE *f, uint32 *val, bool eof_ok)
+FLAC__bool read_little_endian_uint32(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn)
 {
        size_t bytes_read = fread(val, 1, 4, f);
 
        if(bytes_read == 0) {
                if(!eof_ok) {
-                       fprintf(stderr, "ERROR: unexpected EOF\n");
+                       fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
                        return false;
                }
                else
                        return true;
        }
        else if(bytes_read < 4) {
-               fprintf(stderr, "ERROR: unexpected EOF\n");
+               fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
                return false;
        }
        else {
-               if(is_big_endian_host) {
-                       byte tmp, *b = (byte*)val;
+               if(is_big_endian_host_) {
+                       FLAC__byte tmp, *b = (FLAC__byte*)val;
                        tmp = b[3]; b[3] = b[0]; b[0] = tmp;
                        tmp = b[2]; b[2] = b[1]; b[1] = tmp;
                }
@@ -1064,23 +1758,75 @@ bool read_little_endian_uint32(FILE *f, uint32 *val, bool eof_ok)
        }
 }
 
-bool write_big_endian_uint16(FILE *f, uint16 val)
+FLAC__bool
+read_big_endian_uint16(FILE *f, FLAC__uint16 *val, FLAC__bool eof_ok, const char *fn)
 {
-       if(!is_big_endian_host) {
-               byte *b = (byte *)&val, tmp;
-               tmp = b[0]; b[0] = b[1]; b[1] = tmp;
+       unsigned char buf[4];
+       size_t bytes_read= fread(buf, 1, 2, f);
+
+       if(bytes_read==0U && eof_ok)
+               return true;
+       else if(bytes_read<2U) {
+               fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
+               return false;
        }
-       return fwrite(&val, 1, 2, f) == 2;
+
+       /* this is independent of host endianness */
+       *val= (FLAC__uint16)(buf[0])<<8 | buf[1];
+
+       return true;
 }
 
-bool write_big_endian_uint64(FILE *f, uint64 val)
+FLAC__bool
+read_big_endian_uint32(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn)
 {
-       if(!is_big_endian_host) {
-               byte *b = (byte *)&val, tmp;
-               tmp = b[0]; b[0] = b[7]; b[7] = tmp;
-               tmp = b[1]; b[1] = b[6]; b[6] = tmp;
-               tmp = b[2]; b[2] = b[5]; b[3] = tmp;
-               tmp = b[3]; b[3] = b[4]; b[4] = tmp;
-       }
-       return fwrite(&val, 1, 8, f) == 8;
+       unsigned char buf[4];
+       size_t bytes_read= fread(buf, 1, 4, f);
+
+       if(bytes_read==0U && eof_ok)
+               return true;
+       else if(bytes_read<4U) {
+               fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
+               return false;
+       }
+
+       /* this is independent of host endianness */
+       *val= (FLAC__uint32)(buf[0])<<24 | (FLAC__uint32)(buf[1])<<16 |
+               (FLAC__uint32)(buf[2])<<8 | buf[3];
+
+       return true;
+}
+
+FLAC__bool
+read_sane_extended(FILE *f, FLAC__uint32 *val, FLAC__bool eof_ok, const char *fn)
+       /* Read an IEEE 754 80-bit (aka SANE) extended floating point value from 'f',
+        * convert it into an integral value and store in 'val'.  Return false if only
+        * between 1 and 9 bytes remain in 'f', if 0 bytes remain in 'f' and 'eof_ok' is
+        * false, or if the value is negative, between zero and one, or too large to be
+        * represented by 'val'; return true otherwise.
+        */
+{
+       unsigned int i;
+       unsigned char buf[10];
+       size_t bytes_read= fread(buf, 1U, 10U, f);
+       FLAC__int16 e= ((FLAC__uint16)(buf[0])<<8 | (FLAC__uint16)(buf[1]))-0x3FFF;
+       FLAC__int16 shift= 63-e;
+       FLAC__uint64 p= 0U;
+
+       if(bytes_read==0U && eof_ok)
+               return true;
+       else if(bytes_read<10U) {
+               fprintf(stderr, "%s: ERROR: unexpected EOF\n", fn);
+               return false;
+       }
+       else if((buf[0]>>7)==1U || e<0 || e>63) {
+               fprintf(stderr, "%s: ERROR: invalid floating-point value\n", fn);
+               return false;
+       }
+
+       for(i= 0U; i<8U; ++i)
+               p|= (FLAC__uint64)(buf[i+2])<<(56U-i*8);
+       *val= (FLAC__uint32)((p>>shift)+(p>>(shift-1) & 0x1));
+
+       return true;
 }