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

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

Merge "ASoC: msm: Correct Aptx decoder format number"

parents b4c40dbd 85852d14

include/sound/q6asm-v2.h

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ 
#define FORMAT_G711_ALAW_FS 0x001a

#define FORMAT_G711_MLAW_FS 0x001b

#define FORMAT_DTS          0x001c

#define FORMAT_APTX         0x001d

#define FORMAT_DSD          0x001d

#define FORMAT_APTX         0x001e



#define ENCDEC_SBCBITRATE   0x0001

#define ENCDEC_IMMEDIATE_DECODE 0x0002

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static void populate_codec_list(struct msm_compr_audio *prtd) 
			COMPR_PLAYBACK_MIN_NUM_FRAGMENTS;

	prtd->compr_cap.max_fragments =

			COMPR_PLAYBACK_MAX_NUM_FRAGMENTS;

	prtd->compr_cap.num_codecs = 13;

	prtd->compr_cap.num_codecs = 14;

	prtd->compr_cap.codecs[0] = SND_AUDIOCODEC_MP3;

	prtd->compr_cap.codecs[1] = SND_AUDIOCODEC_AAC;

	prtd->compr_cap.codecs[2] = SND_AUDIOCODEC_AC3;