From 1b64ead9cdb4eae25789cfc5bbb7d8ad07dee402 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Sat, 28 Apr 2012 18:55:44 +0800 Subject: ENGR00181201 mx6x HDMI audio add IEC head optimization with C code mx6x HDMI audio add IEC head optimization with C code Signed-off-by: Sandor Yu --- sound/soc/imx/imx-hdmi-dma.c | 96 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/sound/soc/imx/imx-hdmi-dma.c b/sound/soc/imx/imx-hdmi-dma.c index 691ca48b9f83..da9c2f776988 100644 --- a/sound/soc/imx/imx-hdmi-dma.c +++ b/sound/soc/imx/imx-hdmi-dma.c @@ -341,6 +341,97 @@ static void init_table(int channels) } } +#if 1 + +/* C code optimization for IEC head */ +static void hdmi_dma_copy_16_c_lut(unsigned short *src, unsigned int *dst, int samples, unsigned char *lookup_table) +{ + int i; + unsigned int sample; + unsigned int p; + unsigned int head; + + for (i = 0; i < samples; i++) { + /* get source sample */ + sample = *src++; + + /* xor every bit */ + p = sample ^ (sample >> 8); + p ^= (p >> 4); + p ^= (p >> 2); + p ^= (p >> 1); + p &= 1; /* only want last bit */ + p <<= 3; /* bit p */ + + /* get packet header */ + head = *lookup_table++; + + /* fix head */ + head ^= p; + + /* store */ + *dst++ = (head << 24) | (sample << 8); + } +} + +static void hdmi_dma_copy_16_c_fast(unsigned short *src, unsigned int *dst, int samples) +{ + int i; + unsigned int sample; + unsigned int p; + + for (i = 0; i < samples; i++) { + /* get source sample */ + sample = *src++; + + /* xor every bit */ + p = sample ^ (sample >> 8); + p ^= (p >> 4); + p ^= (p >> 2); + p ^= (p >> 1); + p &= 1; /* only want last bit */ + p <<= 3; /* bit p */ + + /* store */ + *dst++ = (p << 24) | (sample << 8); + } +} + +static void hdmi_dma_copy_16(unsigned short *src, unsigned int *dest, int framecount, int channelcount) +{ + /* split input frames into 192-frame each */ + int count_in_192 = (framecount + 191) / 192; + int i; + + for (i = 0; i < count_in_192; i++) { + int count; + int samples; + + /* handles frame index [0, 48) */ + count = (framecount < 48) ? framecount : 48; + samples = count * channelcount; + hdmi_dma_copy_16_c_lut(src, dest, samples, g_packet_head_table); + framecount -= count; + if (framecount == 0) + break; + + src += samples; + dest += samples; + + /* handles frame index [48, 192) */ + count = (framecount < 192 - 48) ? framecount : 192 - 48; + samples = count * channelcount; + hdmi_dma_copy_16_c_fast(src, dest, samples); + framecount -= count; + src += samples; + dest += samples; + } +} + +#else + +/* NEON optimization for IEC head*/ + /* Convert pcm samples to iec samples suitable for HDMI transfer. * PCM sample is 16 bits length. * Frame index always starts from 0. @@ -414,6 +505,7 @@ static void hdmi_dma_copy_24(u32 *src, u32 *dest, int framecount, int channelcou dest += samples; } } +#endif static void hdmi_dma_mmap_copy(struct snd_pcm_substream *substream, int offset, int count) @@ -437,11 +529,13 @@ static void hdmi_dma_mmap_copy(struct snd_pcm_substream *substream, hdmi_dma_copy_16(src16, dest, framecount, rtd->channels); break; +/* 24bit not support now. */ +/* case SNDRV_PCM_FORMAT_S24_LE: src32 = (u32 *)(runtime->dma_area + offset); hdmi_dma_copy_24(src32, dest, framecount, rtd->channels); break; - +*/ default: pr_err("%s HDMI Audio invalid sample format (%d)\n", __func__, rtd->format); -- cgit v1.2.3