8magsvn – Diff between revs 34 and 36

(root)/VLF/SW/sidd2/Ix86/sidd2/src/sidd2.c

Rev 34 – Go to most recent revision – Details – Blame – Last modification – View Log

 #include <errno.h>
 #include <getopt.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <math.h>
+#include <time.h>
 static char *device = "plughw:0,0";			/* playback device */
 static snd_pcm_format_t format = SND_PCM_FORMAT_S16;	/* sample format */
 static unsigned int rate = 48000;			/* stream rate */
-static unsigned int buffer_time = 130000;		/* ring buffer length in us */
-static unsigned int period_time = 100000;		/* period time in us */
-static int verbose = 0;					/* verbose flag */
 static int resample = 1;				/* enable alsa-lib resampling */
 static int period_event = 0;				/* produce poll event after each period */
-static snd_pcm_sframes_t buffer_size;	// size of buffer at sound card
+static snd_pcm_uframes_t buffer_size = 20000;	// size of buffer at sound card
-static snd_pcm_sframes_t period_size;	//samples per frame
+static snd_pcm_uframes_t period_size = 4000;	//samples per frame
 static snd_output_t *output = NULL;
 #define MAX_BINS            8
 int         sample_count;
+}
 static int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, unsigned int channels)
+{
 	unsigned int rrate;
-	snd_pcm_uframes_t size;
 	int err, dir;
 	/* choose all parameters */
 	err = snd_pcm_hw_params_any(handle, params);
 	if (err < 0) {
 	if (rrate != rate) {
 		printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
 		return -EINVAL;
+	}
 	else printf("Rate set to %i Hz\n", rate, err);
-	/* set the buffer time */
+	/* set the buffer size */
-	err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, &dir);
+	err = snd_pcm_hw_params_set_buffer_size_near(handle, params, &buffer_size);
-	if (err < 0) {
-		printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
-		return err;
-	}
-	err = snd_pcm_hw_params_get_buffer_size(params, &size);
 	if (err < 0) {
-		printf("Unable to get buffer size for playback: %s\n", snd_strerror(err));
+		printf("Unable to set buffer size %i for playback: %s\n", (int) buffer_size, snd_strerror(err));
 		return err;
+	}
-	buffer_size = size;
+	else printf("Size of capture buffer set to %i\n", (int) buffer_size);
 	/* set the period time */
-	err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, &dir);
+	err = snd_pcm_hw_params_set_period_size_near(handle, params, &period_size, &dir);
 	if (err < 0) {
-		printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
+		printf("Unable to set period time %i for playback: %s\n", (int) period_size, snd_strerror(err));
 		return err;
+	}
-	err = snd_pcm_hw_params_get_period_size(params, &size, &dir);
-	if (err < 0) {
-		printf("Unable to get period size for playback: %s\n", snd_strerror(err));
+	else printf("Size of capture period set to %i\n", (int) period_size);
-		return err;
-	}
-	period_size = size;
 	/* write the parameters to device */
 	err = snd_pcm_hw_params(handle, params);
 	if (err < 0) {
 		printf("Unable to set hw params for playback: %s\n", snd_strerror(err));
 		return err;
 	snd_pcm_channel_area_t *areas;
 	unsigned int period;
 };
 /////////// CALL BACK STUFF ///////////////////
 static void async_capture_callback(snd_async_handler_t *ahandler)
+{
 	snd_pcm_t *handle = snd_async_handler_get_pcm(ahandler);
 	int err;
 	short signal[100000];
 	unsigned int n,i;
 	while (snd_pcm_avail_update(handle) >= period_size) {  // read until data is ready in buffer
-		err = snd_pcm_readi(handle, (signal), period_size);
+		err = snd_pcm_readi(handle, signal, period_size);
 		if (err < 0) {
 			printf("Read error: %s\n", snd_strerror(err));
 			exit(EXIT_FAILURE);
+		}
 		if (err != period_size) {
+		}
 		for ( n=0; n<period_size; n+=2 ){
 		  for ( i=0; i<MAX_BINS; i++ )
+		  {
-		    q0 = coefs[i] * q1[i] - q2[i] + signal[n];
+		    q0 = coefs[i] * q1[i] - q2[i] + (double) signal[n]/32768.0;
 		    q2[i] = q1[i];
 		    q1[i] = q0;
+		  }
+		}
       	     r[i] = (q1[i] * q1[i]) + (q2[i] * q2[i]) - (coefs[i] * q1[i] * q2[i]);
       	     q1[i] = 0.0;
       	     q2[i] = 0.0;
+        }
 	out=fopen("./output.txt","a");
-    	for(i=0;i<MAX_BINS;i++) fprintf(out,"%6f ",r[i]);
+    	for(i=0;i<MAX_BINS;i++) fprintf(out,"%.e5 ",r[i]);
     	fprintf(out,"\n");
   	fclose(out);
+	}
+}
 int main(int argc, char *argv[])
+{
-	snd_pcm_t *playback_handle, *capture_handle;
+	snd_pcm_t *capture_handle;
 	int err;
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_sw_params_t *swparams;
-	signed short *frame;  // pointer to array of samples
+//	signed short *frame;  // pointer to array of samples
-	unsigned int chn;
+//	unsigned int chn;
 	snd_pcm_channel_area_t *areas;
 	struct async_private_data data;
-	snd_async_handler_t *chandler, *phandler;
+	snd_async_handler_t *chandler;
 	int count;
 	unsigned int i,j;
 	snd_pcm_hw_params_alloca(&hwparams);
 	snd_pcm_sw_params_alloca(&swparams);
 			exit(EXIT_FAILURE);
+	}
 //wait until all samples aren't transmitted
 	printf("processing audio input.. \n");
-	for (i=0; i<5000; i++) usleep( 1000);
+	while (1) usleep(1000);
 	snd_pcm_close(capture_handle);
 	return 0;
+}