From patchwork Sat Feb 24 12:05:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 7729 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp1752315jai; Sat, 24 Feb 2018 04:05:59 -0800 (PST) X-Google-Smtp-Source: AH8x227Q0SZwTadSJkhHf2bhV8+hYb1avAqQzWsc/M7bYttksLaxgU7fBDTm5+P3REcQM7FDdinp X-Received: by 10.28.74.83 with SMTP id x80mr3955256wma.47.1519473959551; Sat, 24 Feb 2018 04:05:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519473959; cv=none; d=google.com; s=arc-20160816; b=BkuOhZy4f18LBme9JKEJ9MPl0Y708yBWOJowat5TV3qk/v61w8mzQry19chinGo7ya +pbUy65KWF/h6SIBnITQYumx/S2zOiL6gOJPeLV6upSddDNIZ0VhiHYtIv4hkEpujLLt Hltfa9vie2Zotg72l1X9thbQN2JaL+yzO+4YHEvAqyEFl/AIp1QBuEBgvTFpEQw8us6S gL8dN5BRzcao/tj7EwmwwRSopzcVqCKuZ5Rj8CZ53E/EWgLBYytE9s9PLLeF499Fpu65 N4Yt1zXcBW8mwAC+/GNT3SyMyiw7Yte/fIO2hk5jab970p2m58wb26wzKBBRHRbLiqsk pILQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :in-reply-to:content-disposition:mime-version:references:message-id :to:from:date:delivered-to:arc-authentication-results; bh=FuDCy/6j1IZd5yLg3wgmHCE4DTL2aBz3yAWLNVfdYPw=; b=WBEm3yZlPM9QFMxxYhNxJaJfoB0QlspKUPQrTOf804kfoFj/FvHQhmLwmkRpWHIXJ6 200jScPE5K/6gAfg+xHKFnmWdMUmwBY4VLrXXfl8zgq3kqQbM+0MMQePbCRdUQ5uAR5F xXME800RB9GWAbID3OdpzbBimbSp50c1O5G6C6CZXB8vPqdmzCJHY39FXTj+nyuXajz7 qv/fPKxK9Pm5zm/CaNU08qA/1vvBS89EFJex8C+mATkOxAtlxqEqYWXY7PkH0G2NvvVf Lkz3l8JFPlmvUF+PyivdF+5x7KYZzOZSRgdd6G+QHIQMQE1CcDxMdMuoOtaUExm1k7we KtkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a13si1041560wri.160.2018.02.24.04.05.59; Sat, 24 Feb 2018 04:05:59 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C6E468A1FA; Sat, 24 Feb 2018 14:05:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0D0768A1C5 for ; Sat, 24 Feb 2018 14:05:47 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 00E2578032A for ; Sat, 24 Feb 2018 13:05:50 +0100 (CET) Received: from aurel by marge.gnuage.org with local (Exim 4.89) (envelope-from ) id 1epYaM-0002q1-LX for ffmpeg-devel@ffmpeg.org; Sat, 24 Feb 2018 13:05:50 +0100 Date: Sat, 24 Feb 2018 13:05:50 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Message-ID: <20180224120550.zocrspwzax5oibcd@gnuage.org> References: <20180221223718.20789-1-aurel@gnuage.org> <20180221223718.20789-8-aurel@gnuage.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: aurel@gnuage.org X-SA-Exim-Scanned: No (on marge.gnuage.org); SAEximRunCond expanded to false Subject: Re: [FFmpeg-devel] [PATCH 7/9] sbcenc: add MMX optimizations X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Thu, Feb 22, 2018 at 05:21:57PM +0000, Rostislav Pehlivanov wrote: > On 21 February 2018 at 22:37, Aurelien Jacobs wrote: > [...] > > +;******************************************************************* > > +;void ff_sbc_analyze_4(const int16_t *in, int32_t *out, const int16_t > > *consts); > > +;******************************************************************* > > +INIT_MMX mmx > > +cglobal sbc_analyze_4, 3, 3, 4, in, out, consts > > + movq m0, [inq] > > + movq m1, [inq+8] > > + pmaddwd m0, [constsq] > > + pmaddwd m1, [constsq+8] > > + paddd m0, [scale_mask] > > + paddd m1, [scale_mask] > > + > > + movq m2, [inq+16] > > + movq m3, [inq+24] > > + pmaddwd m2, [constsq+16] > > + pmaddwd m3, [constsq+24] > > + paddd m0, m2 > > + paddd m1, m3 > > + > > + movq m2, [inq+32] > > + movq m3, [inq+40] > > + pmaddwd m2, [constsq+32] > > + pmaddwd m3, [constsq+40] > > + paddd m0, m2 > > + paddd m1, m3 > > + > > + movq m2, [inq+48] > > + movq m3, [inq+56] > > + pmaddwd m2, [constsq+48] > > + pmaddwd m3, [constsq+56] > > + paddd m0, m2 > > + paddd m1, m3 > > + > > + movq m2, [inq+64] > > + movq m3, [inq+72] > > + pmaddwd m2, [constsq+64] > > + pmaddwd m3, [constsq+72] > > + paddd m0, m2 > > + paddd m1, m3 > > > > You can macro the top 3 blocks > > [...] > > +;******************************************************************* > > +;void ff_sbc_analyze_8(const int16_t *in, int32_t *out, const int16_t > > *consts); > > +;******************************************************************* > > +INIT_MMX mmx > > +cglobal sbc_analyze_8, 3, 3, 4, in, out, consts > > + movq m0, [inq] > > + movq m1, [inq+8] > > + movq m2, [inq+16] > > + movq m3, [inq+24] > > + pmaddwd m0, [constsq] > > + pmaddwd m1, [constsq+8] > > + pmaddwd m2, [constsq+16] > > + pmaddwd m3, [constsq+24] > > + paddd m0, [scale_mask] > > + paddd m1, [scale_mask] > > + paddd m2, [scale_mask] > > + paddd m3, [scale_mask] > > + > > + movq m4, [inq+32] > > + movq m5, [inq+40] > > + movq m6, [inq+48] > > + movq m7, [inq+56] > > + pmaddwd m4, [constsq+32] > > + pmaddwd m5, [constsq+40] > > + pmaddwd m6, [constsq+48] > > + pmaddwd m7, [constsq+56] > > + paddd m0, m4 > > + paddd m1, m5 > > + paddd m2, m6 > > + paddd m3, m7 > > + > > + movq m4, [inq+64] > > + movq m5, [inq+72] > > + movq m6, [inq+80] > > + movq m7, [inq+88] > > + pmaddwd m4, [constsq+64] > > + pmaddwd m5, [constsq+72] > > + pmaddwd m6, [constsq+80] > > + pmaddwd m7, [constsq+88] > > + paddd m0, m4 > > + paddd m1, m5 > > + paddd m2, m6 > > + paddd m3, m7 > > + > > + movq m4, [inq+96] > > + movq m5, [inq+104] > > + movq m6, [inq+112] > > + movq m7, [inq+120] > > + pmaddwd m4, [constsq+96] > > + pmaddwd m5, [constsq+104] > > + pmaddwd m6, [constsq+112] > > + pmaddwd m7, [constsq+120] > > + paddd m0, m4 > > + paddd m1, m5 > > + paddd m2, m6 > > + paddd m3, m7 > > + > > + movq m4, [inq+128] > > + movq m5, [inq+136] > > + movq m6, [inq+144] > > + movq m7, [inq+152] > > + pmaddwd m4, [constsq+128] > > + pmaddwd m5, [constsq+136] > > + pmaddwd m6, [constsq+144] > > + pmaddwd m7, [constsq+152] > > + paddd m0, m4 > > + paddd m1, m5 > > + paddd m2, m6 > > + paddd m3, m7 > > > > And those 5 blocks > > > > + > > + psrad m0, 16 ; SBC_PROTO_FIXED_SCALE > > + psrad m1, 16 ; SBC_PROTO_FIXED_SCALE > > + psrad m2, 16 ; SBC_PROTO_FIXED_SCALE > > + psrad m3, 16 ; SBC_PROTO_FIXED_SCALE > > + > > + packssdw m0, m0 > > + packssdw m1, m1 > > + packssdw m2, m2 > > + packssdw m3, m3 > > + > > + movq m4, m0 > > + movq m5, m0 > > + pmaddwd m4, [constsq+160] > > + pmaddwd m5, [constsq+168] > > + > > + movq m6, m1 > > + movq m7, m1 > > + pmaddwd m6, [constsq+192] > > + pmaddwd m7, [constsq+200] > > + paddd m4, m6 > > + paddd m5, m7 > > + > > + movq m6, m2 > > + movq m7, m2 > > + pmaddwd m6, [constsq+224] > > + pmaddwd m7, [constsq+232] > > + paddd m4, m6 > > + paddd m5, m7 > > + > > + movq m6, m3 > > + movq m7, m3 > > + pmaddwd m6, [constsq+256] > > + pmaddwd m7, [constsq+264] > > + paddd m4, m6 > > + paddd m5, m7 > > > > Reuse the first macro here > > Should save quite a bit of code OK, here is a "macroified" version of the code. From f4441bf1d6b014e8021a0c33c81453d64682741c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 17 Dec 2017 20:07:33 +0100 Subject: [PATCH 7/9] sbcenc: add MMX optimizations This was originally based on libsbc, and was fully integrated into ffmpeg. Rough speed test: C version: speed= 592x MMX version: speed= 785x --- libavcodec/sbcdsp.c | 3 + libavcodec/sbcdsp.h | 2 + libavcodec/x86/Makefile | 2 + libavcodec/x86/sbcdsp.asm | 168 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/x86/sbcdsp_init.c | 51 +++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 libavcodec/x86/sbcdsp.asm create mode 100644 libavcodec/x86/sbcdsp_init.c diff --git a/libavcodec/sbcdsp.c b/libavcodec/sbcdsp.c index e155387f0d..2d0addcf28 100644 --- a/libavcodec/sbcdsp.c +++ b/libavcodec/sbcdsp.c @@ -379,4 +379,7 @@ av_cold void ff_sbcdsp_init(SBCDSPContext *s) /* Default implementation for scale factors calculation */ s->sbc_calc_scalefactors = sbc_calc_scalefactors; s->sbc_calc_scalefactors_j = sbc_calc_scalefactors_j; + + if (ARCH_X86) + ff_sbcdsp_init_x86(s); } diff --git a/libavcodec/sbcdsp.h b/libavcodec/sbcdsp.h index 66ed7d324e..127e6a8a11 100644 --- a/libavcodec/sbcdsp.h +++ b/libavcodec/sbcdsp.h @@ -80,4 +80,6 @@ struct sbc_dsp_context { */ void ff_sbcdsp_init(SBCDSPContext *s); +void ff_sbcdsp_init_x86(SBCDSPContext *s); + #endif /* AVCODEC_SBCDSP_H */ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index a805cd37b4..2350c8bbee 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -63,6 +63,7 @@ OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp_init.o +OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp_init.o OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc_init.o OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp_init.o OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp_init.o @@ -172,6 +173,7 @@ X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o +X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o diff --git a/libavcodec/x86/sbcdsp.asm b/libavcodec/x86/sbcdsp.asm new file mode 100644 index 0000000000..d68d3a9ae8 --- /dev/null +++ b/libavcodec/x86/sbcdsp.asm @@ -0,0 +1,168 @@ +;****************************************************************************** +;* SIMD optimized SBC encoder DSP functions +;* +;* Copyright (C) 2017 Aurelien Jacobs +;* Copyright (C) 2008-2010 Nokia Corporation +;* Copyright (C) 2004-2010 Marcel Holtmann +;* Copyright (C) 2004-2005 Henryk Ploetz +;* Copyright (C) 2005-2006 Brad Midgley +;* +;* This file is part of FFmpeg. +;* +;* FFmpeg is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* FFmpeg is distributed in the hope that it will be useful, +;* but WITHOUT ANY WARRANTY; without even the implied warranty of +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. +;* +;* You should have received a copy of the GNU Lesser General Public +;* License along with FFmpeg; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "libavutil/x86/x86util.asm" + +SECTION_RODATA + +scale_mask: times 2 dd 0x8000 ; 1 << (SBC_PROTO_FIXED_SCALE - 1) + +SECTION .text + +%macro NIDN 3 +%ifnidn %2, %3 + %1 %2, %3 +%endif +%endmacro + +%macro ANALYZE_MAC 9 ; out1, out2, in1, in2, tmp1, tmp2, add1, add2, offset + NIDN movq, %5, %3 + NIDN movq, %6, %4 + pmaddwd %5, [constsq+%9] + pmaddwd %6, [constsq+%9+8] + NIDN paddd, %1, %7 + NIDN paddd, %2, %8 +%endmacro + +%macro ANALYZE_MAC_IN 7 ; out1, out2, tmp1, tmp2, add1, add2, offset + ANALYZE_MAC %1, %2, [inq+%7], [inq+%7+8], %3, %4, %5, %6, %7 +%endmacro + +%macro ANALYZE_MAC_REG 7 ; out1, out2, in, tmp1, tmp2, offset, pack +%ifidn %7, pack + psrad %3, 16 ; SBC_PROTO_FIXED_SCALE + packssdw %3, %3 +%endif + ANALYZE_MAC %1, %2, %3, %3, %4, %5, %4, %5, %6 +%endmacro + +;******************************************************************* +;void ff_sbc_analyze_4(const int16_t *in, int32_t *out, const int16_t *consts); +;******************************************************************* +INIT_MMX mmx +cglobal sbc_analyze_4, 3, 3, 4, in, out, consts + ANALYZE_MAC_IN m0, m1, m0, m1, [scale_mask], [scale_mask], 0 + ANALYZE_MAC_IN m0, m1, m2, m3, m2, m3, 16 + ANALYZE_MAC_IN m0, m1, m2, m3, m2, m3, 32 + ANALYZE_MAC_IN m0, m1, m2, m3, m2, m3, 48 + ANALYZE_MAC_IN m0, m1, m2, m3, m2, m3, 64 + + ANALYZE_MAC_REG m0, m2, m0, m0, m2, 80, pack + ANALYZE_MAC_REG m0, m2, m1, m1, m3, 96, pack + + movq [outq ], m0 + movq [outq+8], m2 + + RET + + +;******************************************************************* +;void ff_sbc_analyze_8(const int16_t *in, int32_t *out, const int16_t *consts); +;******************************************************************* +INIT_MMX mmx +cglobal sbc_analyze_8, 3, 3, 4, in, out, consts + ANALYZE_MAC_IN m0, m1, m0, m1, [scale_mask], [scale_mask], 0 + ANALYZE_MAC_IN m2, m3, m2, m3, [scale_mask], [scale_mask], 16 + ANALYZE_MAC_IN m0, m1, m4, m5, m4, m5, 32 + ANALYZE_MAC_IN m2, m3, m6, m7, m6, m7, 48 + ANALYZE_MAC_IN m0, m1, m4, m5, m4, m5, 64 + ANALYZE_MAC_IN m2, m3, m6, m7, m6, m7, 80 + ANALYZE_MAC_IN m0, m1, m4, m5, m4, m5, 96 + ANALYZE_MAC_IN m2, m3, m6, m7, m6, m7, 112 + ANALYZE_MAC_IN m0, m1, m4, m5, m4, m5, 128 + ANALYZE_MAC_IN m2, m3, m6, m7, m6, m7, 144 + + ANALYZE_MAC_REG m4, m5, m0, m4, m5, 160, pack + ANALYZE_MAC_REG m4, m5, m1, m6, m7, 192, pack + ANALYZE_MAC_REG m4, m5, m2, m6, m7, 224, pack + ANALYZE_MAC_REG m4, m5, m3, m6, m7, 256, pack + + movq [outq ], m4 + movq [outq+8], m5 + + ANALYZE_MAC_REG m0, m5, m0, m0, m5, 176, no + ANALYZE_MAC_REG m0, m5, m1, m1, m7, 208, no + ANALYZE_MAC_REG m0, m5, m2, m2, m7, 240, no + ANALYZE_MAC_REG m0, m5, m3, m3, m7, 272, no + + movq [outq+16], m0 + movq [outq+24], m5 + + RET + + +;******************************************************************* +;void ff_sbc_calc_scalefactors(int32_t sb_sample_f[16][2][8], +; uint32_t scale_factor[2][8], +; int blocks, int channels, int subbands) +;******************************************************************* +INIT_MMX mmx +cglobal sbc_calc_scalefactors, 5, 7, 4, sb_sample_f, scale_factor, blocks, channels, subbands, ptr, blk + ; subbands = 4 * subbands * channels + movq m3, [scale_mask] + shl subbandsd, 2 + cmp channelsd, 2 + jl .loop_1 + shl subbandsd, 1 + +.loop_1: + sub subbandsq, 8 + lea ptrq, [sb_sample_fq + subbandsq] + + ; blk = (blocks - 1) * 64; + lea blkq, [blocksq - 1] + shl blkd, 6 + + movq m0, m3 +.loop_2: + movq m1, [ptrq+blkq] + pxor m2, m2 + pcmpgtd m1, m2 + paddd m1, [ptrq+blkq] + pcmpgtd m2, m1 + pxor m1, m2 + + por m0, m1 + + sub blkq, 64 + jns .loop_2 + + movd blkd, m0 + psrlq m0, 32 + bsr blkd, blkd + sub blkd, 15 ; SCALE_OUT_BITS + mov [scale_factorq + subbandsq], blkd + + movd blkd, m0 + bsr blkd, blkd + sub blkd, 15 ; SCALE_OUT_BITS + mov [scale_factorq + subbandsq + 4], blkd + + cmp subbandsq, 0 + jg .loop_1 + + emms + RET diff --git a/libavcodec/x86/sbcdsp_init.c b/libavcodec/x86/sbcdsp_init.c new file mode 100644 index 0000000000..86effecfdf --- /dev/null +++ b/libavcodec/x86/sbcdsp_init.c @@ -0,0 +1,51 @@ +/* + * Bluetooth low-complexity, subband codec (SBC) + * + * Copyright (C) 2017 Aurelien Jacobs + * Copyright (C) 2008-2010 Nokia Corporation + * Copyright (C) 2004-2010 Marcel Holtmann + * Copyright (C) 2004-2005 Henryk Ploetz + * Copyright (C) 2005-2006 Brad Midgley + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * SBC MMX optimization for some basic "building bricks" + */ + +#include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" +#include "libavcodec/sbcdsp.h" + +void ff_sbc_analyze_4_mmx(const int16_t *in, int32_t *out, const int16_t *consts); +void ff_sbc_analyze_8_mmx(const int16_t *in, int32_t *out, const int16_t *consts); +void ff_sbc_calc_scalefactors_mmx(int32_t sb_sample_f[16][2][8], + uint32_t scale_factor[2][8], + int blocks, int channels, int subbands); + +av_cold void ff_sbcdsp_init_x86(SBCDSPContext *s) +{ + int cpu_flags = av_get_cpu_flags(); + + if (EXTERNAL_MMX(cpu_flags)) { + s->sbc_analyze_4 = ff_sbc_analyze_4_mmx; + s->sbc_analyze_8 = ff_sbc_analyze_8_mmx; + s->sbc_calc_scalefactors = ff_sbc_calc_scalefactors_mmx; + } +} -- 2.16.1