mux tmp

Author: abonislawski

src/audio/mux/mux.c

@@ -28,10 +28,48 @@
 #include<stddef.h>
 #include<stdint.h>
 
-staticintmux_set_values(structcomp_data*cd, structsof_mux_config*cfg)
+staticintmux_set_values(structcomp_data*cd, structsof_ipc_mux_config*cfg)
 {
 uint8_ti;
 uint8_tj;
+uint8_tused_streams;
+uint32_tnum_ch_map, ch_index, ext_id, ch_mask;
+uint32_t*data;
+
+structmux_stream_datastreams[MUX_MAX_STREAMS];
+
+data= (uint32_t*)&cfg->streams;
+num_ch_map=*data++;
+trace_mux("num_ch_map = %d", num_ch_map);
+//if (num_ch_map == 0)
+//	return -EINVAL;
+
+used_streams=0;
+
+for (i=0; i<num_ch_map; i++) {
+ch_index=*data++;
+ext_id=*data++;
+ch_mask=*data++;
+
+trace_mux("ch_i = %d, ext_id = %d, ch_m = %d",
+ch_index, ext_id, ch_mask);
+
+for (j=0; j<used_streams; j++) {
+if (ext_id==streams[j].pipeline_id)
+break;
+ }
+
+if (j==used_streams)
+used_streams++;
+
+streams[j].pipeline_id=ext_id;
+streams[j].mask[ch_index] =ch_mask;
+
+data+=MAX(__builtin_popcount(ch_mask), 1);
+
+trace_mux("builtin_popcount = %d", __builtin_popcount(ch_mask));
+	}
+
 
 /* check if number of streams configured doesn't exceed maximum */
 if (cfg->num_streams>MUX_MAX_STREAMS) {
@@ -45,18 +83,18 @@ static int mux_set_values(struct comp_data *cd, struct sof_mux_config *cfg)
 /* check if all streams configured have distinct IDs */
 for (i=0; i<cfg->num_streams; i++) {
 for (j=i+1; j<cfg->num_streams; j++) {
-if (cfg->streams[i].pipeline_id==
-cfg->streams[j].pipeline_id) {
+if (streams[i].pipeline_id==
+streams[j].pipeline_id) {
 trace_mux_error("mux_set_values() error: "
 "multiple configured streams "
 "have same pipeline ID = %u",
-cfg->streams[i].pipeline_id);
+streams[i].pipeline_id);
 return-EINVAL;
  }
  }
 	}
 
-/* check if number of channels per stream doesn't exceed maximum */
+/* check if number of channels per stream doesn't exceed maximum
 	for (i = 0; i < cfg->num_streams; i++) {
  if (cfg->streams[i].num_channels > PLATFORM_MAX_CHANNELS) {
  trace_mux_error("mux_set_values() error: configured "
@@ -67,15 +105,16 @@ static int mux_set_values(struct comp_data *cd, struct sof_mux_config *cfg)
  return -EINVAL;
  }
 	}
+	*/
 
 cd->config.num_channels=cfg->num_channels;
 cd->config.frame_format=cfg->frame_format;
 
 for (i=0; i<cfg->num_streams; i++) {
-cd->config.streams[i].num_channels=cfg->streams[i].num_channels;
-cd->config.streams[i].pipeline_id=cfg->streams[i].pipeline_id;
-for (j=0; j<cfg->streams[i].num_channels; j++)
-cd->config.streams[i].mask[j] =cfg->streams[i].mask[j];
+cd->config.streams[i].num_channels=streams[i].num_channels;
+cd->config.streams[i].pipeline_id=streams[i].pipeline_id;
+for (j=0; j<PLATFORM_MAX_CHANNELS; j++)
+cd->config.streams[i].mask[j] =streams[i].mask[j];
 	}
 
 return0;
@@ -105,16 +144,16 @@ static struct comp_dev *mux_new(struct sof_ipc_comp *comp)
 memcpy(&dev->comp, comp, sizeof(structsof_ipc_comp_process));
 
 cd=rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM,
-sizeof(*cd)+MUX_MAX_STREAMS*sizeof(structmux_stream_data));
+sizeof(*cd));
 if (!cd) {
+trace_mux("alloc failed mux new");
 rfree(dev);
 returnNULL;
 	}
 
 comp_set_drvdata(dev, cd);
 
-memcpy_s(&cd->config, sizeof(structsof_mux_config) +
-MUX_MAX_STREAMS*sizeof(structmux_stream_data),
+memcpy_s(&cd->config, sizeof(structsof_ipc_mux_config),
 ipc_process->data, bs);
 
 /* verification of initial parameters */
@@ -157,14 +196,14 @@ static int mux_ctrl_set_cmd(struct comp_dev *dev,
 structsof_ipc_ctrl_data*cdata)
 {
 structcomp_data*cd=comp_get_drvdata(dev);
-structsof_mux_config*cfg;
+structsof_ipc_mux_config*cfg;
 intret=0;
 
 trace_mux("mux_ctrl_set_cmd(), cdata->cmd = 0x%08x", cdata->cmd);
 
 switch (cdata->cmd) {
 caseSOF_CTRL_CMD_BINARY:
-cfg= (structsof_mux_config*)cdata->data->data;
+cfg= (structsof_ipc_mux_config*)cdata->data->data;
 
 ret=mux_set_values(cd, cfg);
 break;

src/include/sof/audio/mux.h

@@ -43,11 +43,9 @@ STATIC_ASSERT(MUX_MAX_STREAMS < PLATFORM_MAX_STREAMS,
 unsupported_amount_of_streams_for_mux);
 
 structmux_stream_data {
-uint32_tpipeline_id;
+uint32_tpipeline_id;//ext_id
 uint8_tnum_channels;
-uint8_tmask[PLATFORM_MAX_CHANNELS];
-
-uint8_treserved[(20-PLATFORM_MAX_CHANNELS-1) % 4]; // padding to ensure proper alignment of following instances
+uint8_tmask[PLATFORM_MAX_CHANNELS]; //ch_mask
 };
 
 typedefvoid(*demux_func)(structcomp_dev*dev, structcomp_buffer*sink,
@@ -63,17 +61,25 @@ struct sof_mux_config {
 uint16_tnum_streams;
 
 uint16_treserved; // padding to ensure proper alignment
-
 structmux_stream_datastreams[];
 };
 
+structsof_ipc_mux_config {
+uint16_tframe_format;
+uint16_tnum_channels;
+uint16_tnum_streams;
+
+uint16_treserved; // padding to ensure proper alignment
+structmux_stream_datastreams[MUX_MAX_STREAMS];
+};
+
 structcomp_data {
 union {
 mux_funcmux;
 demux_funcdemux;
 	};
 
-structsof_mux_configconfig;
+structsof_ipc_mux_configconfig;
 };
 
 structcomp_func_map {