Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e03c26d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: q6adm: Channel map configuration for multi-channel"

parents 33e47130 a88e3945

dsp/q6adm.c

+14 −14
Original line number Diff line number Diff line
@@ -2685,8 +2685,8 @@ static int adm_arrange_mch_map_v8( 
		} else if (channel_mode == 6) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS;

		} else if (channel_mode == 7) {
@@ -2694,18 +2694,18 @@ static int adm_arrange_mch_map_v8( 
			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS;

			ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_CS;

		} else if (channel_mode == 8) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS;

			ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LB;

			ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RB;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB;

			ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LS;

			ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RS;

		} else if (channel_mode == 10) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;
@@ -2720,8 +2720,8 @@ static int adm_arrange_mch_map_v8( 
		} else if (channel_mode == 12) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB;

			ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LS;
@@ -2748,8 +2748,8 @@ static int adm_arrange_mch_map_v8( 
		} else if (channel_mode == 16) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC;

			ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB;

			ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB;

			ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LS;