From 01d518fb547e4ffae6437473505e89cfb38ce743 Mon Sep 17 00:00:00 2001
From: Andrew Schaaf <andrew@andrewschaaf.com>
Date: Tue, 28 Sep 2010 21:16:17 -0400
Subject: [PATCH] support --float32-columns

---
 src/arss.c     | 14 ++++++++++++--
 src/image_io.c | 15 ++++++++++++++-
 src/image_io.h |  2 ++
 src/util.h     |  5 +++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/arss.c b/src/arss.c
index 4c62804..f0005cb 100644
--- a/src/arss.c
+++ b/src/arss.c
@@ -335,6 +335,7 @@ int main(int argc, char *argv[])
 
 	srand(time(NULL));
 
+	int spectrogram_output_format = FORMAT_BMP;
 	for (i=1; i<argc; i++)
 	{
 		if (strcmp(argv[i], "/?")==0)	// DOS friendly help
@@ -358,6 +359,9 @@ int main(int argc, char *argv[])
 		}
 		else						// if the argument is a parameter
 		{
+			if (strcmp(argv[i], "--float32-columns") == 0)
+				spectrogram_output_format = FORMAT_FLOAT32_COLUMNS;
+
 			if (strcmp(argv[i], "--analysis")==0	|| strcmp(argv[i], "-a")==0)
 				mode=1;
 
@@ -623,9 +627,15 @@ int main(int argc, char *argv[])
 
 		settingsinput(&Ysize, samplecount, &samplerate, &basefreq, maxfreq, &pixpersec, &bpo, Xsize, 0);	// User settings input
 		image = anal(sound[0], samplecount, samplerate, &Xsize, Ysize, bpo, pixpersec, basefreq);	// Analysis
-		if (brightness!=1.0)
+		if (brightness != 1.0) {
 			brightness_control(image, Ysize, Xsize, 1.0/brightness);
-		bmp_out(fout, image, Ysize, Xsize);								// Image output
+		}
+		if (spectrogram_output_format == FORMAT_BMP) {
+			bmp_out(fout, image, Ysize, Xsize);
+		}
+		else if (spectrogram_output_format == FORMAT_FLOAT32_COLUMNS) {
+			float32_columns_out(fout, image, Ysize, Xsize);
+		}
 	}
 	if (mode==2 || mode==3)
 	{
diff --git a/src/image_io.c b/src/image_io.c
index 863b136..e6ca11e 100644
--- a/src/image_io.c
+++ b/src/image_io.c
@@ -42,7 +42,7 @@ double **bmp_in(FILE *bmpfile, int32_t *y, int32_t *x)
 	if (zerobytes==4)
 		zerobytes = 0;
 
-	for (iy=*y-1; iy!=-1; iy--)		// backwards reading
+	for (iy=y-1; iy!=-1; iy--)        // BMP pixels are ordered: ...bottom row (left-to-right)... ... ...top row (left-to-right)...
 	{
 		for (ix=0; ix<*x; ix++)
 		{
@@ -60,6 +60,19 @@ double **bmp_in(FILE *bmpfile, int32_t *y, int32_t *x)
 	return image;
 }
 
+
+void float32_columns_out(FILE *fout, double **image, int32_t y, int32_t x) {
+	int32_t i, iy, ix;
+	float val;
+	for (ix = 0; ix < x; ix++) {
+		for (iy = 0; iy < y; iy++) {
+			val = image[iy][ix];
+			fwrite(&val, 4, 1, fout);
+		}
+	}
+}
+
+
 void bmp_out(FILE *bmpfile, double **image, int32_t y, int32_t x)
 {
 	int32_t	i, iy, ix, ic;			// various iterators
diff --git a/src/image_io.h b/src/image_io.h
index a9482c8..1d9da4d 100644
--- a/src/image_io.h
+++ b/src/image_io.h
@@ -8,6 +8,8 @@
 #include "util.h"
 
 extern double **bmp_in(FILE *bmpfile, int32_t *y, int32_t *x);
+
+extern void float32_columns_out(FILE *fout, double **image, int32_t y, int32_t x);
 extern void bmp_out(FILE *bmpfile, double **image, int32_t y, int32_t x);
 
 #endif
diff --git a/src/util.h b/src/util.h
index 8964b0a..8a984fa 100644
--- a/src/util.h
+++ b/src/util.h
@@ -11,6 +11,11 @@
 
 #include "dsp.h"
 
+
+#define FORMAT_BMP                    1
+#define FORMAT_FLOAT32_COLUMNS        2
+
+
 int32_t quiet;
 
 extern void win_return();