Fix a couple of Windows 2Gig file size issues.
[platform/upstream/flac.git] / src / test_seeking / main.c
index d981d03..318bce8 100644 (file)
@@ -1,5 +1,5 @@
-/* test_seeking - Seeking tester for libFLAC and libOggFLAC
- * Copyright (C) 2004,2005  Josh Coalson
+/* test_seeking - Seeking tester for libFLAC
+ * Copyright (C) 2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #else
 #include <sys/time.h>
 #endif
+#include <sys/stat.h> /* for stat() */
 #include "FLAC/assert.h"
-#include "FLAC/file_decoder.h"
-#include "OggFLAC/file_decoder.h"
+#include "FLAC/metadata.h"
+#include "FLAC/stream_decoder.h"
+#include "share/compat.h"
 
 typedef struct {
+       FLAC__int32 **pcm;
+       FLAC__bool got_data;
        FLAC__uint64 total_samples;
+       unsigned channels;
+       unsigned bits_per_sample;
+       FLAC__bool quiet;
        FLAC__bool ignore_errors;
        FLAC__bool error_occurred;
-} decoder_client_data_struct;
+} DecoderClientData;
 
 static FLAC__bool stop_signal_ = false;
 
@@ -51,57 +62,138 @@ static FLAC__bool die_(const char *msg)
        return false;
 }
 
-static FLAC__bool die_f_(const char *msg, const FLAC__FileDecoder *decoder)
+static FLAC__bool die_s_(const char *msg, const FLAC__StreamDecoder *decoder)
 {
-       FLAC__FileDecoderState state = FLAC__file_decoder_get_state(decoder);
+       FLAC__StreamDecoderState state = FLAC__stream_decoder_get_state(decoder);
 
        if(msg)
                printf("FAILED, %s", msg);
        else
                printf("FAILED");
 
-       printf(", state = %u (%s)\n", (unsigned)state, FLAC__FileDecoderStateString[state]);
-       if(state == FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR) {
-               FLAC__SeekableStreamDecoderState state_ = FLAC__file_decoder_get_seekable_stream_decoder_state(decoder);
-               printf("      seekable stream decoder state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamDecoderStateString[state_]);
-               if(state_ == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
-                       FLAC__StreamDecoderState state__ = FLAC__file_decoder_get_stream_decoder_state(decoder);
-                       printf("      stream decoder state = %u (%s)\n", (unsigned)state__, FLAC__StreamDecoderStateString[state__]);
-               }
-       }
+       printf(", state = %u (%s)\n", (unsigned)state, FLAC__StreamDecoderStateString[state]);
 
        return false;
 }
 
-static FLAC__bool die_of_(const char *msg, const OggFLAC__FileDecoder *decoder)
+static unsigned local_rand_(void)
 {
-       OggFLAC__FileDecoderState state = OggFLAC__file_decoder_get_state(decoder);
+#if !defined _MSC_VER && !defined __MINGW32__
+#define RNDFUNC random
+#else
+#define RNDFUNC rand
+#endif
+       /* every RAND_MAX I've ever seen is 2^15-1 or 2^31-1, so a little hackery here: */
+       if (RAND_MAX > 32767)
+               return RNDFUNC();
+       else /* usually MSVC, some solaris */
+               return (RNDFUNC()<<15) | RNDFUNC();
+#undef RNDFUNC
+}
 
-       if(msg)
-               printf("FAILED, %s", msg);
+static FLAC__off_t get_filesize_(const char *srcpath)
+{
+#if defined _MSC_VER || defined __MINGW32__
+       struct _stat64 srcstat;
+
+       if(0 == _stat64(srcpath, &srcstat))
+#else
+       struct stat srcstat;
+
+       if(0 == stat(srcpath, &srcstat))
+#endif
+               return srcstat.st_size;
        else
-               printf("FAILED");
+               return -1;
+}
 
-       printf(", state = %u (%s)\n", (unsigned)state, OggFLAC__SeekableStreamDecoderStateString[state]);
-       if(state == OggFLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR) {
-               OggFLAC__SeekableStreamDecoderState state_ = OggFLAC__file_decoder_get_seekable_stream_decoder_state(decoder);
-               printf("      seekable stream decoder state = %u (%s)\n", (unsigned)state_, OggFLAC__SeekableStreamDecoderStateString[state_]);
-               if(state_ == OggFLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) {
-                       OggFLAC__StreamDecoderState state__ = OggFLAC__file_decoder_get_stream_decoder_state(decoder);
-                       printf("      stream decoder state = %u (%s)\n", (unsigned)state__, OggFLAC__StreamDecoderStateString[state__]);
-                       if(state__ == OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR) {
-                               FLAC__StreamDecoderState state___ = OggFLAC__file_decoder_get_FLAC_stream_decoder_state(decoder);
-                               printf("      FLAC stream decoder state = %u (%s)\n", (unsigned)state___, FLAC__StreamDecoderStateString[state___]);
+static FLAC__bool read_pcm_(FLAC__int32 *pcm[], const char *rawfilename, const char *flacfilename)
+{
+       FILE *f;
+       unsigned channels = 0, bps = 0, samples, i, j;
+
+       FLAC__off_t rawfilesize = get_filesize_(rawfilename);
+       if (rawfilesize < 0) {
+               fprintf(stderr, "ERROR: can't determine filesize for %s\n", rawfilename);
+               return false;
+       }
+       /* get sample format from flac file; would just use FLAC__metadata_get_streaminfo() except it doesn't work for Ogg FLAC yet */
+       {
+#if 0
+               FLAC__StreamMetadata streaminfo;
+               if(!FLAC__metadata_get_streaminfo(flacfilename, &streaminfo)) {
+                       printf("ERROR: getting STREAMINFO from %s\n", flacfilename);
+                       return false;
+               }
+               channels = streaminfo.data.stream_info.channels;
+               bps = streaminfo.data.stream_info.bits_per_sample;
+#else
+               FLAC__bool ok = true;
+               FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
+               FLAC__Metadata_Iterator *it = 0;
+               ok = ok && chain && (FLAC__metadata_chain_read(chain, flacfilename) || FLAC__metadata_chain_read_ogg(chain, flacfilename));
+               ok = ok && (it = FLAC__metadata_iterator_new());
+               if(ok) FLAC__metadata_iterator_init(it, chain);
+               ok = ok && (FLAC__metadata_iterator_get_block(it)->type == FLAC__METADATA_TYPE_STREAMINFO);
+               ok = ok && (channels = FLAC__metadata_iterator_get_block(it)->data.stream_info.channels);
+               ok = ok && (bps = FLAC__metadata_iterator_get_block(it)->data.stream_info.bits_per_sample);
+               if(it) FLAC__metadata_iterator_delete(it);
+               if(chain) FLAC__metadata_chain_delete(chain);
+               if(!ok) {
+                       printf("ERROR: getting STREAMINFO from %s\n", flacfilename);
+                       return false;
+               }
+#endif
+       }
+       if(channels > 2) {
+               printf("ERROR: PCM verification requires 1 or 2 channels, got %u\n", channels);
+               return false;
+       }
+       if(bps != 8 && bps != 16) {
+               printf("ERROR: PCM verification requires 8 or 16 bps, got %u\n", bps);
+               return false;
+       }
+       samples = rawfilesize / channels / (bps>>3);
+       if (samples > 10000000) {
+               fprintf(stderr, "ERROR: %s is too big\n", rawfilename);
+               return false;
+       }
+       for(i = 0; i < channels; i++) {
+               if(0 == (pcm[i] = malloc(sizeof(FLAC__int32)*samples))) {
+                       printf("ERROR: allocating space for PCM samples\n");
+                       return false;
+               }
+       }
+       if(0 == (f = fopen(rawfilename, "rb"))) {
+               printf("ERROR: opening %s for reading\n", rawfilename);
+               return false;
+       }
+       /* assumes signed big-endian data */
+       if(bps == 8) {
+               signed char c;
+               for(i = 0; i < samples; i++) {
+                       for(j = 0; j < channels; j++) {
+                               if (fread(&c, 1, 1, f) == 1)
+                                       pcm[j][i] = c;
                        }
                }
        }
-
-       return false;
+       else { /* bps == 16 */
+               unsigned char c[2];
+               for(i = 0; i < samples; i++) {
+                       for(j = 0; j < channels; j++) {
+                               if (fread(&c, 1, 2, f) == 2)
+                                       pcm[j][i] = ((int)((signed char)c[0])) << 8 | (int)c[1];
+                       }
+               }
+       }
+       fclose(f);
+       return true;
 }
 
-static FLAC__StreamDecoderWriteStatus file_decoder_write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
 {
-       decoder_client_data_struct *dcd = (decoder_client_data_struct*)client_data;
+       DecoderClientData *dcd = (DecoderClientData*)client_data;
 
        (void)decoder, (void)buffer;
 
@@ -113,23 +205,28 @@ static FLAC__StreamDecoderWriteStatus file_decoder_write_callback_(const FLAC__F
        if(dcd->error_occurred)
                return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-       if (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER)
-               printf("frame@%uf(%u)... ", frame->header.number.frame_number, frame->header.blocksize);
-       else if (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER)
-               printf("frame@%llu(%u)... ", frame->header.number.sample_number, frame->header.blocksize);
-       else {
-               FLAC__ASSERT(0);
-               dcd->error_occurred = true;
-               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-       }
+       FLAC__ASSERT(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER); /* decoder guarantees this */
+       if (!dcd->quiet)
+               printf("frame@%" PRIu64 "(%u)... ", frame->header.number.sample_number, frame->header.blocksize);
        fflush(stdout);
 
+       /* check against PCM data if we have it */
+       if (dcd->pcm) {
+               unsigned c, i, j;
+               for (c = 0; c < frame->header.channels; c++)
+                       for (i = (unsigned)frame->header.number.sample_number, j = 0; j < frame->header.blocksize; i++, j++)
+                               if (buffer[c][j] != dcd->pcm[c][i]) {
+                                       printf("ERROR: sample mismatch at sample#%u(%u), channel=%u, expected %d, got %d\n", i, j, c, buffer[c][j], dcd->pcm[c][i]);
+                                       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+                               }
+       }
+
        return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
-static void file_decoder_metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+static void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 {
-       decoder_client_data_struct *dcd = (decoder_client_data_struct*)client_data;
+       DecoderClientData *dcd = (DecoderClientData*)client_data;
 
        (void)decoder;
 
@@ -141,13 +238,17 @@ static void file_decoder_metadata_callback_(const FLAC__FileDecoder *decoder, co
        if(dcd->error_occurred)
                return;
 
-       if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
+       if (!dcd->got_data && metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+               dcd->got_data = true;
                dcd->total_samples = metadata->data.stream_info.total_samples;
+               dcd->channels = metadata->data.stream_info.channels;
+               dcd->bits_per_sample = metadata->data.stream_info.bits_per_sample;
+       }
 }
 
-static void file_decoder_error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+static void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
 {
-       decoder_client_data_struct *dcd = (decoder_client_data_struct*)client_data;
+       DecoderClientData *dcd = (DecoderClientData*)client_data;
 
        (void)decoder;
 
@@ -162,50 +263,67 @@ static void file_decoder_error_callback_(const FLAC__FileDecoder *decoder, FLAC_
        }
 }
 
-static FLAC__bool seek_barrage_native_flac(const char *filename, unsigned count)
+/* read mode:
+ * 0 - no read after seek
+ * 1 - read 2 frames
+ * 2 - read until end
+ */
+static FLAC__bool seek_barrage(FLAC__bool is_ogg, const char *filename, FLAC__off_t filesize, unsigned count, FLAC__int64 total_samples, unsigned read_mode, FLAC__int32 **pcm)
 {
-       FLAC__FileDecoder *decoder;
-       decoder_client_data_struct decoder_client_data;
+       FLAC__StreamDecoder *decoder;
+       DecoderClientData decoder_client_data;
        unsigned i;
        long int n;
 
+       decoder_client_data.pcm = pcm;
+       decoder_client_data.got_data = false;
        decoder_client_data.total_samples = 0;
+       decoder_client_data.quiet = false;
        decoder_client_data.ignore_errors = false;
        decoder_client_data.error_occurred = false;
 
-       printf("\n+++ seek test: FLAC__FileDecoder\n\n");
+       printf("\n+++ seek test: FLAC__StreamDecoder (%s FLAC, read_mode=%u)\n\n", is_ogg? "Ogg":"native", read_mode);
 
-       decoder = FLAC__file_decoder_new();
+       decoder = FLAC__stream_decoder_new();
        if(0 == decoder)
-               return die_("FLAC__file_decoder_new() FAILED, returned NULL\n");
+               return die_("FLAC__stream_decoder_new() FAILED, returned NULL\n");
 
-       if(!FLAC__file_decoder_set_write_callback(decoder, file_decoder_write_callback_))
-               return die_f_("FLAC__file_decoder_set_write_callback() FAILED", decoder);
-
-       if(!FLAC__file_decoder_set_metadata_callback(decoder, file_decoder_metadata_callback_))
-               return die_f_("FLAC__file_decoder_set_metadata_callback() FAILED", decoder);
+       if(is_ogg) {
+               if(FLAC__stream_decoder_init_ogg_file(decoder, filename, write_callback_, metadata_callback_, error_callback_, &decoder_client_data) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+                       return die_s_("FLAC__stream_decoder_init_file() FAILED", decoder);
+       }
+       else {
+               if(FLAC__stream_decoder_init_file(decoder, filename, write_callback_, metadata_callback_, error_callback_, &decoder_client_data) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+                       return die_s_("FLAC__stream_decoder_init_file() FAILED", decoder);
+       }
 
-       if(!FLAC__file_decoder_set_error_callback(decoder, file_decoder_error_callback_))
-               return die_f_("FLAC__file_decoder_set_error_callback() FAILED", decoder);
+       if(!FLAC__stream_decoder_process_until_end_of_metadata(decoder))
+               return die_s_("FLAC__stream_decoder_process_until_end_of_metadata() FAILED", decoder);
 
-       if(!FLAC__file_decoder_set_client_data(decoder, &decoder_client_data))
-               return die_f_("FLAC__file_decoder_set_client_data() FAILED", decoder);
+       if(!is_ogg) { /* not necessary to do this for Ogg because of its seeking method */
+       /* process until end of stream to make sure we can still seek in that state */
+               decoder_client_data.quiet = true;
+               if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
+                       return die_s_("FLAC__stream_decoder_process_until_end_of_stream() FAILED", decoder);
+               decoder_client_data.quiet = false;
 
-       if(!FLAC__file_decoder_set_filename(decoder, filename))
-               return die_f_("FLAC__file_decoder_set_filename() FAILED", decoder);
+               printf("stream decoder state is %s\n", FLAC__stream_decoder_get_resolved_state_string(decoder));
+               if(FLAC__stream_decoder_get_state(decoder) != FLAC__STREAM_DECODER_END_OF_STREAM)
+                       return die_s_("expected FLAC__STREAM_DECODER_END_OF_STREAM", decoder);
+       }
 
-       if(FLAC__file_decoder_init(decoder) != FLAC__FILE_DECODER_OK)
-               return die_f_("FLAC__file_decoder_init() FAILED", decoder);
+       printf("file's total_samples is %" PRIu64 "\n", decoder_client_data.total_samples);
+       n = (long int)decoder_client_data.total_samples;
 
-       if(!FLAC__file_decoder_process_until_end_of_metadata(decoder))
-               return die_f_("FLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
+       if(n == 0 && total_samples >= 0)
+               n = (long int)total_samples;
 
-       printf("file's total_samples is %llu\n", decoder_client_data.total_samples);
-       if (decoder_client_data.total_samples == 0 || decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
-               printf("ERROR: must be 0 < total_samples < %u\n", (unsigned)RAND_MAX);
-               return false;
+       /* if we don't have a total samples count, just guess based on the file size */
+       /* @@@ for is_ogg we should get it from last page's granulepos */
+       if(n == 0) {
+               /* 8 would imply no compression, 9 guarantees that we will get some samples off the end of the stream to test that case */
+               n = 9 * filesize / (decoder_client_data.channels * decoder_client_data.bits_per_sample);
        }
-       n = (long int)decoder_client_data.total_samples;
 
        printf("Begin seek barrage, count=%u\n", count);
 
@@ -220,170 +338,159 @@ static FLAC__bool seek_barrage_native_flac(const char *filename, unsigned count)
                else if (n >= 10 && i < 20) {
                        pos = n - 1 - (i-10);
                }
+               /* for the third 10, seek past the end and make sure we fail properly as expected */
+               else if (i < 30) {
+                       pos = n + (i-20);
+               }
                else {
-#if !defined _MSC_VER && !defined __MINGW32__
-                       pos = (FLAC__uint64)(random() % n);
-#else
-                       pos = (FLAC__uint64)(rand() % n);
-#endif
+                       pos = (FLAC__uint64)(local_rand_() % n);
                }
 
-               printf("seek(%llu)... ", pos);
-               fflush(stdout);
-               if(!FLAC__file_decoder_seek_absolute(decoder, pos))
-                       return die_f_("FLAC__file_decoder_seek_absolute() FAILED", decoder);
-
-               printf("decode_frame... ");
-               fflush(stdout);
-               if(!FLAC__file_decoder_process_single(decoder))
-                       return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
-
-               printf("decode_frame... ");
+               printf("#%u:seek(%" PRIu64 ")... ", i, pos);
                fflush(stdout);
-               if(!FLAC__file_decoder_process_single(decoder))
-                       return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
+               if(!FLAC__stream_decoder_seek_absolute(decoder, pos)) {
+                       if(pos >= (FLAC__uint64)n)
+                               printf("seek past end failed as expected... ");
+                       else if(decoder_client_data.total_samples == 0 && total_samples <= 0)
+                               printf("seek failed, assuming it was past EOF... ");
+                       else
+                               return die_s_("FLAC__stream_decoder_seek_absolute() FAILED", decoder);
+                       if(!FLAC__stream_decoder_flush(decoder))
+                               return die_s_("FLAC__stream_decoder_flush() FAILED", decoder);
+               }
+               else if(read_mode == 1) {
+                       printf("decode_frame... ");
+                       fflush(stdout);
+                       if(!FLAC__stream_decoder_process_single(decoder))
+                               return die_s_("FLAC__stream_decoder_process_single() FAILED", decoder);
+
+                       printf("decode_frame... ");
+                       fflush(stdout);
+                       if(!FLAC__stream_decoder_process_single(decoder))
+                               return die_s_("FLAC__stream_decoder_process_single() FAILED", decoder);
+               }
+               else if(read_mode == 2) {
+                       printf("decode_all... ");
+                       fflush(stdout);
+                       decoder_client_data.quiet = true;
+                       if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
+                               return die_s_("FLAC__stream_decoder_process_until_end_of_stream() FAILED", decoder);
+                       decoder_client_data.quiet = false;
+               }
 
                printf("OK\n");
                fflush(stdout);
        }
+       stop_signal_ = false;
+
+       if(FLAC__stream_decoder_get_state(decoder) != FLAC__STREAM_DECODER_UNINITIALIZED) {
+               if(!FLAC__stream_decoder_finish(decoder))
+                       return die_s_("FLAC__stream_decoder_finish() FAILED", decoder);
+       }
 
+       FLAC__stream_decoder_delete(decoder);
        printf("\nPASSED!\n");
 
        return true;
 }
 
-static FLAC__bool seek_barrage_ogg_flac(const char *filename, unsigned count)
+#ifdef _MSC_VER
+/* There's no strtoull() in MSVC6 so we just write a specialized one */
+static FLAC__uint64 local__strtoull(const char *src)
 {
-       OggFLAC__FileDecoder *decoder;
-       decoder_client_data_struct decoder_client_data;
-       unsigned i;
-       long int n;
-
-       decoder_client_data.total_samples = 0;
-       decoder_client_data.ignore_errors = false;
-       decoder_client_data.error_occurred = false;
-
-       printf("\n+++ seek test: OggFLAC__FileDecoder\n\n");
-
-       decoder = OggFLAC__file_decoder_new();
-       if(0 == decoder)
-               return die_("OggFLAC__file_decoder_new() FAILED, returned NULL\n");
-
-       if(!OggFLAC__file_decoder_set_write_callback(decoder, (OggFLAC__FileDecoderWriteCallback)file_decoder_write_callback_))
-               return die_of_("OggFLAC__file_decoder_set_write_callback() FAILED", decoder);
-
-       if(!OggFLAC__file_decoder_set_metadata_callback(decoder, (OggFLAC__FileDecoderMetadataCallback)file_decoder_metadata_callback_))
-               return die_of_("OggFLAC__file_decoder_set_metadata_callback() FAILED", decoder);
-
-       if(!OggFLAC__file_decoder_set_error_callback(decoder, (OggFLAC__FileDecoderErrorCallback)file_decoder_error_callback_))
-               return die_of_("OggFLAC__file_decoder_set_error_callback() FAILED", decoder);
-
-       if(!OggFLAC__file_decoder_set_client_data(decoder, &decoder_client_data))
-               return die_of_("OggFLAC__file_decoder_set_client_data() FAILED", decoder);
-
-       if(!OggFLAC__file_decoder_set_filename(decoder, filename))
-               return die_of_("OggFLAC__file_decoder_set_filename() FAILED", decoder);
-
-       if(OggFLAC__file_decoder_init(decoder) != OggFLAC__FILE_DECODER_OK)
-               return die_of_("OggFLAC__file_decoder_init() FAILED", decoder);
-
-       if(!OggFLAC__file_decoder_process_until_end_of_metadata(decoder))
-               return die_of_("OggFLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
-
-       printf("file's total_samples is %llu\n", decoder_client_data.total_samples);
-       if (decoder_client_data.total_samples == 0 || decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
-               printf("ERROR: must be 0 < total_samples < %u\n", (unsigned)RAND_MAX);
-               return false;
-       }
-       n = (long int)decoder_client_data.total_samples;
-
-       printf("Begin seek barrage, count=%u\n", count);
-
-       for (i = 0; !stop_signal_ && (count == 0 || i < count); i++) {
-               FLAC__uint64 pos;
-
-               /* for the first 10, seek to the first 10 samples */
-               if (n >= 10 && i < 10) {
-                       pos = i;
-               }
-               /* for the second 10, seek to the last 10 samples */
-               else if (n >= 10 && i < 20) {
-                       pos = n - 1 - (i-10);
-               }
-               else {
-#if !defined _MSC_VER && !defined __MINGW32__
-                       pos = (FLAC__uint64)(random() % n);
-#else
-                       pos = (FLAC__uint64)(rand() % n);
-#endif
-               }
-
-               printf("seek(%llu)... ", pos);
-               fflush(stdout);
-               if(!OggFLAC__file_decoder_seek_absolute(decoder, pos))
-                       return die_of_("OggFLAC__file_decoder_seek_absolute() FAILED", decoder);
-
-               printf("decode_frame... ");
-               fflush(stdout);
-               if(!OggFLAC__file_decoder_process_single(decoder))
-                       return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
-
-               printf("decode_frame... ");
-               fflush(stdout);
-               if(!OggFLAC__file_decoder_process_single(decoder))
-                       return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
-
-               printf("OK\n");
-               fflush(stdout);
+       FLAC__uint64 ret = 0;
+       int c;
+       FLAC__ASSERT(0 != src);
+       while(0 != (c = *src++)) {
+               c -= '0';
+               if(c >= 0 && c <= 9)
+                       ret = (ret * 10) + c;
+               else
+                       break;
        }
-
-       printf("\nPASSED!\n");
-
-       return true;
+       return ret;
 }
+#endif
 
 int main(int argc, char *argv[])
 {
-       const char *filename;
-       unsigned count = 0;
+       const char *flacfilename, *rawfilename = 0;
+       unsigned count = 0, read_mode;
+       FLAC__int64 samples = -1;
+       FLAC__off_t flacfilesize;
+       FLAC__int32 *pcm[2] = { 0, 0 };
+       FLAC__bool ok = true;
 
-       static const char * const usage = "usage: test_seeking file.flac [#seeks]\n";
+       static const char * const usage = "usage: test_seeking file.flac [#seeks] [#samples-in-file.flac] [file.raw]\n";
 
-       if (argc < 1 || argc > 3) {
-               fprintf(stderr, usage);
+       if (argc < 2 || argc > 5) {
+               fputs(usage, stderr);
                return 1;
        }
 
-       filename = argv[1];
+       flacfilename = argv[1];
 
        if (argc > 2)
                count = strtoul(argv[2], 0, 10);
+       if (argc > 3)
+#ifdef _MSC_VER
+               samples = local__strtoull(argv[3]);
+#else
+               samples = strtoull(argv[3], 0, 10);
+#endif
+       if (argc > 4)
+               rawfilename = argv[4];
 
-       if (count < 20)
-               fprintf(stderr, "WARNING: random seeks don't kick in until after 20 preprogrammed ones\n");
+       if (count < 30)
+               fprintf(stderr, "WARNING: random seeks don't kick in until after 30 preprogrammed ones\n");
 
 #if !defined _MSC_VER && !defined __MINGW32__
        {
                struct timeval tv;
 
-               if(gettimeofday(&tv, 0) < 0) {
+               if (gettimeofday(&tv, 0) < 0) {
                        fprintf(stderr, "WARNING: couldn't seed RNG with time\n");
                        tv.tv_usec = 4321;
                }
                srandom(tv.tv_usec);
        }
 #else
-       srand(time(0));
+       srand((unsigned)time(0));
 #endif
 
+       flacfilesize = get_filesize_(flacfilename);
+       if (flacfilesize < 0) {
+               fprintf(stderr, "ERROR: can't determine filesize for %s\n", flacfilename);
+               return 1;
+       }
+
+       if (rawfilename && !read_pcm_(pcm, rawfilename, flacfilename)) {
+               free(pcm[0]);
+               free(pcm[1]);
+               return 1;
+       }
+
        (void) signal(SIGINT, our_sigint_handler_);
 
-       {
-               FLAC__bool ok;
-               if (strlen(filename) > 4 && 0 == strcmp(filename+strlen(filename)-4, ".ogg"))
-                       ok = seek_barrage_ogg_flac(filename, count);
-               else
-                       ok = seek_barrage_native_flac(filename, count);
-               return ok? 0 : 2;
+       for (read_mode = 0; ok && read_mode <= 2; read_mode++) {
+               /* no need to do "decode all" read_mode if PCM checking is available */
+               if (rawfilename && read_mode > 1)
+                       continue;
+               if (strlen(flacfilename) > 4 && (0 == strcmp(flacfilename+strlen(flacfilename)-4, ".oga") || 0 == strcmp(flacfilename+strlen(flacfilename)-4, ".ogg"))) {
+#if FLAC__HAS_OGG
+                       ok = seek_barrage(/*is_ogg=*/true, flacfilename, flacfilesize, count, samples, read_mode, rawfilename? pcm : 0);
+#else
+                       fprintf(stderr, "ERROR: Ogg FLAC not supported\n");
+                       ok = false;
+#endif
+               }
+               else {
+                       ok = seek_barrage(/*is_ogg=*/false, flacfilename, flacfilesize, count, samples, read_mode, rawfilename? pcm : 0);
+               }
        }
+
+       free(pcm[0]);
+       free(pcm[1]);
+
+       return ok? 0 : 2;
 }