Merge pull request #120 from kakulesza/set-max-volume-from-ipc-for-volume-module

volume: Set max volume value from IPC for volume module

Author: lgirdwood

src/audio/volume.c

@@ -106,7 +106,7 @@ static uint64_t vol_work(void *data, uint64_t delay)
 			vol += VOL_RAMP_STEP;
 
 			/* ramp completed ? */
-			if (vol >= cd->tvolume[i] || vol >= VOL_MAX)
+			if (vol >= cd->tvolume[i] || vol >= cd->max_volume)
 				vol_update(cd, i);
 			else {
 				cd->volume[i] = vol;
@@ -121,7 +121,7 @@ static uint64_t vol_work(void *data, uint64_t delay)
 			} else {
 				/* ramp completed ? */
 				if (new_vol <= cd->tvolume[i] ||
-					new_vol <= VOL_MIN) {
+					new_vol <= cd->min_volume) {
 					vol_update(cd, i);
 				} else {
 					cd->volume[i] = new_vol;
@@ -141,6 +141,23 @@ static uint64_t vol_work(void *data, uint64_t delay)
 		return 0;
 }
 
+/**
+ * \brief Validates and sets minimum and maximum volume levels.
+ * \details If max_vol < min_vol or it's equals 0 then set max_vol = VOL_MAX
+ * \param[in,out] cd Volume component private data.
+ * \param[in] min_vol Minimum volume level
+ * \param[in] max_vol Maximum volume level
+ */
+static void vol_set_min_max_levels(struct comp_data *cd,
+				   uint32_t min_vol, uint32_t max_vol)
+{
+	if (max_vol < min_vol || max_vol == 0)
+		cd->max_volume = VOL_ZERO_DB;
+	else
+		cd->max_volume = max_vol;
+	cd->min_volume = min_vol;
+}
+
 /**
  * \brief Creates volume component.
  * \param[in,out] data Volume base component device.
@@ -177,10 +194,13 @@ static struct comp_dev *volume_new(struct sof_ipc_comp *comp)
 
 	/* set the default volumes */
 	for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) {
-		cd->volume[i] = VOL_MAX;
-		cd->tvolume[i] = VOL_MAX;
+		cd->volume[i] = VOL_ZERO_DB;
+		cd->tvolume[i] = VOL_ZERO_DB;
 	}
 
+	/* set volume min/max levels */
+	vol_set_min_max_levels(cd, ipc_vol->min_value, ipc_vol->max_value);
+
 	dev->state = COMP_STATE_READY;
 	return dev;
 }
@@ -234,11 +254,11 @@ static inline void volume_set_chan(struct comp_dev *dev, int chan, uint32_t vol)
 	 * multiplication overflow with the 32 bit value. Non-zero MIN option
 	 * can be useful to prevent totally muted small volume gain.
 	 */
-	if (v <= VOL_MIN)
-		v = VOL_MIN;
+	if (v <= cd->min_volume)
+		v = cd->min_volume;
 
-	if (v > VOL_MAX)
-		v = VOL_MAX;
+	if (v > cd->max_volume)
+		v = cd->max_volume;
 
 	cd->tvolume[chan] = v;
 }

src/audio/volume.h

@@ -93,6 +93,9 @@
  */
 #define VOL_MAX		(1 << VOL_QXY_Y)
 
+/** \brief Volume 0dB value. */
+#define VOL_ZERO_DB	(1 << 16)
+
 /** \brief Volume minimum value. */
 #define VOL_MIN		0
 
@@ -109,6 +112,8 @@ struct comp_data {
 	uint32_t volume[SOF_IPC_MAX_CHANNELS];	/**< current volume */
 	uint32_t tvolume[SOF_IPC_MAX_CHANNELS];	/**< target volume */
 	uint32_t mvolume[SOF_IPC_MAX_CHANNELS];	/**< mute volume */
+	uint32_t min_volume;			/**< minimum volume level */
+	uint32_t max_volume;			/**< maximum volume level */
 	void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink,
 		struct comp_buffer *source);	/**< volume processing function */
 	struct work volwork;			/**< volume scheduled work function */

src/include/uapi/ipc.h

@@ -690,8 +690,8 @@ struct sof_ipc_comp_volume {
 	struct sof_ipc_comp comp;
 	struct sof_ipc_comp_config config;
 	uint32_t channels;
-	int32_t min_value;
-	int32_t max_value;
+	uint32_t min_value;
+	uint32_t max_value;
 	enum sof_volume_ramp ramp;
 	uint32_t initial_ramp;	/* ramp space in ms */
 }  __attribute__((packed));