diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-19 09:52:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-19 09:52:31 -0800 |
| commit | 66d6a6b1f9d071d036be729214b8f56cc755959a (patch) | |
| tree | 0eb1a28fdb94ceb04cea157f699205ed0710078d /sound | |
| parent | 1ad069c71ae41b5cd4cb52afb676241a9bb2c51d (diff) | |
| parent | 2ea01bbff19554a3ff4a6f45b160b39705834cf2 (diff) | |
Merge "ASoc: msm: qdsp6v2: add support for AAC LATM playback"
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c index d3c0850d8de2..9421d03f6a8d 100644 --- a/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -863,6 +863,9 @@ static int msm_compr_send_media_format_block(struct snd_compr_stream *cstream, if (prtd->codec_param.codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS) aac_cfg.format = 0x0; + else if (prtd->codec_param.codec.format == + SND_AUDIOSTREAMFORMAT_MP4LATM) + aac_cfg.format = 0x04; else aac_cfg.format = 0x03; aac_cfg.ch_cfg = prtd->num_channels; |