rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Merge "ASoC: msm8974: Compressed driver fix for AAC playback"

Browse Source
This commit is contained in:
Linux Build Service Account
2012-10-17 20:23:24 -07:00
committed by Gerrit - the friendly Code Review server
parent 27b0d635d9 f3c5fac2b5
commit 53b1867dce
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/q6asm-v2.h
+1
View File
@@ -66,6 +66,7 @@
#define SYNC_IO_MODE 0x0001
#define ASYNC_IO_MODE 0x0002
#define COMPRESSED_IO 0x0040
#define NT_MODE 0x0400
sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
+11 -17
View File
@@ -148,17 +148,14 @@ static void compr_event_handler(uint32_t opcode,
((unsigned int)buf[0].phys
+ (prtd->out_head * prtd->pcm_count)));
if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {
if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
time_stamp_flag = SET_TIMESTAMP;
memcpy(&output_meta_data, (char *)(buf->data +
else
time_stamp_flag = NO_TIMESTAMP;
memcpy(&output_meta_data, (char *)(buf->data +
prtd->out_head * prtd->pcm_count),
COMPRE_OUTPUT_METADATA_SIZE);
} else {
time_stamp_flag = NO_TIMESTAMP;
memset(&output_meta_data, 0,
COMPRE_OUTPUT_METADATA_SIZE);
output_meta_data.frame_size = prtd->pcm_count;
}
buffer_length = output_meta_data.frame_size;
pr_debug("meta_data_length: %d, frame_length: %d\n",
output_meta_data.meta_data_length,
@@ -257,17 +254,13 @@ static void compr_event_handler(uint32_t opcode,
__func__, prtd->out_head,
((unsigned int)buf[0].phys
+ (prtd->out_head * prtd->pcm_count)));
if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {
if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
time_stamp_flag = SET_TIMESTAMP;
memcpy(&output_meta_data, (char *)(buf->data +
else
time_stamp_flag = NO_TIMESTAMP;
memcpy(&output_meta_data, (char *)(buf->data +
prtd->out_head * prtd->pcm_count),
COMPRE_OUTPUT_METADATA_SIZE);
} else {
time_stamp_flag = NO_TIMESTAMP;
memset(&output_meta_data, 0,
COMPRE_OUTPUT_METADATA_SIZE);
output_meta_data.frame_size = prtd->pcm_count;
}
buffer_length = output_meta_data.frame_size;
pr_debug("meta_data_length: %d, frame_length: %d\n",
output_meta_data.meta_data_length,
@@ -774,7 +767,8 @@ static int msm_compr_hw_params(struct snd_pcm_substream *substream,
}
}
ret = q6asm_set_io_mode(prtd->audio_client, ASYNC_IO_MODE);
ret = q6asm_set_io_mode(prtd->audio_client,
(COMPRESSED_IO | ASYNC_IO_MODE));
if (ret < 0) {
pr_err("%s: Set IO mode failed\n", __func__);
return -ENOMEM;
sound/soc/msm/qdsp6v2/q6asm.c
+10 -2
View File
@@ -476,9 +476,13 @@ void q6asm_audio_client_free(struct audio_client *ac)
return;
}
int q6asm_set_io_mode(struct audio_client *ac, uint32_t mode)
int q6asm_set_io_mode(struct audio_client *ac, uint32_t mode1)
{
uint32_t mode;
ac->io_mode &= 0xFF00;
mode = (mode1 & 0xF);
pr_debug("%s ac->mode after anding with FF00:0x[%x],\n",
__func__, ac->io_mode);
if (ac == NULL) {
@@ -486,7 +490,7 @@ int q6asm_set_io_mode(struct audio_client *ac, uint32_t mode)
return -EINVAL;
}
if ((mode == ASYNC_IO_MODE) || (mode == SYNC_IO_MODE)) {
ac->io_mode |= mode;
ac->io_mode |= mode1;
pr_debug("%s:Set Mode to 0x[%x]\n", __func__, ac->io_mode);
return 0;
} else {
@@ -2961,6 +2965,7 @@ int q6asm_async_write(struct audio_client *ac,
struct audio_port_data *port;
u32 lbuf_addr_lsw;
u32 liomode;
u32 io_compressed;
if (!ac || ac->apr == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
@@ -2981,9 +2986,12 @@ int q6asm_async_write(struct audio_client *ac,
write.timestamp_msw = param->msw_ts;
write.timestamp_lsw = param->lsw_ts;
liomode = (ASYNC_IO_MODE | NT_MODE);
io_compressed = (ASYNC_IO_MODE | COMPRESSED_IO);
if (ac->io_mode == liomode)
lbuf_addr_lsw = (write.buf_addr_lsw - 32);
else if (ac->io_mode == io_compressed)
lbuf_addr_lsw = (write.buf_addr_lsw - 0x40);
else
lbuf_addr_lsw = write.buf_addr_lsw;