merge down from merged-API-layer branch: cvs -q up -dP -j API_LAYER_MERGING_BASELINE -j API_LAYER_MERGING_BRANCH

1 files changed, 85 insertions, 713 deletions

diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 34ec1ae5..053695f3 100644
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -20,23 +20,42 @@
 #  include <config.h>
 #endif
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "encoders.h"
-#include "file_utils.h"
-#include "metadata_utils.h"
 #include "FLAC/assert.h"
-#include "FLAC/file_encoder.h"
-#include "FLAC/seekable_stream_encoder.h"
 #include "FLAC/stream_encoder.h"
 #include "share/grabbag.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "test_libs_common/file_utils_flac.h"
+#include "test_libs_common/metadata_utils.h"
+
+typedef enum {
+	LAYER_STREAM = 0, /* FLAC__stream_encoder_init_stream() without seeking */
+	LAYER_SEEKABLE_STREAM, /* FLAC__stream_encoder_init_stream() with seeking */
+	LAYER_FILE, /* FLAC__stream_encoder_init_FILE() */
+	LAYER_FILENAME /* FLAC__stream_encoder_init_file() */
+} Layer;
+
+static const char * const LayerString[] = {
+	"Stream",
+	"Seekable Stream",
+	"FILE*",
+	"Filename"
+};
 
 static FLAC__StreamMetadata streaminfo_, padding_, seektable_, application1_, application2_, vorbiscomment_, cuesheet_, unknown_;
 static FLAC__StreamMetadata *metadata_sequence_[] = { &padding_, &seektable_, &application1_, &application2_, &vorbiscomment_, &cuesheet_, &unknown_ };
 static const unsigned num_metadata_ = sizeof(metadata_sequence_) / sizeof(metadata_sequence_[0]);
 static const char *flacfilename_ = "metadata.flac";
 
+static FLAC__bool die_(const char *msg)
+{
+	printf("ERROR: %s\n", msg);
+	return false;
+}
+
 static FLAC__bool die_s_(const char *msg, const FLAC__StreamEncoder *encoder)
 {
 	FLAC__StreamEncoderState state = FLAC__stream_encoder_get_state(encoder);
@@ -55,54 +74,6 @@ static FLAC__bool die_s_(const char *msg, const FLAC__StreamEncoder *encoder)
 	return false;
 }
 
-static FLAC__bool die_ss_(const char *msg, const FLAC__SeekableStreamEncoder *encoder)
-{
-	FLAC__SeekableStreamEncoderState state = FLAC__seekable_stream_encoder_get_state(encoder);
-
-	if(msg)
-		printf("FAILED, %s", msg);
-	else
-		printf("FAILED");
-
-	printf(", state = %u (%s)\n", (unsigned)state, FLAC__SeekableStreamEncoderStateString[state]);
-	if(state == FLAC__SEEKABLE_STREAM_ENCODER_STREAM_ENCODER_ERROR) {
-		FLAC__StreamEncoderState state_ = FLAC__seekable_stream_encoder_get_stream_encoder_state(encoder);
-		printf("      stream encoder state = %u (%s)\n", (unsigned)state_, FLAC__StreamEncoderStateString[state_]);
-		if(state_ == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) {
-			FLAC__StreamDecoderState dstate = FLAC__seekable_stream_encoder_get_verify_decoder_state(encoder);
-			printf("      verify decoder state = %u (%s)\n", (unsigned)dstate, FLAC__StreamDecoderStateString[dstate]);
-		}
-	}
-
-	return false;
-}
-
-static FLAC__bool die_f_(const char *msg, const FLAC__FileEncoder *encoder)
-{
-	FLAC__FileEncoderState state = FLAC__file_encoder_get_state(encoder);
-
-	if(msg)
-		printf("FAILED, %s", msg);
-	else
-		printf("FAILED");
-
-	printf(", state = %u (%s)\n", (unsigned)state, FLAC__FileEncoderStateString[state]);
-	if(state == FLAC__FILE_ENCODER_SEEKABLE_STREAM_ENCODER_ERROR) {
-		FLAC__SeekableStreamEncoderState state_ = FLAC__file_encoder_get_seekable_stream_encoder_state(encoder);
-		printf("      seekable stream encoder state = %u (%s)\n", (unsigned)state_, FLAC__SeekableStreamEncoderStateString[state_]);
-		if(state_ == FLAC__SEEKABLE_STREAM_ENCODER_STREAM_ENCODER_ERROR) {
-			FLAC__StreamEncoderState state__ = FLAC__file_encoder_get_stream_encoder_state(encoder);
-			printf("      stream encoder state = %u (%s)\n", (unsigned)state__, FLAC__StreamEncoderStateString[state__]);
-			if(state__ == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) {
-				FLAC__StreamDecoderState dstate = FLAC__file_encoder_get_verify_decoder_state(encoder);
-				printf("      verify decoder state = %u (%s)\n", (unsigned)dstate, FLAC__StreamDecoderStateString[dstate]);
-			}
-		}
-	}
-
-	return false;
-}
-
 static void init_metadata_blocks_()
 {
 	mutils__init_metadata_blocks(&streaminfo_, &padding_, &seektable_, &application1_, &application2_, &vorbiscomment_, &cuesheet_, &unknown_);
@@ -119,23 +90,42 @@ static FLAC__StreamEncoderWriteStatus stream_encoder_write_callback_(const FLAC_
 	return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
+static FLAC__StreamEncoderSeekStatus stream_encoder_seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+{
+	(void)encoder, (void)absolute_byte_offset, (void)client_data;
+	return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
+}
+
+static FLAC__StreamEncoderTellStatus stream_encoder_tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+{
+	(void)encoder, (void)client_data;
+	*absolute_byte_offset = 0;
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
+}
+
 static void stream_encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
 {
 	(void)encoder, (void)metadata, (void)client_data;
 }
 
-static FLAC__bool test_stream_encoder()
+static void stream_encoder_progress_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
+{
+	(void)encoder, (void)bytes_written, (void)samples_written, (void)frames_written, (void)total_frames_estimate, (void)client_data;
+}
+
+static FLAC__bool test_stream_encoder(Layer layer)
 {
 	FLAC__StreamEncoder *encoder;
 	FLAC__StreamEncoderState state;
 	FLAC__StreamDecoderState dstate;
+	FILE *file = 0;
 	FLAC__int32 samples[1024];
 	FLAC__int32 *samples_array[1];
 	unsigned i;
 
 	samples_array[0] = samples;
 
-	printf("\n+++ libFLAC unit test: FLAC__StreamEncoder\n\n");
+	printf("\n+++ libFLAC unit test: FLAC__StreamEncoder (layer: %s)\n\n", LayerString[layer]);
 
 	printf("testing FLAC__stream_encoder_new()... ");
 	encoder = FLAC__stream_encoder_new();
@@ -235,24 +225,39 @@ static FLAC__bool test_stream_encoder()
 		return die_s_("returned false", encoder);
 	printf("OK\n");
 
-	printf("testing FLAC__stream_encoder_set_write_callback()... ");
-	if(!FLAC__stream_encoder_set_write_callback(encoder, stream_encoder_write_callback_))
-		return die_s_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__stream_encoder_set_metadata_callback()... ");
-	if(!FLAC__stream_encoder_set_metadata_callback(encoder, stream_encoder_metadata_callback_))
-		return die_s_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__stream_encoder_set_client_data()... ");
-	if(!FLAC__stream_encoder_set_client_data(encoder, 0))
-		return die_s_("returned false", encoder);
-	printf("OK\n");
+	switch(layer) {
+		case LAYER_STREAM:
+			printf("testing FLAC__stream_encoder_init_stream()... ");
+			if(FLAC__stream_encoder_init_stream(encoder, stream_encoder_write_callback_, /*seek_callback=*/0, /*tell_callback=*/0, stream_encoder_metadata_callback_, /*client_data=*/0) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+				return die_s_(0, encoder);
+			break;
+		case LAYER_SEEKABLE_STREAM:
+			printf("testing FLAC__stream_encoder_init_stream()... ");
+			if(FLAC__stream_encoder_init_stream(encoder, stream_encoder_write_callback_, stream_encoder_seek_callback_, stream_encoder_tell_callback_, /*metadata_callback=*/0, /*client_data=*/0) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+				return die_s_(0, encoder);
+			break;
+		case LAYER_FILE:
+			printf("opening file for FLAC output... ");
+			file = fopen(flacfilename_, "w+b");
+			if(0 == file) {
+				printf("ERROR (%s)\n", strerror(errno));
+				return false;
+			}
+			printf("OK\n");
 
-	printf("testing FLAC__stream_encoder_init()... ");
-	if(FLAC__stream_encoder_init(encoder) != FLAC__STREAM_ENCODER_OK)
-		return die_s_(0, encoder);
+			printf("testing FLAC__stream_encoder_init_FILE()... ");
+			if(FLAC__stream_encoder_init_FILE(encoder, file, stream_encoder_progress_callback_, /*client_data=*/0) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+				return die_s_(0, encoder);
+			break;
+		case LAYER_FILENAME:
+			printf("testing FLAC__stream_encoder_init_file()... ");
+			if(FLAC__stream_encoder_init_file(encoder, flacfilename_, stream_encoder_progress_callback_, /*client_data=*/0) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+				return die_s_(0, encoder);
+			break;
+		default:
+			die_("internal error 001");
+			return false;
+	}
 	printf("OK\n");
 
 	printf("testing FLAC__stream_encoder_get_state()... ");
@@ -420,653 +425,20 @@ static FLAC__bool test_stream_encoder()
 	return true;
 }
 
-FLAC__SeekableStreamEncoderSeekStatus seekable_stream_encoder_seek_callback_(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
-{
-	(void)encoder, (void)absolute_byte_offset, (void)client_data;
-	return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK;
-}
-
-FLAC__SeekableStreamEncoderTellStatus seekable_stream_encoder_tell_callback_(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
-{
-	(void)encoder, (void)client_data;
-	*absolute_byte_offset = 0;
-	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK;
-}
-
-FLAC__StreamEncoderWriteStatus seekable_stream_encoder_write_callback_(const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
-{
-	(void)encoder, (void)buffer, (void)bytes, (void)samples, (void)current_frame, (void)client_data;
-	return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
-}
-
-static FLAC__bool test_seekable_stream_encoder()
-{
-	FLAC__SeekableStreamEncoder *encoder;
-	FLAC__SeekableStreamEncoderState state;
-	FLAC__StreamEncoderState state_;
-	FLAC__StreamDecoderState dstate;
-	FLAC__int32 samples[1024];
-	FLAC__int32 *samples_array[1];
-	unsigned i;
-
-	samples_array[0] = samples;
-
-	printf("\n+++ libFLAC unit test: FLAC__SeekableStreamEncoder\n\n");
-
-	printf("testing FLAC__seekable_stream_encoder_new()... ");
-	encoder = FLAC__seekable_stream_encoder_new();
-	if(0 == encoder) {
-		printf("FAILED, returned NULL\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_verify()... ");
-	if(!FLAC__seekable_stream_encoder_set_verify(encoder, true))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_streamable_subset()... ");
-	if(!FLAC__seekable_stream_encoder_set_streamable_subset(encoder, true))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_do_mid_side_stereo()... ");
-	if(!FLAC__seekable_stream_encoder_set_do_mid_side_stereo(encoder, false))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_loose_mid_side_stereo()... ");
-	if(!FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(encoder, false))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_channels()... ");
-	if(!FLAC__seekable_stream_encoder_set_channels(encoder, streaminfo_.data.stream_info.channels))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_bits_per_sample()... ");
-	if(!FLAC__seekable_stream_encoder_set_bits_per_sample(encoder, streaminfo_.data.stream_info.bits_per_sample))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_sample_rate()... ");
-	if(!FLAC__seekable_stream_encoder_set_sample_rate(encoder, streaminfo_.data.stream_info.sample_rate))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_blocksize()... ");
-	if(!FLAC__seekable_stream_encoder_set_blocksize(encoder, streaminfo_.data.stream_info.min_blocksize))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_max_lpc_order()... ");
-	if(!FLAC__seekable_stream_encoder_set_max_lpc_order(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_qlp_coeff_precision()... ");
-	if(!FLAC__seekable_stream_encoder_set_qlp_coeff_precision(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search()... ");
-	if(!FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(encoder, false))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_do_escape_coding()... ");
-	if(!FLAC__seekable_stream_encoder_set_do_escape_coding(encoder, false))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_do_exhaustive_model_search()... ");
-	if(!FLAC__seekable_stream_encoder_set_do_exhaustive_model_search(encoder, false))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_min_residual_partition_order()... ");
-	if(!FLAC__seekable_stream_encoder_set_min_residual_partition_order(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_max_residual_partition_order()... ");
-	if(!FLAC__seekable_stream_encoder_set_max_residual_partition_order(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_rice_parameter_search_dist()... ");
-	if(!FLAC__seekable_stream_encoder_set_rice_parameter_search_dist(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_total_samples_estimate()... ");
-	if(!FLAC__seekable_stream_encoder_set_total_samples_estimate(encoder, streaminfo_.data.stream_info.total_samples))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_metadata()... ");
-	if(!FLAC__seekable_stream_encoder_set_metadata(encoder, metadata_sequence_, num_metadata_))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_seek_callback()... ");
-	if(!FLAC__seekable_stream_encoder_set_seek_callback(encoder, seekable_stream_encoder_seek_callback_))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_tell_callback()... ");
-	if(!FLAC__seekable_stream_encoder_set_tell_callback(encoder, seekable_stream_encoder_tell_callback_))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_write_callback()... ");
-	if(!FLAC__seekable_stream_encoder_set_write_callback(encoder, seekable_stream_encoder_write_callback_))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_set_client_data()... ");
-	if(!FLAC__seekable_stream_encoder_set_client_data(encoder, 0))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_init()... ");
-	if(FLAC__seekable_stream_encoder_init(encoder) != FLAC__SEEKABLE_STREAM_ENCODER_OK)
-		return die_ss_(0, encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_state()... ");
-	state = FLAC__seekable_stream_encoder_get_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)state, FLAC__SeekableStreamEncoderStateString[state]);
-
-	printf("testing FLAC__seekable_stream_encoder_get_stream_encoder_state()... ");
-	state_ = FLAC__seekable_stream_encoder_get_stream_encoder_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)state_, FLAC__StreamEncoderStateString[state_]);
-
-	printf("testing FLAC__seekable_stream_encoder_get_verify_decoder_state()... ");
-	dstate = FLAC__seekable_stream_encoder_get_verify_decoder_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)dstate, FLAC__StreamDecoderStateString[dstate]);
-
-	{
-		FLAC__uint64 absolute_sample;
-		unsigned frame_number;
-		unsigned channel;
-		unsigned sample;
-		FLAC__int32 expected;
-		FLAC__int32 got;
-
-		printf("testing FLAC__seekable_stream_encoder_get_verify_decoder_error_stats()... ");
-		FLAC__seekable_stream_encoder_get_verify_decoder_error_stats(encoder, &absolute_sample, &frame_number, &channel, &sample, &expected, &got);
-		printf("OK\n");
-	}
-
-	printf("testing FLAC__seekable_stream_encoder_get_verify()... ");
-	if(FLAC__seekable_stream_encoder_get_verify(encoder) != true) {
-		printf("FAILED, expected true, got false\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_streamable_subset()... ");
-	if(FLAC__seekable_stream_encoder_get_streamable_subset(encoder) != true) {
-		printf("FAILED, expected true, got false\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_do_mid_side_stereo()... ");
-	if(FLAC__seekable_stream_encoder_get_do_mid_side_stereo(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_loose_mid_side_stereo()... ");
-	if(FLAC__seekable_stream_encoder_get_loose_mid_side_stereo(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_channels()... ");
-	if(FLAC__seekable_stream_encoder_get_channels(encoder) != streaminfo_.data.stream_info.channels) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.channels, FLAC__seekable_stream_encoder_get_channels(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_bits_per_sample()... ");
-	if(FLAC__seekable_stream_encoder_get_bits_per_sample(encoder) != streaminfo_.data.stream_info.bits_per_sample) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.bits_per_sample, FLAC__seekable_stream_encoder_get_bits_per_sample(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_sample_rate()... ");
-	if(FLAC__seekable_stream_encoder_get_sample_rate(encoder) != streaminfo_.data.stream_info.sample_rate) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.sample_rate, FLAC__seekable_stream_encoder_get_sample_rate(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_blocksize()... ");
-	if(FLAC__seekable_stream_encoder_get_blocksize(encoder) != streaminfo_.data.stream_info.min_blocksize) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.min_blocksize, FLAC__seekable_stream_encoder_get_blocksize(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_max_lpc_order()... ");
-	if(FLAC__seekable_stream_encoder_get_max_lpc_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__seekable_stream_encoder_get_max_lpc_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_qlp_coeff_precision()... ");
-	(void)FLAC__seekable_stream_encoder_get_qlp_coeff_precision(encoder);
-	/* we asked the encoder to auto select this so we accept anything */
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search()... ");
-	if(FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_do_escape_coding()... ");
-	if(FLAC__seekable_stream_encoder_get_do_escape_coding(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_do_exhaustive_model_search()... ");
-	if(FLAC__seekable_stream_encoder_get_do_exhaustive_model_search(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_min_residual_partition_order()... ");
-	if(FLAC__seekable_stream_encoder_get_min_residual_partition_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__seekable_stream_encoder_get_min_residual_partition_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_max_residual_partition_order()... ");
-	if(FLAC__seekable_stream_encoder_get_max_residual_partition_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__seekable_stream_encoder_get_max_residual_partition_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_rice_parameter_search_dist()... ");
-	if(FLAC__seekable_stream_encoder_get_rice_parameter_search_dist(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__seekable_stream_encoder_get_rice_parameter_search_dist(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_get_total_samples_estimate()... ");
-	if(FLAC__seekable_stream_encoder_get_total_samples_estimate(encoder) != streaminfo_.data.stream_info.total_samples) {
-		printf("FAILED, expected %llu, got %llu\n", streaminfo_.data.stream_info.total_samples, FLAC__seekable_stream_encoder_get_total_samples_estimate(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	/* init the dummy sample buffer */
-	for(i = 0; i < sizeof(samples) / sizeof(FLAC__int32); i++)
-		samples[i] = i & 7;
-
-	printf("testing FLAC__seekable_stream_encoder_process()... ");
-	if(!FLAC__seekable_stream_encoder_process(encoder, (const FLAC__int32 * const *)samples_array, sizeof(samples) / sizeof(FLAC__int32)))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_process_interleaved()... ");
-	if(!FLAC__seekable_stream_encoder_process_interleaved(encoder, samples, sizeof(samples) / sizeof(FLAC__int32)))
-		return die_ss_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_finish()... ");
-	FLAC__seekable_stream_encoder_finish(encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__seekable_stream_encoder_delete()... ");
-	FLAC__seekable_stream_encoder_delete(encoder);
-	printf("OK\n");
-
-	printf("\nPASSED!\n");
-
-	return true;
-}
-
-static void 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)
-{
-	(void)encoder, (void)bytes_written, (void)samples_written, (void)frames_written, (void)total_frames_estimate, (void)client_data;
-}
-
-static FLAC__bool test_file_encoder()
-{
-	FLAC__FileEncoder *encoder;
-	FLAC__FileEncoderState state;
-	FLAC__SeekableStreamEncoderState state_;
-	FLAC__StreamEncoderState state__;
-	FLAC__StreamDecoderState dstate;
-	FLAC__int32 samples[1024];
-	FLAC__int32 *samples_array[1];
-	unsigned i;
-
-	samples_array[0] = samples;
-
-	printf("\n+++ libFLAC unit test: FLAC__FileEncoder\n\n");
-
-	printf("testing FLAC__file_encoder_new()... ");
-	encoder = FLAC__file_encoder_new();
-	if(0 == encoder) {
-		printf("FAILED, returned NULL\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_verify()... ");
-	if(!FLAC__file_encoder_set_verify(encoder, true))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_streamable_subset()... ");
-	if(!FLAC__file_encoder_set_streamable_subset(encoder, true))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_do_mid_side_stereo()... ");
-	if(!FLAC__file_encoder_set_do_mid_side_stereo(encoder, false))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_loose_mid_side_stereo()... ");
-	if(!FLAC__file_encoder_set_loose_mid_side_stereo(encoder, false))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_channels()... ");
-	if(!FLAC__file_encoder_set_channels(encoder, streaminfo_.data.stream_info.channels))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_bits_per_sample()... ");
-	if(!FLAC__file_encoder_set_bits_per_sample(encoder, streaminfo_.data.stream_info.bits_per_sample))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_sample_rate()... ");
-	if(!FLAC__file_encoder_set_sample_rate(encoder, streaminfo_.data.stream_info.sample_rate))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_blocksize()... ");
-	if(!FLAC__file_encoder_set_blocksize(encoder, streaminfo_.data.stream_info.min_blocksize))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_max_lpc_order()... ");
-	if(!FLAC__file_encoder_set_max_lpc_order(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_qlp_coeff_precision()... ");
-	if(!FLAC__file_encoder_set_qlp_coeff_precision(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_do_qlp_coeff_prec_search()... ");
-	if(!FLAC__file_encoder_set_do_qlp_coeff_prec_search(encoder, false))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_do_escape_coding()... ");
-	if(!FLAC__file_encoder_set_do_escape_coding(encoder, false))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_do_exhaustive_model_search()... ");
-	if(!FLAC__file_encoder_set_do_exhaustive_model_search(encoder, false))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_min_residual_partition_order()... ");
-	if(!FLAC__file_encoder_set_min_residual_partition_order(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_max_residual_partition_order()... ");
-	if(!FLAC__file_encoder_set_max_residual_partition_order(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_rice_parameter_search_dist()... ");
-	if(!FLAC__file_encoder_set_rice_parameter_search_dist(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_total_samples_estimate()... ");
-	if(!FLAC__file_encoder_set_total_samples_estimate(encoder, streaminfo_.data.stream_info.total_samples))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_metadata()... ");
-	if(!FLAC__file_encoder_set_metadata(encoder, metadata_sequence_, num_metadata_))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_filename()... ");
-	if(!FLAC__file_encoder_set_filename(encoder, flacfilename_))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_progress_callback()... ");
-	if(!FLAC__file_encoder_set_progress_callback(encoder, file_encoder_progress_callback_))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_set_client_data()... ");
-	if(!FLAC__file_encoder_set_client_data(encoder, 0))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_init()... ");
-	if(FLAC__file_encoder_init(encoder) != FLAC__FILE_ENCODER_OK)
-		return die_f_(0, encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_state()... ");
-	state = FLAC__file_encoder_get_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)state, FLAC__FileEncoderStateString[state]);
-
-	printf("testing FLAC__file_encoder_get_seekable_stream_encoder_state()... ");
-	state_ = FLAC__file_encoder_get_seekable_stream_encoder_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)state_, FLAC__SeekableStreamEncoderStateString[state_]);
-
-	printf("testing FLAC__file_encoder_get_stream_encoder_state()... ");
-	state__ = FLAC__file_encoder_get_stream_encoder_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)state__, FLAC__StreamEncoderStateString[state__]);
-
-	printf("testing FLAC__file_encoder_get_verify_decoder_state()... ");
-	dstate = FLAC__file_encoder_get_verify_decoder_state(encoder);
-	printf("returned state = %u (%s)... OK\n", (unsigned)dstate, FLAC__StreamDecoderStateString[dstate]);
-
-	{
-		FLAC__uint64 absolute_sample;
-		unsigned frame_number;
-		unsigned channel;
-		unsigned sample;
-		FLAC__int32 expected;
-		FLAC__int32 got;
-
-		printf("testing FLAC__file_encoder_get_verify_decoder_error_stats()... ");
-		FLAC__file_encoder_get_verify_decoder_error_stats(encoder, &absolute_sample, &frame_number, &channel, &sample, &expected, &got);
-		printf("OK\n");
-	}
-
-	printf("testing FLAC__file_encoder_get_verify()... ");
-	if(FLAC__file_encoder_get_verify(encoder) != true) {
-		printf("FAILED, expected true, got false\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_streamable_subset()... ");
-	if(FLAC__file_encoder_get_streamable_subset(encoder) != true) {
-		printf("FAILED, expected true, got false\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_do_mid_side_stereo()... ");
-	if(FLAC__file_encoder_get_do_mid_side_stereo(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_loose_mid_side_stereo()... ");
-	if(FLAC__file_encoder_get_loose_mid_side_stereo(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_channels()... ");
-	if(FLAC__file_encoder_get_channels(encoder) != streaminfo_.data.stream_info.channels) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.channels, FLAC__file_encoder_get_channels(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_bits_per_sample()... ");
-	if(FLAC__file_encoder_get_bits_per_sample(encoder) != streaminfo_.data.stream_info.bits_per_sample) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.bits_per_sample, FLAC__file_encoder_get_bits_per_sample(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_sample_rate()... ");
-	if(FLAC__file_encoder_get_sample_rate(encoder) != streaminfo_.data.stream_info.sample_rate) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.sample_rate, FLAC__file_encoder_get_sample_rate(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_blocksize()... ");
-	if(FLAC__file_encoder_get_blocksize(encoder) != streaminfo_.data.stream_info.min_blocksize) {
-		printf("FAILED, expected %u, got %u\n", streaminfo_.data.stream_info.min_blocksize, FLAC__file_encoder_get_blocksize(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_max_lpc_order()... ");
-	if(FLAC__file_encoder_get_max_lpc_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__file_encoder_get_max_lpc_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_qlp_coeff_precision()... ");
-	(void)FLAC__file_encoder_get_qlp_coeff_precision(encoder);
-	/* we asked the encoder to auto select this so we accept anything */
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_do_qlp_coeff_prec_search()... ");
-	if(FLAC__file_encoder_get_do_qlp_coeff_prec_search(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_do_escape_coding()... ");
-	if(FLAC__file_encoder_get_do_escape_coding(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_do_exhaustive_model_search()... ");
-	if(FLAC__file_encoder_get_do_exhaustive_model_search(encoder) != false) {
-		printf("FAILED, expected false, got true\n");
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_min_residual_partition_order()... ");
-	if(FLAC__file_encoder_get_min_residual_partition_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__file_encoder_get_min_residual_partition_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_max_residual_partition_order()... ");
-	if(FLAC__file_encoder_get_max_residual_partition_order(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__file_encoder_get_max_residual_partition_order(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_rice_parameter_search_dist()... ");
-	if(FLAC__file_encoder_get_rice_parameter_search_dist(encoder) != 0) {
-		printf("FAILED, expected %u, got %u\n", 0, FLAC__file_encoder_get_rice_parameter_search_dist(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_get_total_samples_estimate()... ");
-	if(FLAC__file_encoder_get_total_samples_estimate(encoder) != streaminfo_.data.stream_info.total_samples) {
-		printf("FAILED, expected %llu, got %llu\n", streaminfo_.data.stream_info.total_samples, FLAC__file_encoder_get_total_samples_estimate(encoder));
-		return false;
-	}
-	printf("OK\n");
-
-	/* init the dummy sample buffer */
-	for(i = 0; i < sizeof(samples) / sizeof(FLAC__int32); i++)
-		samples[i] = i & 7;
-
-	printf("testing FLAC__file_encoder_process()... ");
-	if(!FLAC__file_encoder_process(encoder, (const FLAC__int32 * const *)samples_array, sizeof(samples) / sizeof(FLAC__int32)))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_process_interleaved()... ");
-	if(!FLAC__file_encoder_process_interleaved(encoder, samples, sizeof(samples) / sizeof(FLAC__int32)))
-		return die_f_("returned false", encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_finish()... ");
-	FLAC__file_encoder_finish(encoder);
-	printf("OK\n");
-
-	printf("testing FLAC__file_encoder_delete()... ");
-	FLAC__file_encoder_delete(encoder);
-	printf("OK\n");
-
-	printf("\nPASSED!\n");
-
-	return true;
-}
-
 FLAC__bool test_encoders()
 {
 	init_metadata_blocks_();
 
-	if(!test_stream_encoder())
+	if(!test_stream_encoder(LAYER_STREAM))
+		return false;
+
+	if(!test_stream_encoder(LAYER_SEEKABLE_STREAM))
 		return false;
 
-	if(!test_seekable_stream_encoder())
+	if(!test_stream_encoder(LAYER_FILE))
 		return false;
 
-	if(!test_file_encoder())
+	if(!test_stream_encoder(LAYER_FILENAME))
 		return false;
 
 	(void) grabbag__file_remove_file(flacfilename_);