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

Commit 9728ee85 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dsp: Add new channel ID to mark unused channel map slots"

parents a7377a88 fb81b6e7

dsp/q6adm.c

+2 −2
Original line number Diff line number Diff line
@@ -2677,7 +2677,7 @@ static int adm_arrange_mch_ep2_map_v8( 
		ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LB;

		ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RB;

		ep_payload->dev_channel_mapping[8] = PCM_CHANNEL_CS;

		ep_payload->dev_channel_mapping[9] = PCM_CHANNELS;

		ep_payload->dev_channel_mapping[9] = PCM_CHANNEL_TS;

	} else if (channel_mode == 12) {

		ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL;

		ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR;
@@ -2701,7 +2701,7 @@ static int adm_arrange_mch_ep2_map_v8( 
		ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LB;

		ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RB;

		ep_payload->dev_channel_mapping[8] = PCM_CHANNEL_CS;

		ep_payload->dev_channel_mapping[9] = PCM_CHANNELS;

		ep_payload->dev_channel_mapping[9] = PCM_CHANNEL_TS;

		ep_payload->dev_channel_mapping[10] = PCM_CHANNEL_CVH;

		ep_payload->dev_channel_mapping[11] = PCM_CHANNEL_MS;

		ep_payload->dev_channel_mapping[12] = PCM_CHANNEL_FLC;

include/dsp/apr_audio-v2.h

+7 −4
Original line number Diff line number Diff line
@@ -5416,7 +5416,7 @@ struct asm_softvolume_params { 
#define PCM_CHANNEL_RB   9



/* Top surround channel. */

#define PCM_CHANNELS   10

#define PCM_CHANNEL_TS   10



/* Center vertical height channel.*/

#define PCM_CHANNEL_CVH  11
@@ -5496,6 +5496,9 @@ struct asm_softvolume_params { 
/* Right side direct channel. */

#define PCM_CHANNEL_RSD  34



/* Mark unused channel. */

#define PCM_CHANNEL_UNUSED  47



#define PCM_FORMAT_MAX_NUM_CHANNEL  8

#define PCM_FORMAT_MAX_CHANNELS_9   9
@@ -5625,7 +5628,7 @@ struct asm_multi_channel_pcm_fmt_blk_v2 { 
 * - #PCM_CHANNEL_CS

 * - #PCM_CHANNEL_LB

 * - #PCM_CHANNEL_RB

 * - #PCM_CHANNELS

 * - #PCM_CHANNEL_TS

 * - #PCM_CHANNEL_CVH

 * - #PCM_CHANNEL_MS

 * - #PCM_CHANNEL_FLC
@@ -9559,7 +9562,7 @@ struct asm_volume_ctrl_channeltype_gain_pair { 
	 * - #PCM_CHANNEL_CS

	 * - #PCM_CHANNEL_LB

	 * - #PCM_CHANNEL_RB

	 * - #PCM_CHANNELS

	 * - #PCM_CHANNEL_TS

	 * - #PCM_CHANNEL_CVH

	 * - #PCM_CHANNEL_MS

	 * - #PCM_CHANNEL_FLC
@@ -9631,7 +9634,7 @@ struct asm_volume_ctrl_channelype_mute_pair { 
 * - #PCM_CHANNEL_CS

 * - #PCM_CHANNEL_LB

 * - #PCM_CHANNEL_RB

 * - #PCM_CHANNELS

 * - #PCM_CHANNEL_TS

 * - #PCM_CHANNEL_CVH

 * - #PCM_CHANNEL_MS

 * - #PCM_CHANNEL_FLC