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

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

Merge "dsp: Define channel map for 14channels"

parents 647c7e4d 3dd8fdf8

dsp/q6adm.c

+15 −0
Original line number Diff line number Diff line
@@ -2651,6 +2651,21 @@ static int adm_arrange_mch_map_v8( 
			ep_payload->dev_channel_mapping[9] = PCM_CHANNEL_TFR;

			ep_payload->dev_channel_mapping[10] = PCM_CHANNEL_TSL;

			ep_payload->dev_channel_mapping[11] = PCM_CHANNEL_TSR;

		} else if (channel_mode == 14) {

			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_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;

			ep_payload->dev_channel_mapping[8] = PCM_CHANNEL_TFL;

			ep_payload->dev_channel_mapping[9] = PCM_CHANNEL_TFR;

			ep_payload->dev_channel_mapping[10] = PCM_CHANNEL_TSL;

			ep_payload->dev_channel_mapping[11] = PCM_CHANNEL_TSR;

			ep_payload->dev_channel_mapping[12] = PCM_CHANNEL_FLC;

			ep_payload->dev_channel_mapping[13] = PCM_CHANNEL_FRC;

		} else if (channel_mode == 16) {

			ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;

dsp/q6asm.c

+15 −0
Original line number Diff line number Diff line
@@ -5729,6 +5729,21 @@ int q6asm_map_channels(u8 *channel_mapping, uint32_t channels, 
		lchannel_mapping[9] = PCM_CHANNEL_TFR;

		lchannel_mapping[10] = PCM_CHANNEL_TSL;

		lchannel_mapping[11] = PCM_CHANNEL_TSR;

	} else if (channels == 14) {

		lchannel_mapping[0] = PCM_CHANNEL_FL;

		lchannel_mapping[1] = PCM_CHANNEL_FR;

		lchannel_mapping[2] = PCM_CHANNEL_LFE;

		lchannel_mapping[3] = PCM_CHANNEL_FC;

		lchannel_mapping[4] = PCM_CHANNEL_LB;

		lchannel_mapping[5] = PCM_CHANNEL_RB;

		lchannel_mapping[6] = PCM_CHANNEL_LS;

		lchannel_mapping[7] = PCM_CHANNEL_RS;

		lchannel_mapping[8] = PCM_CHANNEL_TFL;

		lchannel_mapping[9] = PCM_CHANNEL_TFR;

		lchannel_mapping[10] = PCM_CHANNEL_TSL;

		lchannel_mapping[11] = PCM_CHANNEL_TSR;

		lchannel_mapping[12] = PCM_CHANNEL_FLC;

		lchannel_mapping[13] = PCM_CHANNEL_FRC;

	} else if (channels == 16) {

		/*

		 * Configured for 7.1.8 channel mapping