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

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

Merge "ASoC: qdsp6: Add MP2 decoder format support"

parents 0915f7d6 a4aa647e

include/sound/apr_audio-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -3332,6 +3332,7 @@ struct asm_amrwbplus_fmt_blk_v2 { 
#define ASM_MEDIA_FMT_AC3_DEC                   0x00010BF6

#define ASM_MEDIA_FMT_EAC3_DEC                   0x00010C3C

#define ASM_MEDIA_FMT_DTS                    0x00010D88

#define ASM_MEDIA_FMT_MP2                    0x00010DE9



/* Media format ID for adaptive transform acoustic coding. This

 * ID is used by the #ASM_STREAM_CMD_OPEN_WRITE_COMPRESSED command

include/sound/q6asm-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define FORMAT_MAT	0x0018

#define FORMAT_AAC	0x0019

#define FORMAT_DTS_LBR	0x001a

#define FORMAT_MP2          0x0015



#define ENCDEC_SBCBITRATE   0x0001

#define ENCDEC_IMMEDIATE_DECODE 0x0002

sound/soc/msm/qdsp6v2/q6asm.c

+3 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,9 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format, 
	case FORMAT_EAC3:

		open.dec_fmt_id = ASM_MEDIA_FMT_EAC3_DEC;

		break;

	case FORMAT_MP2:

		open.dec_fmt_id = ASM_MEDIA_FMT_MP2;

		break;

	default:

		pr_err("%s: Invalid format[%d]\n", __func__, format);

		goto fail_cmd;