- Added option to dump raw input to a file using raw configuration

config/odaslive/azimut_oma.cfg

@@ -17,7 +17,7 @@ raw:
         type = "file";
         path = "input_oma.raw";
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/beam.cfg

@@ -17,7 +17,7 @@ raw:
         type = "file";
         path = "micsBeam.raw";      
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/delta1010lt.cfg

@@ -69,7 +69,7 @@ raw:
         type = "soundcard_name";
         devicename = "multi_capture";
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/matrix_creator.cfg

@@ -18,7 +18,7 @@ raw:
         card = 2;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/matrix_voice.cfg

@@ -18,7 +18,7 @@ raw:
         card = 2;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/minidsp.cfg

@@ -18,7 +18,7 @@ raw:
         card = 2;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/pepper.cfg

@@ -17,7 +17,7 @@ raw:
         type = "soundcard_name";
         devicename = "AD1989A_inputs";
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/pseye.cfg

@@ -18,7 +18,7 @@ raw:
         card = 2;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/respeaker.cfg

@@ -18,7 +18,7 @@ raw:
         card = 3;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/respeaker_4_mic_array.cfg

@@ -18,7 +18,7 @@ raw:
         card = 1;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/respeaker_6_mic_array.cfg

@@ -19,7 +19,7 @@ raw:
         card = 1;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/respeaker_usb_4_mic_array.cfg

@@ -18,7 +18,7 @@ raw:
         card = 1;
         device = 0;
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

config/odaslive/xmos.cfg

@@ -17,7 +17,7 @@ raw:
         type = "file";
         path = "meeting_recorded_raw_16.raw";
     }
-
+	output_dump_file = "";
 }
 
 # Mapping

demo/odaslive/parameters.c

@@ -223,6 +223,19 @@
                 exit(EXIT_FAILURE);
             }
 
+        // +----------------------------------------------------------+
+        // | Debug dump                                                |
+        // +----------------------------------------------------------+
+
+            tmpStr1 = parameters_lookup_string(fileConfig, "raw.output_dump_file");
+
+            if (strcmp(tmpStr1, "") != 0) { 
+
+            	cfg->output_dump_filename = (char *) malloc(sizeof(char) * (strlen(tmpStr1)+1));
+            	strcpy(cfg->output_dump_filename, tmpStr1);
+            }
+
+
             free((void *) tmpStr1);
 
         return cfg;

include/odas/source/src_hops.h

@@ -57,6 +57,7 @@ typedef struct src_hops_obj {
     interface_obj *interface;
 
     FILE * fp;
+	FILE * output_dump_file;
     snd_pcm_t * ch;
     pa_simple * pa;
     pa_sample_spec ss;
@@ -78,7 +79,7 @@ typedef struct src_hops_cfg {
     format_obj * format;
     interface_obj * interface;
     pa_channel_map * channel_map;
-
+	char* output_dump_filename;
 } src_hops_cfg;
 
 src_hops_obj * src_hops_construct(const src_hops_cfg * src_hops_config, const msg_hops_cfg * msg_hops_config);

src/source/src_hops.c

@@ -43,6 +43,18 @@ src_hops_obj * src_hops_construct(const src_hops_cfg * src_hops_config, const ms
 
     obj->format = format_clone(src_hops_config->format);
     obj->interface = interface_clone(src_hops_config->interface);
+	if (src_hops_config->output_dump_filename!=NULL)
+	{
+		obj->output_dump_file = fopen(src_hops_config->output_dump_filename, "wb");
+
+		if (obj->output_dump_file == NULL) {
+			printf("Cannot open raw dump file %s\n", src_hops_config->output_dump_filename);
+			exit(EXIT_FAILURE);
+		}
+	}else
+	{
+		obj->output_dump_file = NULL;
+	}
     if (src_hops_config->channel_map != NULL)
     {
         // Will not be null if in pulseaudio mode
@@ -99,6 +111,11 @@ void src_hops_destroy(src_hops_obj * obj) {
     free((void *) obj->buffer);
     format_destroy(obj->format);
     interface_destroy(obj->interface);
+
+	if (obj->output_dump_file != NULL)
+	{
+		fclose(obj->output_dump_file);
+	}
 
     free((void *) obj);
 }
@@ -354,6 +371,11 @@ void src_hops_close(src_hops_obj * obj) {
 
         break;
     }
+	if (obj->output_dump_file)
+	{
+		fclose(obj->output_dump_file);
+		obj->output_dump_file = NULL;
+	}
 }
 
 void src_hops_close_interface_file(src_hops_obj * obj) {
@@ -456,6 +478,11 @@ int src_hops_process(src_hops_obj * obj) {
     obj->timeStamp++;
     obj->out->timeStamp = obj->timeStamp;
 
+	if(obj->output_dump_file != NULL)
+	{
+		fwrite(obj->buffer, sizeof(char), obj->bufferSize, obj->output_dump_file);
+	}
+
     return rtnValue;
 }
 
@@ -659,6 +686,7 @@ src_hops_cfg * src_hops_cfg_construct(void) {
 
     cfg->format = (format_obj *) NULL;
     cfg->interface = (interface_obj *) NULL;
+	cfg->output_dump_filename = NULL;
 
     return cfg;
 }
@@ -676,6 +704,10 @@ void src_hops_cfg_destroy(src_hops_cfg * src_hops_config) {
         free((void *) src_hops_config->channel_map);
     }
 
+	if (src_hops_config->output_dump_filename != NULL) {
+		free((void *) src_hops_config->output_dump_filename);
+	}
+
     free((void *) src_hops_config);
 
 }