From patchwork Sat Feb 15 16:54:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Vinel X-Patchwork-Id: 3657961 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 811DDBF13A for ; Sun, 16 Feb 2014 10:51:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7FCCD20176 for ; Sun, 16 Feb 2014 10:51:28 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0C84B20172 for ; Sun, 16 Feb 2014 10:51:27 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1A0A8261A5C; Sun, 16 Feb 2014 11:51:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 6BCE82610D2; Sun, 16 Feb 2014 11:50:46 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 74C01261616; Sat, 15 Feb 2014 17:54:47 +0100 (CET) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by alsa0.perex.cz (Postfix) with ESMTP id 519ED2615FC; Sat, 15 Feb 2014 17:54:39 +0100 (CET) Received: by mail-wg0-f49.google.com with SMTP id y10so1217620wgg.16 for ; Sat, 15 Feb 2014 08:54:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DRshBK/nneB55Y+hBo9MBQqJmFEeWByJ0KBSUC/vEzQ=; b=FtpbBmaz8nt9V6mx39fo3OFnF70BNtsdFd3VHJDcgywWIG+oeTzMaxz/YDryLWLheE mny5XUFCqHvB8KW65nqwPGE2u5UbZMD3GjVusxP3SoAxQ/emtX0dDR1zhvYuBrf9f0Cj Jm1yxibzBUnAD8mjteF9ItaoZOIjIfTLR5vsCrfFr6+oOfLSGE7E1n2kCBaSnk6PfsR6 SB+z8SeFHyz9jFd7WeyotLw4iN6wOLd1/Yqds/fhfhoCpCLj/UQeMRRE7fwlSHlMmOEY R0lMqDT868nNjvWTYh312ibyivfn9BCsBKspb42uQeCoK+LDGwhcq8Nt7k5d3NMMTEfp 8kSg== X-Received: by 10.180.218.171 with SMTP id ph11mr6552474wic.7.1392483279053; Sat, 15 Feb 2014 08:54:39 -0800 (PST) Received: from archthorn.taudis (213-245-248-145.rev.numericable.fr. [213.245.248.145]) by mx.google.com with ESMTPSA id ci4sm21768958wjc.21.2014.02.15.08.54.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Feb 2014 08:54:38 -0800 (PST) From: Vincent Vinel To: patch@alsa-project.org Date: Sat, 15 Feb 2014 17:54:31 +0100 Message-Id: <1392483271-20453-2-git-send-email-v.vinel@gmail.com> X-Mailer: git-send-email 1.8.5.5 In-Reply-To: <1392483271-20453-1-git-send-email-v.vinel@gmail.com> References: <1392483271-20453-1-git-send-email-v.vinel@gmail.com> X-Mailman-Approved-At: Sun, 16 Feb 2014 11:50:44 +0100 Cc: alsa-devel@alsa-project.org, Vincent Vinel Subject: [alsa-devel] [PATCH 1/1] dmix: Add support for S24_3BE format. X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Add swapped versions of generic_mix_areas_24() and generic_remix_areas_24(). Signed-off-by: Vincent Vinel diff --git a/include/pcm.h b/include/pcm.h index 95b8aed..9be595c 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -222,6 +222,8 @@ typedef enum _snd_pcm_format { SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_LE, /** Unsigned 24 bit CPU endian */ SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_LE, + /** Signed 24 bit CPU endian in 3bytes format */ + SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3LE, /** Signed 32 bit CPU endian */ SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_LE, /** Unsigned 32 bit CPU endian */ @@ -241,6 +243,8 @@ typedef enum _snd_pcm_format { SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_BE, /** Unsigned 24 bit CPU endian */ SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_BE, + /** Signed 24 bit CPU endian in 3bytes format */ + SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3BE, /** Signed 32 bit CPU endian */ SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_BE, /** Unsigned 32 bit CPU endian */ diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 5416cf7..1a98d8f 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -909,7 +909,8 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str SND_PCM_FORMAT_S16, SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE, SND_PCM_FORMAT_S24_LE, - SND_PCM_FORMAT_S24_3LE, + SND_PCM_FORMAT_S24_3, + SND_PCM_FORMAT_S24_3 ^ SND_PCM_FORMAT_S24_3LE ^ SND_PCM_FORMAT_S24_3BE, SND_PCM_FORMAT_U8, }; snd_pcm_format_t format; diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 4aa6d4e..46ca289 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -179,6 +179,7 @@ static void mix_areas(snd_pcm_direct_t *dmix, do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24; break; case SND_PCM_FORMAT_S24_3LE: + case SND_PCM_FORMAT_S24_3BE: sample_size = 3; do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24; break; @@ -247,6 +248,7 @@ static void remix_areas(snd_pcm_direct_t *dmix, do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24; break; case SND_PCM_FORMAT_S24_3LE: + case SND_PCM_FORMAT_S24_3BE: sample_size = 3; do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24; break; diff --git a/src/pcm/pcm_dmix_generic.c b/src/pcm/pcm_dmix_generic.c index 9e9d3c3..91abd88 100644 --- a/src/pcm/pcm_dmix_generic.c +++ b/src/pcm/pcm_dmix_generic.c @@ -123,6 +123,7 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix) ((1ULL << SND_PCM_FORMAT_S16_LE) | (1ULL << SND_PCM_FORMAT_S32_LE) |\ (1ULL << SND_PCM_FORMAT_S16_BE) | (1ULL << SND_PCM_FORMAT_S32_BE) |\ (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \ + (1ULL << SND_PCM_FORMAT_S24_3BE) |\ (1ULL << SND_PCM_FORMAT_U8)) #include @@ -387,8 +388,7 @@ static void generic_remix_areas_32_swap(unsigned int size, } } -/* always little endian */ -static void generic_mix_areas_24(unsigned int size, +static void generic_mix_areas_24_native(unsigned int size, volatile unsigned char *dst, unsigned char *src, volatile signed int *sum, @@ -421,7 +421,40 @@ static void generic_mix_areas_24(unsigned int size, } } -static void generic_remix_areas_24(unsigned int size, +static void generic_mix_areas_24_swap(unsigned int size, + volatile unsigned char *dst, + unsigned char *src, + volatile signed int *sum, + size_t dst_step, + size_t src_step, + size_t sum_step) +{ + register signed int sample; + + for (;;) { + sample = src[2] | (src[1] << 8) | (((signed char *)src)[0] << 16); + if (!(dst[0] | dst[1] | dst[2])) { + *sum = sample; + } else { + sample += *sum; + *sum = sample; + if (sample > 0x7fffff) + sample = 0x7fffff; + else if (sample < -0x800000) + sample = -0x800000; + } + dst[2] = sample; + dst[1] = sample >> 8; + dst[0] = sample >> 16; + if (!--size) + return; + dst += dst_step; + src += src_step; + sum = (signed int *) ((char *)sum + sum_step); + } +} + +static void generic_remix_areas_24_native(unsigned int size, volatile unsigned char *dst, unsigned char *src, volatile signed int *sum, @@ -454,6 +487,38 @@ static void generic_remix_areas_24(unsigned int size, } } +static void generic_remix_areas_24_swap(unsigned int size, + volatile unsigned char *dst, + unsigned char *src, + volatile signed int *sum, + size_t dst_step, + size_t src_step, + size_t sum_step) +{ + register signed int sample; + + for (;;) { + sample = src[2] | (src[1] << 8) | (((signed char *)src)[0] << 16); + if (!(dst[0] | dst[1] | dst[2])) { + sample = -sample; + *sum = sample; + } else { + *sum = sample = *sum - sample; + if (sample > 0x7fffff) + sample = 0x7fffff; + else if (sample < -0x800000) + sample = -0x800000; + } + dst[2] = sample; + dst[1] = sample >> 8; + dst[0] = sample >> 16; + if (!--size) + return; + dst += dst_step; + src += src_step; + sum = (signed int *) ((char *)sum + sum_step); + } +} static void generic_mix_areas_u8(unsigned int size, volatile unsigned char *dst, unsigned char *src, @@ -518,17 +583,19 @@ static void generic_mix_select_callbacks(snd_pcm_direct_t *dmix) if (snd_pcm_format_cpu_endian(dmix->shmptr->s.format)) { dmix->u.dmix.mix_areas_16 = generic_mix_areas_16_native; dmix->u.dmix.mix_areas_32 = generic_mix_areas_32_native; + dmix->u.dmix.mix_areas_24 = generic_mix_areas_24_native; dmix->u.dmix.remix_areas_16 = generic_remix_areas_16_native; dmix->u.dmix.remix_areas_32 = generic_remix_areas_32_native; + dmix->u.dmix.remix_areas_24 = generic_remix_areas_24_native; } else { dmix->u.dmix.mix_areas_16 = generic_mix_areas_16_swap; dmix->u.dmix.mix_areas_32 = generic_mix_areas_32_swap; + dmix->u.dmix.mix_areas_24 = generic_mix_areas_24_swap; dmix->u.dmix.remix_areas_16 = generic_remix_areas_16_swap; dmix->u.dmix.remix_areas_32 = generic_remix_areas_32_swap; + dmix->u.dmix.remix_areas_24 = generic_remix_areas_24_swap; } - dmix->u.dmix.mix_areas_24 = generic_mix_areas_24; dmix->u.dmix.mix_areas_u8 = generic_mix_areas_u8; - dmix->u.dmix.remix_areas_24 = generic_remix_areas_24; dmix->u.dmix.remix_areas_u8 = generic_remix_areas_u8; }