Well, this is mostly for information on what i tried.
One patch is applicable and doesn't result in compilation failure
lame-3.100-fastcrc.diff
# lame patches
cp $CWD/lame-3.100-fastcrc.diff thirdparty/src/lame-3.100.patch1
#cp $CWD/lame-3.100-sse-20171014.diff thirdparty/src/lame-3.100.patch2
git apply -v $CWD/lame-make-opt.diff
but second patch actually require -msse2 on x86-32, so I disabled it for now.
You can tweak it a bit more, for example leaving only x86_64 part in those
statements:
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
but this is just some kind of distraction.
in opt patch I changed defaults to more aggressive:
+lame.cfg_vars?= CFLAGS+=" -O3 -DUSE_FAST_LOG=1 -ffast-math"
+lame.cfg_params?=--enable-shared=no --enable-nasm --enable-expopt=norm
from this page:
https://shenki.github.io/LameMP3-on-Power9/
actually I saw described there configure bug, but just added CFLAGS
instead of patching autoconf stuff.
Oh, this libpng strangeness makes me unhappy :/
diff -Naur lame-3.100/libmp3lame/VbrTag.c lame-3.100-fastcrc/libmp3lame/VbrTag.c
--- lame-3.100/libmp3lame/VbrTag.c 2017-08-15 13:40:45 +0000
+++ lame-3.100/libmp3lame/VbrTag.c 2018-04-28 22:34:20 +0000
@@ -77,40 +77,7 @@
* See 'CRC_update_lookup'
* Uses the polynomial x^16+x^15+x^2+1 */
-static const unsigned int crc16_lookup[256] = {
- 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
- 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
- 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
- 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
- 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
- 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
- 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
- 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
- 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
- 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
- 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
- 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
- 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
- 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
- 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
- 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
- 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
- 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
- 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
- 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
- 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
- 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
- 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
- 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
- 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
- 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
- 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
- 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
- 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
- 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
- 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
- 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
-};
+#include "VbrTagCrc.h"
@@ -580,20 +547,28 @@
/* fast CRC-16 computation - uses table crc16_lookup 8*/
static uint16_t
-CRC_update_lookup(uint16_t value, uint16_t crc)
+CRC_update_lookup(uint16_t crc, unsigned char const *buffer, int size)
{
- uint16_t tmp;
- tmp = crc ^ value;
- crc = (crc >> 8) ^ crc16_lookup[tmp & 0xff];
+ while (size >= 8) {
+ crc ^= buffer[1] << 8 | buffer[0];
+
+ crc = crc16_lookup[7][crc & 0xFF] ^ crc16_lookup[6][crc >> 8 ] ^
+ crc16_lookup[5][buffer[2] ] ^ crc16_lookup[4][buffer[3]] ^
+ crc16_lookup[3][buffer[4] ] ^ crc16_lookup[2][buffer[5]] ^
+ crc16_lookup[1][buffer[6] ] ^ crc16_lookup[0][buffer[7]];
+
+ buffer += 8;
+ size -= 8;
+ }
+
+ while (size--) crc = (crc >> 8) ^ crc16_lookup[0][(crc & 0xff) ^ *buffer++];
return crc;
}
void
UpdateMusicCRC(uint16_t * crc, unsigned char const *buffer, int size)
{
- int i;
- for (i = 0; i < size; ++i)
- *crc = CRC_update_lookup(buffer[i], *crc);
+ *crc = CRC_update_lookup(*crc, buffer, size);
}
@@ -852,8 +827,7 @@
/*Calculate tag CRC.... must be done here, since it includes
*previous information*/
- for (i = 0; i < nBytesWritten; i++)
- crc = CRC_update_lookup(pbtStreamBuffer[i], crc);
+ crc = CRC_update_lookup(crc, pbtStreamBuffer, nBytesWritten);
CreateI2(&pbtStreamBuffer[nBytesWritten], crc);
nBytesWritten += 2;
@@ -1000,9 +974,7 @@
{
/*work out CRC so far: initially crc = 0 */
uint16_t crc = 0x00;
- unsigned int i;
- for (i = 0; i < nStreamIndex; i++)
- crc = CRC_update_lookup(buffer[i], crc);
+ crc = CRC_update_lookup(crc, buffer, nStreamIndex);
/*Put LAME VBR info */
nStreamIndex += PutLameVBR(gfp, stream_size, buffer + nStreamIndex, crc);
}
diff -Naur lame-3.100/libmp3lame/VbrTagCrc.h lame-3.100-fastcrc/libmp3lame/VbrTagCrc.h
--- lame-3.100/libmp3lame/VbrTagCrc.h 1970-01-01 00:00:00 +0000
+++ lame-3.100/libmp3lame/VbrTagCrc.h 2018-04-28 10:16:54 +0000
@@ -0,0 +1,331 @@
+/*
+ * CRC table for VBR tags
+ *
+ * Copyright (c) 2018 Robert Kausch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* $Id: crctable.h,v 1.1 2018/04/27 22:12:11 enzo Exp $ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "machine.h"
+
+static const uint16_t crc16_lookup[8][256] = {
+ { 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
+ 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
+ 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+ 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+ 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+ 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+ 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+ 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+ 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+ 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+ 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+ 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+ 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+ 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+ 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+ 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+ 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+ 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+ 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+ 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+ 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+ 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+ 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+ 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+ 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+ 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+ 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+ 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+ 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+ 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+ 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+ 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 },
+
+ { 0x0000, 0x9001, 0x6001, 0xF000, 0xC002, 0x5003, 0xA003, 0x3002,
+ 0xC007, 0x5006, 0xA006, 0x3007, 0x0005, 0x9004, 0x6004, 0xF005,
+ 0xC00D, 0x500C, 0xA00C, 0x300D, 0x000F, 0x900E, 0x600E, 0xF00F,
+ 0x000A, 0x900B, 0x600B, 0xF00A, 0xC008, 0x5009, 0xA009, 0x3008,
+ 0xC019, 0x5018, 0xA018, 0x3019, 0x001B, 0x901A, 0x601A, 0xF01B,
+ 0x001E, 0x901F, 0x601F, 0xF01E, 0xC01C, 0x501D, 0xA01D, 0x301C,
+ 0x0014, 0x9015, 0x6015, 0xF014, 0xC016, 0x5017, 0xA017, 0x3016,
+ 0xC013, 0x5012, 0xA012, 0x3013, 0x0011, 0x9010, 0x6010, 0xF011,
+ 0xC031, 0x5030, 0xA030, 0x3031, 0x0033, 0x9032, 0x6032, 0xF033,
+ 0x0036, 0x9037, 0x6037, 0xF036, 0xC034, 0x5035, 0xA035, 0x3034,
+ 0x003C, 0x903D, 0x603D, 0xF03C, 0xC03E, 0x503F, 0xA03F, 0x303E,
+ 0xC03B, 0x503A, 0xA03A, 0x303B, 0x0039, 0x9038, 0x6038, 0xF039,
+ 0x0028, 0x9029, 0x6029, 0xF028, 0xC02A, 0x502B, 0xA02B, 0x302A,
+ 0xC02F, 0x502E, 0xA02E, 0x302F, 0x002D, 0x902C, 0x602C, 0xF02D,
+ 0xC025, 0x5024, 0xA024, 0x3025, 0x0027, 0x9026, 0x6026, 0xF027,
+ 0x0022, 0x9023, 0x6023, 0xF022, 0xC020, 0x5021, 0xA021, 0x3020,
+ 0xC061, 0x5060, 0xA060, 0x3061, 0x0063, 0x9062, 0x6062, 0xF063,
+ 0x0066, 0x9067, 0x6067, 0xF066, 0xC064, 0x5065, 0xA065, 0x3064,
+ 0x006C, 0x906D, 0x606D, 0xF06C, 0xC06E, 0x506F, 0xA06F, 0x306E,
+ 0xC06B, 0x506A, 0xA06A, 0x306B, 0x0069, 0x9068, 0x6068, 0xF069,
+ 0x0078, 0x9079, 0x6079, 0xF078, 0xC07A, 0x507B, 0xA07B, 0x307A,
+ 0xC07F, 0x507E, 0xA07E, 0x307F, 0x007D, 0x907C, 0x607C, 0xF07D,
+ 0xC075, 0x5074, 0xA074, 0x3075, 0x0077, 0x9076, 0x6076, 0xF077,
+ 0x0072, 0x9073, 0x6073, 0xF072, 0xC070, 0x5071, 0xA071, 0x3070,
+ 0x0050, 0x9051, 0x6051, 0xF050, 0xC052, 0x5053, 0xA053, 0x3052,
+ 0xC057, 0x5056, 0xA056, 0x3057, 0x0055, 0x9054, 0x6054, 0xF055,
+ 0xC05D, 0x505C, 0xA05C, 0x305D, 0x005F, 0x905E, 0x605E, 0xF05F,
+ 0x005A, 0x905B, 0x605B, 0xF05A, 0xC058, 0x5059, 0xA059, 0x3058,
+ 0xC049, 0x5048, 0xA048, 0x3049, 0x004B, 0x904A, 0x604A, 0xF04B,
+ 0x004E, 0x904F, 0x604F, 0xF04E, 0xC04C, 0x504D, 0xA04D, 0x304C,
+ 0x0044, 0x9045, 0x6045, 0xF044, 0xC046, 0x5047, 0xA047, 0x3046,
+ 0xC043, 0x5042, 0xA042, 0x3043, 0x0041, 0x9040, 0x6040, 0xF041 },
+
+ { 0x0000, 0xC051, 0xC0A1, 0x00F0, 0xC141, 0x0110, 0x01E0, 0xC1B1,
+ 0xC281, 0x02D0, 0x0220, 0xC271, 0x03C0, 0xC391, 0xC361, 0x0330,
+ 0xC501, 0x0550, 0x05A0, 0xC5F1, 0x0440, 0xC411, 0xC4E1, 0x04B0,
+ 0x0780, 0xC7D1, 0xC721, 0x0770, 0xC6C1, 0x0690, 0x0660, 0xC631,
+ 0xCA01, 0x0A50, 0x0AA0, 0xCAF1, 0x0B40, 0xCB11, 0xCBE1, 0x0BB0,
+ 0x0880, 0xC8D1, 0xC821, 0x0870, 0xC9C1, 0x0990, 0x0960, 0xC931,
+ 0x0F00, 0xCF51, 0xCFA1, 0x0FF0, 0xCE41, 0x0E10, 0x0EE0, 0xCEB1,
+ 0xCD81, 0x0DD0, 0x0D20, 0xCD71, 0x0CC0, 0xCC91, 0xCC61, 0x0C30,
+ 0xD401, 0x1450, 0x14A0, 0xD4F1, 0x1540, 0xD511, 0xD5E1, 0x15B0,
+ 0x1680, 0xD6D1, 0xD621, 0x1670, 0xD7C1, 0x1790, 0x1760, 0xD731,
+ 0x1100, 0xD151, 0xD1A1, 0x11F0, 0xD041, 0x1010, 0x10E0, 0xD0B1,
+ 0xD381, 0x13D0, 0x1320, 0xD371, 0x12C0, 0xD291, 0xD261, 0x1230,
+ 0x1E00, 0xDE51, 0xDEA1, 0x1EF0, 0xDF41, 0x1F10, 0x1FE0, 0xDFB1,
+ 0xDC81, 0x1CD0, 0x1C20, 0xDC71, 0x1DC0, 0xDD91, 0xDD61, 0x1D30,
+ 0xDB01, 0x1B50, 0x1BA0, 0xDBF1, 0x1A40, 0xDA11, 0xDAE1, 0x1AB0,
+ 0x1980, 0xD9D1, 0xD921, 0x1970, 0xD8C1, 0x1890, 0x1860, 0xD831,
+ 0xE801, 0x2850, 0x28A0, 0xE8F1, 0x2940, 0xE911, 0xE9E1, 0x29B0,
+ 0x2A80, 0xEAD1, 0xEA21, 0x2A70, 0xEBC1, 0x2B90, 0x2B60, 0xEB31,
+ 0x2D00, 0xED51, 0xEDA1, 0x2DF0, 0xEC41, 0x2C10, 0x2CE0, 0xECB1,
+ 0xEF81, 0x2FD0, 0x2F20, 0xEF71, 0x2EC0, 0xEE91, 0xEE61, 0x2E30,
+ 0x2200, 0xE251, 0xE2A1, 0x22F0, 0xE341, 0x2310, 0x23E0, 0xE3B1,
+ 0xE081, 0x20D0, 0x2020, 0xE071, 0x21C0, 0xE191, 0xE161, 0x2130,
+ 0xE701, 0x2750, 0x27A0, 0xE7F1, 0x2640, 0xE611, 0xE6E1, 0x26B0,
+ 0x2580, 0xE5D1, 0xE521, 0x2570, 0xE4C1, 0x2490, 0x2460, 0xE431,
+ 0x3C00, 0xFC51, 0xFCA1, 0x3CF0, 0xFD41, 0x3D10, 0x3DE0, 0xFDB1,
+ 0xFE81, 0x3ED0, 0x3E20, 0xFE71, 0x3FC0, 0xFF91, 0xFF61, 0x3F30,
+ 0xF901, 0x3950, 0x39A0, 0xF9F1, 0x3840, 0xF811, 0xF8E1, 0x38B0,
+ 0x3B80, 0xFBD1, 0xFB21, 0x3B70, 0xFAC1, 0x3A90, 0x3A60, 0xFA31,
+ 0xF601, 0x3650, 0x36A0, 0xF6F1, 0x3740, 0xF711, 0xF7E1, 0x37B0,
+ 0x3480, 0xF4D1, 0xF421, 0x3470, 0xF5C1, 0x3590, 0x3560, 0xF531,
+ 0x3300, 0xF351, 0xF3A1, 0x33F0, 0xF241, 0x3210, 0x32E0, 0xF2B1,
+ 0xF181, 0x31D0, 0x3120, 0xF171, 0x30C0, 0xF091, 0xF061, 0x3030 },
+
+ { 0x0000, 0xFC01, 0xB801, 0x4400, 0x3001, 0xCC00, 0x8800, 0x7401,
+ 0x6002, 0x9C03, 0xD803, 0x2402, 0x5003, 0xAC02, 0xE802, 0x1403,
+ 0xC004, 0x3C05, 0x7805, 0x8404, 0xF005, 0x0C04, 0x4804, 0xB405,
+ 0xA006, 0x5C07, 0x1807, 0xE406, 0x9007, 0x6C06, 0x2806, 0xD407,
+ 0xC00B, 0x3C0A, 0x780A, 0x840B, 0xF00A, 0x0C0B, 0x480B, 0xB40A,
+ 0xA009, 0x5C08, 0x1808, 0xE409, 0x9008, 0x6C09, 0x2809, 0xD408,
+ 0x000F, 0xFC0E, 0xB80E, 0x440F, 0x300E, 0xCC0F, 0x880F, 0x740E,
+ 0x600D, 0x9C0C, 0xD80C, 0x240D, 0x500C, 0xAC0D, 0xE80D, 0x140C,
+ 0xC015, 0x3C14, 0x7814, 0x8415, 0xF014, 0x0C15, 0x4815, 0xB414,
+ 0xA017, 0x5C16, 0x1816, 0xE417, 0x9016, 0x6C17, 0x2817, 0xD416,
+ 0x0011, 0xFC10, 0xB810, 0x4411, 0x3010, 0xCC11, 0x8811, 0x7410,
+ 0x6013, 0x9C12, 0xD812, 0x2413, 0x5012, 0xAC13, 0xE813, 0x1412,
+ 0x001E, 0xFC1F, 0xB81F, 0x441E, 0x301F, 0xCC1E, 0x881E, 0x741F,
+ 0x601C, 0x9C1D, 0xD81D, 0x241C, 0x501D, 0xAC1C, 0xE81C, 0x141D,
+ 0xC01A, 0x3C1B, 0x781B, 0x841A, 0xF01B, 0x0C1A, 0x481A, 0xB41B,
+ 0xA018, 0x5C19, 0x1819, 0xE418, 0x9019, 0x6C18, 0x2818, 0xD419,
+ 0xC029, 0x3C28, 0x7828, 0x8429, 0xF028, 0x0C29, 0x4829, 0xB428,
+ 0xA02B, 0x5C2A, 0x182A, 0xE42B, 0x902A, 0x6C2B, 0x282B, 0xD42A,
+ 0x002D, 0xFC2C, 0xB82C, 0x442D, 0x302C, 0xCC2D, 0x882D, 0x742C,
+ 0x602F, 0x9C2E, 0xD82E, 0x242F, 0x502E, 0xAC2F, 0xE82F, 0x142E,
+ 0x0022, 0xFC23, 0xB823, 0x4422, 0x3023, 0xCC22, 0x8822, 0x7423,
+ 0x6020, 0x9C21, 0xD821, 0x2420, 0x5021, 0xAC20, 0xE820, 0x1421,
+ 0xC026, 0x3C27, 0x7827, 0x8426, 0xF027, 0x0C26, 0x4826, 0xB427,
+ 0xA024, 0x5C25, 0x1825, 0xE424, 0x9025, 0x6C24, 0x2824, 0xD425,
+ 0x003C, 0xFC3D, 0xB83D, 0x443C, 0x303D, 0xCC3C, 0x883C, 0x743D,
+ 0x603E, 0x9C3F, 0xD83F, 0x243E, 0x503F, 0xAC3E, 0xE83E, 0x143F,
+ 0xC038, 0x3C39, 0x7839, 0x8438, 0xF039, 0x0C38, 0x4838, 0xB439,
+ 0xA03A, 0x5C3B, 0x183B, 0xE43A, 0x903B, 0x6C3A, 0x283A, 0xD43B,
+ 0xC037, 0x3C36, 0x7836, 0x8437, 0xF036, 0x0C37, 0x4837, 0xB436,
+ 0xA035, 0x5C34, 0x1834, 0xE435, 0x9034, 0x6C35, 0x2835, 0xD434,
+ 0x0033, 0xFC32, 0xB832, 0x4433, 0x3032, 0xCC33, 0x8833, 0x7432,
+ 0x6031, 0x9C30, 0xD830, 0x2431, 0x5030, 0xAC31, 0xE831, 0x1430 },
+
+ { 0x0000, 0xC03D, 0xC079, 0x0044, 0xC0F1, 0x00CC, 0x0088, 0xC0B5,
+ 0xC1E1, 0x01DC, 0x0198, 0xC1A5, 0x0110, 0xC12D, 0xC169, 0x0154,
+ 0xC3C1, 0x03FC, 0x03B8, 0xC385, 0x0330, 0xC30D, 0xC349, 0x0374,
+ 0x0220, 0xC21D, 0xC259, 0x0264, 0xC2D1, 0x02EC, 0x02A8, 0xC295,
+ 0xC781, 0x07BC, 0x07F8, 0xC7C5, 0x0770, 0xC74D, 0xC709, 0x0734,
+ 0x0660, 0xC65D, 0xC619, 0x0624, 0xC691, 0x06AC, 0x06E8, 0xC6D5,
+ 0x0440, 0xC47D, 0xC439, 0x0404, 0xC4B1, 0x048C, 0x04C8, 0xC4F5,
+ 0xC5A1, 0x059C, 0x05D8, 0xC5E5, 0x0550, 0xC56D, 0xC529, 0x0514,
+ 0xCF01, 0x0F3C, 0x0F78, 0xCF45, 0x0FF0, 0xCFCD, 0xCF89, 0x0FB4,
+ 0x0EE0, 0xCEDD, 0xCE99, 0x0EA4, 0xCE11, 0x0E2C, 0x0E68, 0xCE55,
+ 0x0CC0, 0xCCFD, 0xCCB9, 0x0C84, 0xCC31, 0x0C0C, 0x0C48, 0xCC75,
+ 0xCD21, 0x0D1C, 0x0D58, 0xCD65, 0x0DD0, 0xCDED, 0xCDA9, 0x0D94,
+ 0x0880, 0xC8BD, 0xC8F9, 0x08C4, 0xC871, 0x084C, 0x0808, 0xC835,
+ 0xC961, 0x095C, 0x0918, 0xC925, 0x0990, 0xC9AD, 0xC9E9, 0x09D4,
+ 0xCB41, 0x0B7C, 0x0B38, 0xCB05, 0x0BB0, 0xCB8D, 0xCBC9, 0x0BF4,
+ 0x0AA0, 0xCA9D, 0xCAD9, 0x0AE4, 0xCA51, 0x0A6C, 0x0A28, 0xCA15,
+ 0xDE01, 0x1E3C, 0x1E78, 0xDE45, 0x1EF0, 0xDECD, 0xDE89, 0x1EB4,
+ 0x1FE0, 0xDFDD, 0xDF99, 0x1FA4, 0xDF11, 0x1F2C, 0x1F68, 0xDF55,
+ 0x1DC0, 0xDDFD, 0xDDB9, 0x1D84, 0xDD31, 0x1D0C, 0x1D48, 0xDD75,
+ 0xDC21, 0x1C1C, 0x1C58, 0xDC65, 0x1CD0, 0xDCED, 0xDCA9, 0x1C94,
+ 0x1980, 0xD9BD, 0xD9F9, 0x19C4, 0xD971, 0x194C, 0x1908, 0xD935,
+ 0xD861, 0x185C, 0x1818, 0xD825, 0x1890, 0xD8AD, 0xD8E9, 0x18D4,
+ 0xDA41, 0x1A7C, 0x1A38, 0xDA05, 0x1AB0, 0xDA8D, 0xDAC9, 0x1AF4,
+ 0x1BA0, 0xDB9D, 0xDBD9, 0x1BE4, 0xDB51, 0x1B6C, 0x1B28, 0xDB15,
+ 0x1100, 0xD13D, 0xD179, 0x1144, 0xD1F1, 0x11CC, 0x1188, 0xD1B5,
+ 0xD0E1, 0x10DC, 0x1098, 0xD0A5, 0x1010, 0xD02D, 0xD069, 0x1054,
+ 0xD2C1, 0x12FC, 0x12B8, 0xD285, 0x1230, 0xD20D, 0xD249, 0x1274,
+ 0x1320, 0xD31D, 0xD359, 0x1364, 0xD3D1, 0x13EC, 0x13A8, 0xD395,
+ 0xD681, 0x16BC, 0x16F8, 0xD6C5, 0x1670, 0xD64D, 0xD609, 0x1634,
+ 0x1760, 0xD75D, 0xD719, 0x1724, 0xD791, 0x17AC, 0x17E8, 0xD7D5,
+ 0x1540, 0xD57D, 0xD539, 0x1504, 0xD5B1, 0x158C, 0x15C8, 0xD5F5,
+ 0xD4A1, 0x149C, 0x14D8, 0xD4E5, 0x1450, 0xD46D, 0xD429, 0x1414 },
+
+ { 0x0000, 0xD101, 0xE201, 0x3300, 0x8401, 0x5500, 0x6600, 0xB701,
+ 0x4801, 0x9900, 0xAA00, 0x7B01, 0xCC00, 0x1D01, 0x2E01, 0xFF00,
+ 0x9002, 0x4103, 0x7203, 0xA302, 0x1403, 0xC502, 0xF602, 0x2703,
+ 0xD803, 0x0902, 0x3A02, 0xEB03, 0x5C02, 0x8D03, 0xBE03, 0x6F02,
+ 0x6007, 0xB106, 0x8206, 0x5307, 0xE406, 0x3507, 0x0607, 0xD706,
+ 0x2806, 0xF907, 0xCA07, 0x1B06, 0xAC07, 0x7D06, 0x4E06, 0x9F07,
+ 0xF005, 0x2104, 0x1204, 0xC305, 0x7404, 0xA505, 0x9605, 0x4704,
+ 0xB804, 0x6905, 0x5A05, 0x8B04, 0x3C05, 0xED04, 0xDE04, 0x0F05,
+ 0xC00E, 0x110F, 0x220F, 0xF30E, 0x440F, 0x950E, 0xA60E, 0x770F,
+ 0x880F, 0x590E, 0x6A0E, 0xBB0F, 0x0C0E, 0xDD0F, 0xEE0F, 0x3F0E,
+ 0x500C, 0x810D, 0xB20D, 0x630C, 0xD40D, 0x050C, 0x360C, 0xE70D,
+ 0x180D, 0xC90C, 0xFA0C, 0x2B0D, 0x9C0C, 0x4D0D, 0x7E0D, 0xAF0C,
+ 0xA009, 0x7108, 0x4208, 0x9309, 0x2408, 0xF509, 0xC609, 0x1708,
+ 0xE808, 0x3909, 0x0A09, 0xDB08, 0x6C09, 0xBD08, 0x8E08, 0x5F09,
+ 0x300B, 0xE10A, 0xD20A, 0x030B, 0xB40A, 0x650B, 0x560B, 0x870A,
+ 0x780A, 0xA90B, 0x9A0B, 0x4B0A, 0xFC0B, 0x2D0A, 0x1E0A, 0xCF0B,
+ 0xC01F, 0x111E, 0x221E, 0xF31F, 0x441E, 0x951F, 0xA61F, 0x771E,
+ 0x881E, 0x591F, 0x6A1F, 0xBB1E, 0x0C1F, 0xDD1E, 0xEE1E, 0x3F1F,
+ 0x501D, 0x811C, 0xB21C, 0x631D, 0xD41C, 0x051D, 0x361D, 0xE71C,
+ 0x181C, 0xC91D, 0xFA1D, 0x2B1C, 0x9C1D, 0x4D1C, 0x7E1C, 0xAF1D,
+ 0xA018, 0x7119, 0x4219, 0x9318, 0x2419, 0xF518, 0xC618, 0x1719,
+ 0xE819, 0x3918, 0x0A18, 0xDB19, 0x6C18, 0xBD19, 0x8E19, 0x5F18,
+ 0x301A, 0xE11B, 0xD21B, 0x031A, 0xB41B, 0x651A, 0x561A, 0x871B,
+ 0x781B, 0xA91A, 0x9A1A, 0x4B1B, 0xFC1A, 0x2D1B, 0x1E1B, 0xCF1A,
+ 0x0011, 0xD110, 0xE210, 0x3311, 0x8410, 0x5511, 0x6611, 0xB710,
+ 0x4810, 0x9911, 0xAA11, 0x7B10, 0xCC11, 0x1D10, 0x2E10, 0xFF11,
+ 0x9013, 0x4112, 0x7212, 0xA313, 0x1412, 0xC513, 0xF613, 0x2712,
+ 0xD812, 0x0913, 0x3A13, 0xEB12, 0x5C13, 0x8D12, 0xBE12, 0x6F13,
+ 0x6016, 0xB117, 0x8217, 0x5316, 0xE417, 0x3516, 0x0616, 0xD717,
+ 0x2817, 0xF916, 0xCA16, 0x1B17, 0xAC16, 0x7D17, 0x4E17, 0x9F16,
+ 0xF014, 0x2115, 0x1215, 0xC314, 0x7415, 0xA514, 0x9614, 0x4715,
+ 0xB815, 0x6914, 0x5A14, 0x8B15, 0x3C14, 0xED15, 0xDE15, 0x0F14 },
+
+ { 0x0000, 0xC010, 0xC023, 0x0033, 0xC045, 0x0055, 0x0066, 0xC076,
+ 0xC089, 0x0099, 0x00AA, 0xC0BA, 0x00CC, 0xC0DC, 0xC0EF, 0x00FF,
+ 0xC111, 0x0101, 0x0132, 0xC122, 0x0154, 0xC144, 0xC177, 0x0167,
+ 0x0198, 0xC188, 0xC1BB, 0x01AB, 0xC1DD, 0x01CD, 0x01FE, 0xC1EE,
+ 0xC221, 0x0231, 0x0202, 0xC212, 0x0264, 0xC274, 0xC247, 0x0257,
+ 0x02A8, 0xC2B8, 0xC28B, 0x029B, 0xC2ED, 0x02FD, 0x02CE, 0xC2DE,
+ 0x0330, 0xC320, 0xC313, 0x0303, 0xC375, 0x0365, 0x0356, 0xC346,
+ 0xC3B9, 0x03A9, 0x039A, 0xC38A, 0x03FC, 0xC3EC, 0xC3DF, 0x03CF,
+ 0xC441, 0x0451, 0x0462, 0xC472, 0x0404, 0xC414, 0xC427, 0x0437,
+ 0x04C8, 0xC4D8, 0xC4EB, 0x04FB, 0xC48D, 0x049D, 0x04AE, 0xC4BE,
+ 0x0550, 0xC540, 0xC573, 0x0563, 0xC515, 0x0505, 0x0536, 0xC526,
+ 0xC5D9, 0x05C9, 0x05FA, 0xC5EA, 0x059C, 0xC58C, 0xC5BF, 0x05AF,
+ 0x0660, 0xC670, 0xC643, 0x0653, 0xC625, 0x0635, 0x0606, 0xC616,
+ 0xC6E9, 0x06F9, 0x06CA, 0xC6DA, 0x06AC, 0xC6BC, 0xC68F, 0x069F,
+ 0xC771, 0x0761, 0x0752, 0xC742, 0x0734, 0xC724, 0xC717, 0x0707,
+ 0x07F8, 0xC7E8, 0xC7DB, 0x07CB, 0xC7BD, 0x07AD, 0x079E, 0xC78E,
+ 0xC881, 0x0891, 0x08A2, 0xC8B2, 0x08C4, 0xC8D4, 0xC8E7, 0x08F7,
+ 0x0808, 0xC818, 0xC82B, 0x083B, 0xC84D, 0x085D, 0x086E, 0xC87E,
+ 0x0990, 0xC980, 0xC9B3, 0x09A3, 0xC9D5, 0x09C5, 0x09F6, 0xC9E6,
+ 0xC919, 0x0909, 0x093A, 0xC92A, 0x095C, 0xC94C, 0xC97F, 0x096F,
+ 0x0AA0, 0xCAB0, 0xCA83, 0x0A93, 0xCAE5, 0x0AF5, 0x0AC6, 0xCAD6,
+ 0xCA29, 0x0A39, 0x0A0A, 0xCA1A, 0x0A6C, 0xCA7C, 0xCA4F, 0x0A5F,
+ 0xCBB1, 0x0BA1, 0x0B92, 0xCB82, 0x0BF4, 0xCBE4, 0xCBD7, 0x0BC7,
+ 0x0B38, 0xCB28, 0xCB1B, 0x0B0B, 0xCB7D, 0x0B6D, 0x0B5E, 0xCB4E,
+ 0x0CC0, 0xCCD0, 0xCCE3, 0x0CF3, 0xCC85, 0x0C95, 0x0CA6, 0xCCB6,
+ 0xCC49, 0x0C59, 0x0C6A, 0xCC7A, 0x0C0C, 0xCC1C, 0xCC2F, 0x0C3F,
+ 0xCDD1, 0x0DC1, 0x0DF2, 0xCDE2, 0x0D94, 0xCD84, 0xCDB7, 0x0DA7,
+ 0x0D58, 0xCD48, 0xCD7B, 0x0D6B, 0xCD1D, 0x0D0D, 0x0D3E, 0xCD2E,
+ 0xCEE1, 0x0EF1, 0x0EC2, 0xCED2, 0x0EA4, 0xCEB4, 0xCE87, 0x0E97,
+ 0x0E68, 0xCE78, 0xCE4B, 0x0E5B, 0xCE2D, 0x0E3D, 0x0E0E, 0xCE1E,
+ 0x0FF0, 0xCFE0, 0xCFD3, 0x0FC3, 0xCFB5, 0x0FA5, 0x0F96, 0xCF86,
+ 0xCF79, 0x0F69, 0x0F5A, 0xCF4A, 0x0F3C, 0xCF2C, 0xCF1F, 0x0F0F },
+
+ { 0x0000, 0xCCC1, 0xD981, 0x1540, 0xF301, 0x3FC0, 0x2A80, 0xE641,
+ 0xA601, 0x6AC0, 0x7F80, 0xB341, 0x5500, 0x99C1, 0x8C81, 0x4040,
+ 0x0C01, 0xC0C0, 0xD580, 0x1941, 0xFF00, 0x33C1, 0x2681, 0xEA40,
+ 0xAA00, 0x66C1, 0x7381, 0xBF40, 0x5901, 0x95C0, 0x8080, 0x4C41,
+ 0x1802, 0xD4C3, 0xC183, 0x0D42, 0xEB03, 0x27C2, 0x3282, 0xFE43,
+ 0xBE03, 0x72C2, 0x6782, 0xAB43, 0x4D02, 0x81C3, 0x9483, 0x5842,
+ 0x1403, 0xD8C2, 0xCD82, 0x0143, 0xE702, 0x2BC3, 0x3E83, 0xF242,
+ 0xB202, 0x7EC3, 0x6B83, 0xA742, 0x4103, 0x8DC2, 0x9882, 0x5443,
+ 0x3004, 0xFCC5, 0xE985, 0x2544, 0xC305, 0x0FC4, 0x1A84, 0xD645,
+ 0x9605, 0x5AC4, 0x4F84, 0x8345, 0x6504, 0xA9C5, 0xBC85, 0x7044,
+ 0x3C05, 0xF0C4, 0xE584, 0x2945, 0xCF04, 0x03C5, 0x1685, 0xDA44,
+ 0x9A04, 0x56C5, 0x4385, 0x8F44, 0x6905, 0xA5C4, 0xB084, 0x7C45,
+ 0x2806, 0xE4C7, 0xF187, 0x3D46, 0xDB07, 0x17C6, 0x0286, 0xCE47,
+ 0x8E07, 0x42C6, 0x5786, 0x9B47, 0x7D06, 0xB1C7, 0xA487, 0x6846,
+ 0x2407, 0xE8C6, 0xFD86, 0x3147, 0xD706, 0x1BC7, 0x0E87, 0xC246,
+ 0x8206, 0x4EC7, 0x5B87, 0x9746, 0x7107, 0xBDC6, 0xA886, 0x6447,
+ 0x6008, 0xACC9, 0xB989, 0x7548, 0x9309, 0x5FC8, 0x4A88, 0x8649,
+ 0xC609, 0x0AC8, 0x1F88, 0xD349, 0x3508, 0xF9C9, 0xEC89, 0x2048,
+ 0x6C09, 0xA0C8, 0xB588, 0x7949, 0x9F08, 0x53C9, 0x4689, 0x8A48,
+ 0xCA08, 0x06C9, 0x1389, 0xDF48, 0x3909, 0xF5C8, 0xE088, 0x2C49,
+ 0x780A, 0xB4CB, 0xA18B, 0x6D4A, 0x8B0B, 0x47CA, 0x528A, 0x9E4B,
+ 0xDE0B, 0x12CA, 0x078A, 0xCB4B, 0x2D0A, 0xE1CB, 0xF48B, 0x384A,
+ 0x740B, 0xB8CA, 0xAD8A, 0x614B, 0x870A, 0x4BCB, 0x5E8B, 0x924A,
+ 0xD20A, 0x1ECB, 0x0B8B, 0xC74A, 0x210B, 0xEDCA, 0xF88A, 0x344B,
+ 0x500C, 0x9CCD, 0x898D, 0x454C, 0xA30D, 0x6FCC, 0x7A8C, 0xB64D,
+ 0xF60D, 0x3ACC, 0x2F8C, 0xE34D, 0x050C, 0xC9CD, 0xDC8D, 0x104C,
+ 0x5C0D, 0x90CC, 0x858C, 0x494D, 0xAF0C, 0x63CD, 0x768D, 0xBA4C,
+ 0xFA0C, 0x36CD, 0x238D, 0xEF4C, 0x090D, 0xC5CC, 0xD08C, 0x1C4D,
+ 0x480E, 0x84CF, 0x918F, 0x5D4E, 0xBB0F, 0x77CE, 0x628E, 0xAE4F,
+ 0xEE0F, 0x22CE, 0x378E, 0xFB4F, 0x1D0E, 0xD1CF, 0xC48F, 0x084E,
+ 0x440F, 0x88CE, 0x9D8E, 0x514F, 0xB70E, 0x7BCF, 0x6E8F, 0xA24E,
+ 0xE20E, 0x2ECF, 0x3B8F, 0xF74E, 0x110F, 0xDDCE, 0xC88E, 0x044F }
+};
+
+#if 0
+static uint16_t
+reflect_crc(uint16_t ref, char ch)
+{
+ int i;
+ uint16_t value;
+ value = 0;
+
+ for (i = 1; i < (ch + 1); ++i) {
+ if (ref & 1) value |= 1 << (ch - i);
+ ref >>= 1;
+ }
+ return value;
+}
+
+static void
+init_crc()
+{
+ int i, j;
+ uint16_t polynomial, crc;
+ polynomial = 0x8005;
+
+ for (i = 0; i <= 0xFF; ++i) {
+ crc = reflect_crc(i, 8) << 8;
+
+ for (j = 0; j < 8; ++j)
+ crc = (crc << 1) ^ (crc & (1 << 15) ? polynomial : 0);
+
+ crc16_lookup[0][i] = reflect_crc(crc, 16);
+ }
+
+ for (i = 0; i <= 0xFF; ++i)
+ for (j = 1; j < 8; ++j)
+ crc16_lookup[j][i] = crc16_lookup[0][crc16_lookup[j - 1][i] & 0xFF] ^ (crc16_lookup[j - 1][i] >> 8);
+}
+#endif
--- lame-3.100/libmp3lame/fft.c.orig 2017-09-07 04:33:36.000000000 +0900
+++ lame-3.100/libmp3lame/fft.c 2017-10-14 12:03:44.000000000 +0900
@@ -331,7 +331,7 @@ init_fft(lame_internal_flags * const gfc
}
#else
#ifdef HAVE_XMMINTRIN_H
-#ifdef MIN_ARCH_SSE
+#if defined(MIN_ARCH_SSE) || defined(__x86_64__)
gfc->fft_fht = fht_SSE2;
#endif
#endif
--- lame-3.100/libmp3lame/gain_analysis.c.orig 2017-10-11 04:08:39.000000000 +0900
+++ lame-3.100/libmp3lame/gain_analysis.c 2017-10-14 12:06:19.000000000 +0900
@@ -95,6 +95,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
#include "lame.h"
#include "machine.h"
@@ -109,6 +112,67 @@
/*lint -save -e736 loss of precision */
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+static const Float_t ABYule[9][2 * YULE_ORDER + 1 + 3] __attribute__ ((aligned (16))) = {
+ {0.03857599435200, -3.84664617118067, -0.02160367184185, 7.81501653005538, -0.00123395316851,
+ -11.34170355132042, -0.00009291677959, 13.05504219327545, -0.01655260341619,
+ -12.28759895145294, 0.02161526843274, 9.48293806319790, -0.02074045215285, -5.87257861775999,
+ 0.00594298065125, 2.75465861874613, 0.00306428023191, -0.86984376593551, 0.00012025322027,
+ 0.13919314567432, 0.00288463683916, 0.0, 0.0, 0.0},
+ {0.05418656406430, -3.47845948550071, -0.02911007808948, 6.36317777566148, -0.00848709379851,
+ -8.54751527471874, -0.00851165645469, 9.47693607801280, -0.00834990904936, -8.81498681370155,
+ 0.02245293253339, 6.85401540936998, -0.02596338512915, -4.39470996079559, 0.01624864962975,
+ 2.19611684890774, -0.00240879051584, -0.75104302451432, 0.00674613682247, 0.13149317958808,
+ -0.00187763777362, 0.0, 0.0, 0.0},
+ {0.15457299681924, -2.37898834973084, -0.09331049056315, 2.84868151156327, -0.06247880153653,
+ -2.64577170229825, 0.02163541888798, 2.23697657451713, -0.05588393329856, -1.67148153367602,
+ 0.04781476674921, 1.00595954808547, 0.00222312597743, -0.45953458054983, 0.03174092540049,
+ 0.16378164858596, -0.01390589421898, -0.05032077717131, 0.00651420667831, 0.02347897407020,
+ -0.00881362733839, 0.0, 0.0, 0.0},
+ {0.30296907319327, -1.61273165137247, -0.22613988682123, 1.07977492259970, -0.08587323730772,
+ -0.25656257754070, 0.03282930172664, -0.16276719120440, -0.00915702933434, -0.22638893773906,
+ -0.02364141202522, 0.39120800788284, -0.00584456039913, -0.22138138954925, 0.06276101321749,
+ 0.04500235387352, -0.00000828086748, 0.02005851806501, 0.00205861885564, 0.00302439095741,
+ -0.02950134983287, 0.0, 0.0, 0.0},
+ {0.33642304856132, -1.49858979367799, -0.25572241425570, 0.87350271418188, -0.11828570177555,
+ 0.12205022308084, 0.11921148675203, -0.80774944671438, -0.07834489609479, 0.47854794562326,
+ -0.00469977914380, -0.12453458140019, -0.00589500224440, -0.04067510197014, 0.05724228140351,
+ 0.08333755284107, 0.00832043980773, -0.04237348025746, -0.01635381384540, 0.02977207319925,
+ -0.01760176568150, 0.0, 0.0, 0.0},
+ {0.44915256608450, -0.62820619233671, -0.14351757464547, 0.29661783706366, -0.22784394429749,
+ -0.37256372942400, -0.01419140100551, 0.00213767857124, 0.04078262797139, -0.42029820170918,
+ -0.12398163381748, 0.22199650564824, 0.04097565135648, 0.00613424350682, 0.10478503600251,
+ 0.06747620744683, -0.01863887810927, 0.05784820375801, -0.03193428438915, 0.03222754072173,
+ 0.00541907748707, 0.0, 0.0, 0.0},
+ {0.56619470757641, -1.04800335126349, -0.75464456939302, 0.29156311971249, 0.16242137742230,
+ -0.26806001042947, 0.16744243493672, 0.00819999645858, -0.18901604199609, 0.45054734505008,
+ 0.30931782841830, -0.33032403314006, -0.27562961986224, 0.06739368333110, 0.00647310677246,
+ -0.04784254229033, 0.08647503780351, 0.01639907836189, -0.03788984554840, 0.01807364323573,
+ -0.00588215443421, 0.0, 0.0, 0.0},
+ {0.58100494960553, -0.51035327095184, -0.53174909058578, -0.31863563325245, -0.14289799034253,
+ -0.20256413484477, 0.17520704835522, 0.14728154134330, 0.02377945217615, 0.38952639978999,
+ 0.15558449135573, -0.23313271880868, -0.25344790059353, -0.05246019024463, 0.01628462406333,
+ -0.02505961724053, 0.06920467763959, 0.02442357316099, -0.03721611395801, 0.01818801111503,
+ -0.00749618797172, 0.0, 0.0, 0.0},
+ {0.53648789255105, -0.25049871956020, -0.42163034350696, -0.43193942311114, -0.00275953611929,
+ -0.03424681017675, 0.04267842219415, -0.04678328784242, -0.10214864179676, 0.26408300200955,
+ 0.14590772289388, 0.15113130533216, -0.02459864859345, -0.17556493366449, -0.11202315195388,
+ -0.18823009262115, -0.04060034127000, 0.05477720428674, 0.04788665548180, 0.04704409688120,
+ -0.02217936801134, 0.0, 0.0, 0.0}
+};
+
+static const Float_t ABButter[9][2 * BUTTER_ORDER + 1 + 3] __attribute__ ((aligned (16))) = {
+ {0.98621192462708, -1.97223372919527, -1.97242384925416, 0.97261396931306, 0.98621192462708, 0.0, 0.0, 0.0},
+ {0.98500175787242, -1.96977855582618, -1.97000351574484, 0.97022847566350, 0.98500175787242, 0.0, 0.0, 0.0},
+ {0.97938932735214, -1.95835380975398, -1.95877865470428, 0.95920349965459, 0.97938932735214, 0.0, 0.0, 0.0},
+ {0.97531843204928, -1.95002759149878, -1.95063686409857, 0.95124613669835, 0.97531843204928, 0.0, 0.0, 0.0},
+ {0.97316523498161, -1.94561023566527, -1.94633046996323, 0.94705070426118, 0.97316523498161, 0.0, 0.0, 0.0},
+ {0.96454515552826, -1.92783286977036, -1.92909031105652, 0.93034775234268, 0.96454515552826, 0.0, 0.0, 0.0},
+ {0.96009142950541, -1.91858953033784, -1.92018285901082, 0.92177618768381, 0.96009142950541, 0.0, 0.0, 0.0},
+ {0.95856916599601, -1.91542108074780, -1.91713833199203, 0.91885558323625, 0.95856916599601, 0.0, 0.0, 0.0},
+ {0.94597685600279, -1.88903307939452, -1.89195371200558, 0.89487434461664, 0.94597685600279, 0.0, 0.0, 0.0}
+};
+#else
static const Float_t ABYule[9][multiple_of(4, 2 * YULE_ORDER + 1)] = {
/* 20 18 16 14 12 10 8 6 4 2 0 19 17 15 13 11 9 7 5 3 1 */
{ 0.00288463683916, 0.00012025322027, 0.00306428023191, 0.00594298065125, -0.02074045215285, 0.02161526843274, -0.01655260341619, -0.00009291677959, -0.00123395316851, -0.02160367184185, 0.03857599435200, 0.13919314567432, -0.86984376593551, 2.75465861874613, -5.87257861775999, 9.48293806319790,-12.28759895145294, 13.05504219327545,-11.34170355132042, 7.81501653005538, -3.84664617118067},
@@ -133,7 +197,8 @@ static const Float_t ABButter[9][multipl
{0.96009142950541, 0.92177618768381, -1.92018285901082, -1.91858953033784, 0.96009142950541},
{0.95856916599601, 0.91885558323625, -1.91713833199203, -1.91542108074780, 0.95856916599601},
{0.94597685600279, 0.89487434461664, -1.89195371200558, -1.88903307939452, 0.94597685600279}
-};
+ };
+#endif
/*lint -restore */
@@ -143,6 +208,128 @@ static const Float_t ABButter[9][multipl
/* When calling this procedure, make sure that ip[-order] and op[-order] point to real data! */
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+static void
+filterYule(const Float_t * input, Float_t * output, size_t nSamples, const Float_t * const kernel)
+{
+ __m128 v1, v2, v3, v4, v5, v6, v7, v8;
+ __asm__ __volatile__ (
+ "movups -12(%8), %0 \n\t"
+ "movups -28(%8), %1 \n\t"
+ "movlps -36(%8), %2 \n\t"
+ "movups -16(%9), %3 \n\t"
+ "movups -32(%9), %4 \n\t"
+ "movlps -40(%9), %5 \n\t"
+ "movaps %0, %6 \n\t"
+ "movaps %1, %7 \n\t"
+ "unpckhps %3, %0 \n\t"
+ "unpckhps %4, %1 \n\t"
+ "shufps $0x4e, %0, %0 \n\t"
+ "shufps $0x4e, %1, %1 \n\t"
+ "unpcklps %3, %6 \n\t"
+ "unpcklps %4, %7 \n\t"
+ "shufps $0x4e, %6, %6 \n\t"
+ "shufps $0x4e, %7, %7 \n\t"
+ "unpcklps %5, %2 \n\t"
+ "shufps $0x4e, %2, %2 \n\t"
+ "movss -40(%8), %3 \n\t"
+ "jmp 2f \n\t"
+ "1: \n\t"
+ "movhlps %2, %3 \n\t"
+ "movaps %7, %5 \n\t"
+ "shufps $0x4e, %2, %5 \n\t"
+ "movaps %5, %2 \n\t"
+ "movaps %1, %5 \n\t"
+ "shufps $0x4e, %7, %5 \n\t"
+ "movaps %5, %7 \n\t"
+ "movaps %6, %5 \n\t"
+ "shufps $0x4e, %1, %5 \n\t"
+ "movaps %5, %1 \n\t"
+ "movaps %0, %5 \n\t"
+ "shufps $0x4e, %6, %5 \n\t"
+ "movaps %5, %6 \n\t"
+ "movss (%8), %5 \n\t"
+ "shufps $0x00, %5, %4 \n\t"
+ "shufps $0x42, %0, %4 \n\t"
+ "movaps %4, %0 \n\t"
+ "2: \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %6, %5 \n\t"
+ "mulps (%11), %4 \n\t"
+ "mulps 16(%11), %5 \n\t"
+ "addps %5, %4 \n\t"
+ "movaps %1, %5 \n\t"
+ "mulps 32(%11), %5 \n\t"
+ "addps %5, %4 \n\t"
+ "movaps %7, %5 \n\t"
+ "mulps 48(%11), %5 \n\t"
+ "addps %5, %4 \n\t"
+ "movaps %2, %5 \n\t"
+ "mulps 64(%11), %5 \n\t"
+ "addps %5, %4 \n\t"
+ "mulps 80(%11), %3 \n\t"
+ "addps %3, %4 \n\t"
+ "movhlps %4, %5 \n\t"
+ "addps %5, %4 \n\t"
+#if defined(__SSE3__)
+ "hsubps %4, %4 \n\t"
+#else
+ "movaps %4, %5 \n\t"
+ "shufps $0x01, %5, %5 \n\t"
+ "subps %5, %4 \n\t"
+#endif
+ "movss %4, (%9) \n\t"
+ "add $4, %8 \n\t"
+ "add $4, %9 \n\t"
+ "dec %10 \n\t"
+ "jnz 1b \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6), "=x" (v7), "=x" (v8),
+ "+r" (input), "+r" (output), "+r" (nSamples)
+ : "r" (kernel)
+ );
+}
+
+static void
+filterButter(const Float_t * input, Float_t * output, size_t nSamples, const Float_t * const kernel)
+{
+ __m128 v1, v2, v3, v4, v5;
+ __asm__ __volatile__ (
+ "movlps -4(%5), %0 \n\t"
+ "movlps -8(%6), %2 \n\t"
+ "unpcklps %2, %0 \n\t"
+ "shufps $0x4e, %0, %0 \n\t"
+ "movss -8(%5), %4 \n\t"
+ "movaps %0, %1 \n\t"
+ "jmp 2f \n\t"
+ "1: \n\t"
+ "movhlps %0, %4 \n\t"
+ "movss (%5), %2 \n\t"
+ "shufps $0x00, %2, %1 \n\t"
+ "shufps $0x42, %0, %1 \n\t"
+ "movaps %1, %0 \n\t"
+ "2: \n\t"
+ "mulps (%8), %1 \n\t"
+ "mulps 16(%8), %4 \n\t"
+ "addps %4, %1 \n\t"
+ "movhlps %1, %2 \n\t"
+ "addps %2, %1 \n\t"
+#if defined(__SSE3__)
+ "hsubps %1, %1 \n\t"
+#else
+ "movaps %1, %2 \n\t"
+ "shufps $0x01, %2, %2 \n\t"
+ "subps %2, %1 \n\t"
+#endif
+ "movss %1, (%6) \n\t"
+ "add $4, %5 \n\t"
+ "add $4, %6 \n\t"
+ "dec %7 \n\t"
+ "jnz 1b \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "+r" (input), "+r" (output), "+r" (nSamples)
+ : "r" (kernel)
+ );
+}
+#else
static void
filterYule(const Float_t * input, Float_t * output, size_t nSamples, const Float_t * const kernel)
{
@@ -188,6 +375,7 @@ filterButter(const Float_t * input, Floa
++input;
}
}
+#endif
--- lame-3.100/libmp3lame/l3side.h.orig 2012-02-07 22:36:35.000000000 +0900
+++ lame-3.100/libmp3lame/l3side.h 2017-10-14 12:03:44.000000000 +0900
@@ -46,7 +46,7 @@ typedef struct {
typedef struct {
FLOAT xr[576];
- int l3_enc[576];
+ int l3_enc[576] __attribute__ ((aligned (16)));
int scalefac[SFBMAX];
FLOAT xrpow_max;
@@ -84,7 +84,7 @@ typedef struct {
} gr_info;
typedef struct {
- gr_info tt[2][2];
+ gr_info tt[2][2] __attribute__ ((aligned (16)));
int main_data_begin;
int private_bits;
int resvDrain_pre;
--- lame-3.100/libmp3lame/lame.c.orig 2017-10-11 04:08:39.000000000 +0900
+++ lame-3.100/libmp3lame/lame.c 2017-10-14 12:03:44.000000000 +0900
@@ -2364,7 +2364,7 @@ lame_init_internal_flags(lame_internal_f
gfc->ov_rpg.noclipGainChange = 0;
gfc->ov_rpg.noclipScale = -1.0;
- gfc->ATH = lame_calloc(ATH_t, 1);
+ gfc->ATH = calloc_aligned16(1, sizeof(ATH_t));
if (NULL == gfc->ATH)
return -2; /* maybe error codes should be enumerated in lame.h ?? */
@@ -2455,7 +2455,7 @@ lame_init_old(lame_global_flags * gfp)
gfp->report.errorf = &lame_report_def;
gfp->report.msgf = &lame_report_def;
- gfp->internal_flags = lame_calloc(lame_internal_flags, 1);
+ gfp->internal_flags = calloc_aligned16(1, sizeof(lame_internal_flags));
if (lame_init_internal_flags(gfp->internal_flags) < 0) {
freegfc(gfp->internal_flags);
--- lame-3.100/libmp3lame/newmdct.c.orig 2011-05-08 01:05:17.000000000 +0900
+++ lame-3.100/libmp3lame/newmdct.c 2017-10-14 12:03:44.000000000 +0900
@@ -36,10 +36,13 @@
#include "util.h"
#include "newmdct.h"
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
#ifndef USE_GOGO_SUBBAND
-static const FLOAT enwindow[] = {
+static const FLOAT enwindow[] __attribute__ ((aligned (16))) = {
-4.77e-07 * 0.740951125354959 / 2.384e-06, 1.03951e-04 * 0.740951125354959 / 2.384e-06,
9.53674e-04 * 0.740951125354959 / 2.384e-06, 2.841473e-03 * 0.740951125354959 / 2.384e-06,
3.5758972e-02 * 0.740951125354959 / 2.384e-06, 3.401756e-03 * 0.740951125354959 / 2.384e-06, 9.83715e-04 * 0.740951125354959 / 2.384e-06, 9.9182e-05 * 0.740951125354959 / 2.384e-06, /* 15 */
@@ -435,6 +438,241 @@ window_subband(const sample_t * x1, FLOA
const sample_t *x2 = &x1[238 - 14 - 286];
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6, v7, v8;
+ i=4;
+ __asm__ __volatile__ (
+ "1: \n\t"
+ "movaps -40(%12), %0 \n\t"
+ "movups 32(%12), %1 \n\t"
+ "movaps 104(%12), %2 \n\t"
+ "movups 176(%12), %3 \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %2, %5 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpcklps %3, %2 \n\t"
+ "unpckhps %1, %4 \n\t"
+ "unpckhps %3, %5 \n\t"
+ "movaps %0, %1 \n\t"
+ "movlhps %2, %0 \n\t"
+ "movhlps %1, %2 \n\t"
+ "movaps %4, %1 \n\t"
+ "movlhps %5, %1 \n\t"
+ "movhlps %4, %5 \n\t"
+ "movaps %5, %3 \n\t"
+ "movups 884(%9), %6 \n\t"
+ "movups -896(%10), %7 \n\t"
+ "shufps $0x1b, %6, %6 \n\t"
+ "mulps %0, %6 \n\t"
+ "mulps %0, %7 \n\t"
+ "movups 628(%9), %4 \n\t"
+ "movups -640(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %2, %4 \n\t"
+ "mulps %2, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+ "movups 372(%9), %4 \n\t"
+ "movups -384(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %1, %4 \n\t"
+ "mulps %1, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+ "movups 116(%9), %4 \n\t"
+ "movups -128(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %3, %4 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+
+ "movaps -24(%12), %0 \n\t"
+ "movups 48(%12), %1 \n\t"
+ "movaps 120(%12), %2 \n\t"
+ "movups 192(%12), %3 \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %2, %5 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpcklps %3, %2 \n\t"
+ "unpckhps %1, %4 \n\t"
+ "unpckhps %3, %5 \n\t"
+ "movaps %0, %1 \n\t"
+ "movlhps %2, %0 \n\t"
+ "movhlps %1, %2 \n\t"
+ "movaps %4, %1 \n\t"
+ "movlhps %5, %1 \n\t"
+ "movhlps %4, %5 \n\t"
+ "movaps %5, %3 \n\t"
+ "movups -140(%9), %4 \n\t"
+ "movups 128(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %0, %4 \n\t"
+ "mulps %0, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+ "movups -396(%9), %4 \n\t"
+ "movups 384(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %2, %4 \n\t"
+ "mulps %2, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+ "movups -652(%9), %4 \n\t"
+ "movups 640(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %1, %4 \n\t"
+ "mulps %1, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+ "movups -908(%9), %4 \n\t"
+ "movups 896(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %3, %4 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %4, %6 \n\t"
+ "addps %5, %7 \n\t"
+
+ "movaps -8(%12), %0 \n\t"
+ "movups 64(%12), %1 \n\t"
+ "movaps 136(%12), %2 \n\t"
+ "movups 208(%12), %3 \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %2, %5 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpcklps %3, %2 \n\t"
+ "unpckhps %1, %4 \n\t"
+ "unpckhps %3, %5 \n\t"
+ "movaps %0, %1 \n\t"
+ "movlhps %2, %0 \n\t"
+ "movhlps %1, %2 \n\t"
+ "movaps %4, %1 \n\t"
+ "movlhps %5, %1 \n\t"
+ "movhlps %4, %5 \n\t"
+ "movaps %5, %3 \n\t"
+ "movups -1036(%9), %4 \n\t"
+ "movups 1024(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %0, %4 \n\t"
+ "mulps %0, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups -780(%9), %4 \n\t"
+ "movups 768(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %2, %4 \n\t"
+ "mulps %2, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups -524(%9), %4 \n\t"
+ "movups 512(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %1, %4 \n\t"
+ "mulps %1, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups -268(%9), %4 \n\t"
+ "movups 256(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %3, %4 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+
+ "movaps 8(%12), %0 \n\t"
+ "movups 80(%12), %1 \n\t"
+ "movaps 152(%12), %2 \n\t"
+ "movups 224(%12), %3 \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %2, %5 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpcklps %3, %2 \n\t"
+ "unpckhps %1, %4 \n\t"
+ "unpckhps %3, %5 \n\t"
+ "movaps %0, %1 \n\t"
+ "movlhps %2, %0 \n\t"
+ "movhlps %1, %2 \n\t"
+ "movaps %4, %1 \n\t"
+ "movlhps %5, %1 \n\t"
+ "movhlps %4, %5 \n\t"
+ "movaps %5, %3 \n\t"
+ "movups -12(%9), %4 \n\t"
+ "movups (%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %0, %4 \n\t"
+ "mulps %0, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups 244(%9), %4 \n\t"
+ "movups -256(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %2, %4 \n\t"
+ "mulps %2, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups 500(%9), %4 \n\t"
+ "movups -512(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %1, %4 \n\t"
+ "mulps %1, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+ "movups 756(%9), %4 \n\t"
+ "movups -768(%10), %5 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "mulps %3, %4 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %4, %7 \n\t"
+ "subps %5, %6 \n\t"
+
+ "movlps 24(%12), %0 \n\t"
+ "movlps 96(%12), %1 \n\t"
+ "movlps 168(%12), %2 \n\t"
+ "movlps 240(%12), %3 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpcklps %3, %2 \n\t"
+ "movaps %0, %1 \n\t"
+ "movlhps %2, %0 \n\t"
+ "movhlps %1, %2 \n\t"
+ "mulps %0, %7 \n\t"
+ "movaps %6, %4 \n\t"
+ "subps %7, %4 \n\t"
+ "addps %7, %6 \n\t"
+ "mulps %2, %4 \n\t"
+ "movaps %6, %5 \n\t"
+ "unpcklps %4, %6 \n\t"
+ "unpckhps %4, %5 \n\t"
+ "movups %6, (%11) \n\t"
+ "movups %5, 16(%11) \n\t"
+
+#if defined(__x86_64__)
+ "subq $16, %9 \n\t"
+ "addq $16, %10 \n\t"
+ "addq $288, %12 \n\t"
+ "addq $32, %11 \n\t"
+ "decl %8 \n\t"
+ "jnz 1b \n\t"
+ "addq $4, %9 \n\t"
+ "subq $4, %10 \n\t"
+ "subq $128, %11 \n\t"
+#else
+ "subl $16, %9 \n\t"
+ "addl $16, %10 \n\t"
+ "addl $288, %12 \n\t"
+ "addl $32, %11 \n\t"
+ "decl %8 \n\t"
+ "jnz 1b \n\t"
+ "addl $4, %9 \n\t"
+ "subl $4, %10 \n\t"
+ "subl $128, %11 \n\t"
+#endif
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6), "=x" (v7), "=x" (v8),
+ "+r" (i), "+r" (x1), "+r" (x2), "+r" (a)
+ : "r" (wp)
+ : "memory"
+ );
+ wp = enwindow + 280;
+#else
for (i = -15; i < 0; i++) {
FLOAT w, s, t;
@@ -501,6 +739,7 @@ window_subband(const sample_t * x1, FLOA
x1--;
x2++;
}
+#endif
{
FLOAT s, t, u, v;
t = x1[-16] * wp[-10];
--- lame-3.100/libmp3lame/psymodel.c.orig 2017-09-07 04:38:23.000000000 +0900
+++ lame-3.100/libmp3lame/psymodel.c 2017-10-14 12:03:44.000000000 +0900
@@ -155,6 +155,9 @@ blocktype_d[2] block type to use
#include "fft.h"
#include "lame-analysis.h"
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
#define NSFIRLEN 21
@@ -218,10 +221,58 @@ psycho_loudness_approx(FLOAT const *ener
int i;
FLOAT loudness_power;
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6, v7, v8;
+ i = 32;
+ __asm__ __volatile__ (
+ "xorps %0, %0 \n\t"
+ "xorps %1, %1 \n\t"
+ "xorps %2, %2 \n\t"
+ "xorps %3, %3 \n\t"
+ "1: \n\t"
+ "movaps (%9), %4 \n\t"
+ "movaps 16(%9), %5 \n\t"
+ "movaps 32(%9), %6 \n\t"
+ "movaps 48(%9), %7 \n\t"
+ "mulps (%10), %4 \n\t"
+ "mulps 16(%10), %5 \n\t"
+ "mulps 32(%10), %6 \n\t"
+ "mulps 48(%10), %7 \n\t"
+ "addps %4, %0 \n\t"
+ "addps %5, %1 \n\t"
+ "addps %6, %2 \n\t"
+ "addps %7, %3 \n\t"
+#if defined(__x86_64__)
+ "addq $64, %9 \n\t"
+ "addq $64, %10 \n\t"
+#else
+ "addl $64, %9 \n\t"
+ "addl $64, %10 \n\t"
+#endif
+ "decl %8 \n\t"
+ "jnz 1b \n\t"
+ "addps %1, %0 \n\t"
+ "addps %3, %2 \n\t"
+ "addps %2, %0 \n\t"
+ "movhlps %0, %1 \n\t"
+ "addps %1, %0 \n\t"
+#if defined(__SSE3__)
+ "haddps %0, %0 \n\t"
+#else
+ "movaps %0, %1 \n\t"
+ "shufps $0x01, %1, %1 \n\t"
+ "addps %1, %0 \n\t"
+#endif
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6), "=x" (v7), "=x" (v8),
+ "+r" (i), "+r" (eql_w), "+r" (energy)
+ );
+ _mm_store_ss(&loudness_power, v1);
+#else
loudness_power = 0.0;
/* apply weights to power in freq. bands */
for (i = 0; i < BLKSIZE / 2; ++i)
loudness_power += energy[i] * eql_w[i];
+#endif
loudness_power *= VO_SCALE;
return loudness_power;
@@ -666,6 +717,9 @@ static void
vbrpsy_compute_fft_l(lame_internal_flags * gfc, const sample_t * const buffer[2], int chn,
int gr_out, FLOAT fftenergy[HBLKSIZE], FLOAT(*wsamp_l)[BLKSIZE])
{
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6, v7;
+#endif
SessionConfig_t const *const cfg = &gfc->cfg;
PsyStateVar_t *psv = &gfc->sv_psy;
plotting_data *plt = cfg->analysis ? gfc->pinfo : 0;
@@ -676,6 +730,47 @@ vbrpsy_compute_fft_l(lame_internal_flags
}
else if (chn == 2) {
FLOAT const sqrt2_half = SQRT2 * 0.5f;
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ FLOAT *wsamp_lp1 = *wsamp_l;
+ FLOAT *wsamp_lp2 = *wsamp_l+1024;
+ j = 128;
+ __asm__ __volatile__ (
+ "movss (%10), %6 \n\t"
+ "shufps $0x00, %6, %6 \n\t"
+ "1: \n\t"
+ "movaps (%8), %0 \n\t"
+ "movaps 16(%8), %1 \n\t"
+ "movaps (%9), %2 \n\t"
+ "movaps 16(%9), %3 \n\t"
+ "movaps %0, %4 \n\t"
+ "movaps %1, %5 \n\t"
+ "addps %2, %0 \n\t"
+ "addps %3, %1 \n\t"
+ "subps %2, %4 \n\t"
+ "subps %3, %5 \n\t"
+ "mulps %6, %0 \n\t"
+ "mulps %6, %1 \n\t"
+ "mulps %6, %4 \n\t"
+ "mulps %6, %5 \n\t"
+ "movaps %0, (%8) \n\t"
+ "movaps %1, 16(%8) \n\t"
+ "movaps %4, 0(%9) \n\t"
+ "movaps %5, 16(%9) \n\t"
+#if defined(__x86_64__)
+ "addq $32, %8 \n\t"
+ "addq $32, %9 \n\t"
+#else
+ "addl $32, %8 \n\t"
+ "addl $32, %9 \n\t"
+#endif
+ "decl %7 \n\t"
+ "jnz 1b \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6), "=x" (v7),
+ "+r" (j), "+r" (wsamp_lp1), "+r" (wsamp_lp2)
+ : "r" (&sqrt2_half)
+ : "memory"
+ );
+#else
/* FFT data for mid and side channel is derived from L & R */
for (j = BLKSIZE - 1; j >= 0; --j) {
FLOAT const l = wsamp_l[0][j];
@@ -683,6 +778,7 @@ vbrpsy_compute_fft_l(lame_internal_flags
wsamp_l[0][j] = (l + r) * sqrt2_half;
wsamp_l[1][j] = (l - r) * sqrt2_half;
}
+#endif
}
/*********************************************************************
@@ -691,6 +787,73 @@ vbrpsy_compute_fft_l(lame_internal_flags
fftenergy[0] = wsamp_l[0][0];
fftenergy[0] *= fftenergy[0];
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ FLOAT *wsamp_lp1 = *wsamp_l+1;
+ FLOAT *wsamp_lp2 = *wsamp_l+1020;
+ FLOAT *fftenergyp = fftenergy+1;
+ j = 64;
+ __asm__ __volatile__ (
+ "pcmpeqd %4, %4 \n\t"
+ "psrld $26, %4 \n\t"
+ "pslld $24, %4 \n\t"
+ "xorps %5, %5 \n\t"
+ "1: \n\t"
+ "movups (%7), %0 \n\t"
+ "movups 16(%7), %1 \n\t"
+ "movaps (%8), %2 \n\t"
+ "movaps -16(%8), %3 \n\t"
+ "shufps $0x1b, %2, %2 \n\t"
+ "shufps $0x1b, %3, %3 \n\t"
+ "mulps %0, %0 \n\t"
+ "mulps %2, %2 \n\t"
+ "mulps %1, %1 \n\t"
+ "mulps %3, %3 \n\t"
+ "addps %2, %0 \n\t"
+ "addps %3, %1 \n\t"
+ "mulps %4, %0 \n\t"
+ "mulps %4, %1 \n\t"
+ "movups %0, (%9) \n\t"
+ "movups %1, 16(%9) \n\t"
+ "addps %1, %0 \n\t"
+ "addps %0, %5 \n\t"
+#if defined(__x86_64__)
+ "addq $32, %7 \n\t"
+ "subq $32, %8 \n\t"
+ "addq $32, %9 \n\t"
+ "decl %6 \n\t"
+ "jnz 1b \n\t"
+ "subq $2048, %9 \n\t"
+#else
+ "addl $32, %7 \n\t"
+ "subl $32, %8 \n\t"
+ "addl $32, %9 \n\t"
+ "decl %6 \n\t"
+ "jnz 1b \n\t"
+ "subl $2048, %9 \n\t"
+#endif
+ "movups (%9), %0 \n\t"
+ "movups 16(%9), %1 \n\t"
+ "xorps %2, %2 \n\t"
+ "movlps 32(%9), %2 \n\t"
+ "addps %1, %0 \n\t"
+ "addps %2, %0 \n\t"
+ "subps %0, %5 \n\t"
+ "movhlps %5, %0 \n\t"
+ "addps %5, %0 \n\t"
+#if defined(__SSE3__)
+ "haddps %0, %0 \n\t"
+#else
+ "movaps %0, %1 \n\t"
+ "shufps $0x01, %1, %1 \n\t"
+ "addps %1, %0 \n\t"
+#endif
+ "movss %0, (%10) \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6),
+ "+r" (j), "+r" (wsamp_lp1), "+r" (wsamp_lp2), "+r" (fftenergyp)
+ : "r" (&psv->tot_ener[chn])
+ : "memory"
+ );
+#else
for (j = BLKSIZE / 2 - 1; j >= 0; --j) {
FLOAT const re = (*wsamp_l)[BLKSIZE / 2 - j];
FLOAT const im = (*wsamp_l)[BLKSIZE / 2 + j];
@@ -704,6 +867,7 @@ vbrpsy_compute_fft_l(lame_internal_flags
psv->tot_ener[chn] = totalenergy;
}
+#endif
if (plt) {
for (j = 0; j < HBLKSIZE; j++) {
@@ -772,7 +936,7 @@ vbrpsy_attack_detection(lame_internal_fl
FLOAT energy[4], FLOAT sub_short_factor[4][3], int ns_attacks[4][4],
int uselongblock[2])
{
- FLOAT ns_hpfsmpl[2][576];
+ FLOAT ns_hpfsmpl[2][576] __attribute__ ((aligned (16)));
SessionConfig_t const *const cfg = &gfc->cfg;
PsyStateVar_t *const psv = &gfc->sv_psy;
plotting_data *plt = cfg->analysis ? gfc->pinfo : 0;
@@ -785,14 +949,170 @@ vbrpsy_attack_detection(lame_internal_fl
/* Don't copy the input buffer into a temporary buffer */
/* unroll the loop 2 times */
for (chn = 0; chn < n_chn_out; chn++) {
- static const FLOAT fircoef[] = {
+ static const FLOAT fircoef[] __attribute__ ((aligned (16))) = {
-8.65163e-18 * 2, -0.00851586 * 2, -6.74764e-18 * 2, 0.0209036 * 2,
-3.36639e-17 * 2, -0.0438162 * 2, -1.54175e-17 * 2, 0.0931738 * 2,
- -5.52212e-17 * 2, -0.313819 * 2
+ -5.52212e-17 * 2, -0.313819 * 2, 0, 0
};
/* apply high pass filter of fs/4 */
const sample_t *const firbuf = &buffer[chn][576 - 350 - NSFIRLEN + 192];
- assert(dimension_of(fircoef) == ((NSFIRLEN - 1) / 2));
+ //assert(dimension_of(fircoef) == ((NSFIRLEN - 1) / 2));
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6, v7;
+ float *firbufp = (float *)firbuf;
+ float *ns_hpfsmplp = &ns_hpfsmpl[chn][0];
+ i = 144;
+ __asm__ __volatile__ (
+ "1: \n\t"
+ "movups 40(%8), %0 \n\t"
+ "xorps %1, %1 \n\t"
+ "movaps %0, %2 \n\t"
+ "unpcklps %1, %0 \n\t"
+ "unpckhps %1, %2 \n\t"
+ "movaps %2, %1 \n\t"
+
+ "movaps (%10), %2 \n\t"
+ "movups (%8), %3 \n\t"
+ "movups 72(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %2 \n\t"
+ "movaps 16(%10), %5 \n\t"
+ "movups 16(%8), %3 \n\t"
+ "movups 56(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movaps 32(%10), %5 \n\t"
+ "movups 32(%8), %3 \n\t"
+ "movups 40(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movhlps %2, %6 \n\t"
+ "addps %2, %6 \n\t"
+#if defined(__x86_64__)
+ "addq $4, %8 \n\t"
+#else
+ "addl $4, %8 \n\t"
+#endif
+
+ "movaps (%10), %2 \n\t"
+ "movups (%8), %3 \n\t"
+ "movups 72(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %2 \n\t"
+ "movaps 16(%10), %5 \n\t"
+ "movups 16(%8), %3 \n\t"
+ "movups 56(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movaps 32(%10), %5 \n\t"
+ "movups 32(%8), %3 \n\t"
+ "movups 40(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movhlps %2, %3 \n\t"
+ "addps %3, %2 \n\t"
+ "movlhps %2, %6 \n\t"
+ "addps %6, %0 \n\t"
+#if defined(__x86_64__)
+ "addq $4, %8 \n\t"
+#else
+ "addl $4, %8 \n\t"
+#endif
+
+ "movaps (%10), %2 \n\t"
+ "movups (%8), %3 \n\t"
+ "movups 72(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %2 \n\t"
+ "movaps 16(%10), %5 \n\t"
+ "movups 16(%8), %3 \n\t"
+ "movups 56(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movaps 32(%10), %5 \n\t"
+ "movups 32(%8), %3 \n\t"
+ "movups 40(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movhlps %2, %6 \n\t"
+ "addps %2, %6 \n\t"
+#if defined(__x86_64__)
+ "addq $4, %8 \n\t"
+#else
+ "addl $4, %8 \n\t"
+#endif
+
+ "movaps (%10), %2 \n\t"
+ "movups (%8), %3 \n\t"
+ "movups 72(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %2 \n\t"
+ "movaps 16(%10), %5 \n\t"
+ "movups 16(%8), %3 \n\t"
+ "movups 56(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movaps 32(%10), %5 \n\t"
+ "movups 32(%8), %3 \n\t"
+ "movups 40(%8), %4 \n\t"
+ "shufps $0x1b, %4, %4 \n\t"
+ "addps %4, %3 \n\t"
+ "mulps %3, %5 \n\t"
+ "addps %5, %2 \n\t"
+ "movhlps %2, %3 \n\t"
+ "addps %3, %2 \n\t"
+ "movlhps %2, %6 \n\t"
+ "addps %6, %1 \n\t"
+#if defined(__x86_64__)
+ "addq $4, %8 \n\t"
+#else
+ "addl $4, %8 \n\t"
+#endif
+
+#if defined(__SSE3__)
+ "haddps %1, %0 \n\t"
+#else
+ "movaps %0, %2 \n\t"
+ "movaps %1, %3 \n\t"
+ "shufps $0x31, %2, %2 \n\t"
+ "shufps $0x31, %3, %3 \n\t"
+ "addps %2, %0 \n\t"
+ "addps %3, %1 \n\t"
+ "shufps $0x88, %1, %0 \n\t"
+#endif
+ "movaps %0, (%9) \n\t"
+
+#if defined(__x86_64__)
+ "addq $16, %9 \n\t"
+#else
+ "addl $16, %9 \n\t"
+#endif
+ "decl %7 \n\t"
+ "jnz 1b \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "=x" (v6), "=x" (v7),
+ "+r" (i), "+r" (firbufp), "+r" (ns_hpfsmplp)
+ : "r" (fircoef)
+ : "memory"
+ );
+#else
for (i = 0; i < 576; i++) {
FLOAT sum1, sum2;
sum1 = firbuf[i + 10];
@@ -803,6 +1123,7 @@ vbrpsy_attack_detection(lame_internal_fl
}
ns_hpfsmpl[chn][i] = sum1 + sum2;
}
+#endif
masking_ratio[gr_out][chn].en = psv->en[chn];
masking_ratio[gr_out][chn].thm = psv->thm[chn];
if (n_chn_psy > 2) {
@@ -1423,10 +1744,10 @@ L3psycho_anal_vbr(lame_internal_flags *
/* fft and energy calculation */
FLOAT(*wsamp_l)[BLKSIZE];
FLOAT(*wsamp_s)[3][BLKSIZE_s];
- FLOAT fftenergy[HBLKSIZE];
- FLOAT fftenergy_s[3][HBLKSIZE_s];
- FLOAT wsamp_L[2][BLKSIZE];
- FLOAT wsamp_S[2][3][BLKSIZE_s];
+ FLOAT fftenergy[HBLKSIZE] __attribute__ ((aligned (16)));
+ FLOAT fftenergy_s[3][HBLKSIZE_s] __attribute__ ((aligned (16)));
+ FLOAT wsamp_L[2][BLKSIZE] __attribute__ ((aligned (16)));
+ FLOAT wsamp_S[2][3][BLKSIZE_s] __attribute__ ((aligned (16)));
FLOAT eb[4][CBANDS], thr[4][CBANDS];
FLOAT sub_short_factor[4][3];
--- lame-3.100/libmp3lame/quantize.c.orig 2017-08-15 22:40:45.000000000 +0900
+++ lame-3.100/libmp3lame/quantize.c 2017-10-14 12:03:44.000000000 +0900
@@ -99,7 +99,7 @@ init_xrpow_core_init(lame_internal_flags
gfc->init_xrpow_core = init_xrpow_core_sse;
#endif
#ifndef HAVE_NASM
-#ifdef MIN_ARCH_SSE
+#if defined(MIN_ARCH_SSE) || defined(__x86_64__)
gfc->init_xrpow_core = init_xrpow_core_sse;
#endif
#endif
@@ -1495,7 +1495,7 @@ VBR_old_iteration_loop(lame_internal_fla
EncResult_t *const eov = &gfc->ov_enc;
FLOAT l3_xmin[2][2][SFBMAX];
- FLOAT xrpow[576];
+ FLOAT xrpow[576] __attribute__ ((aligned (16)));
int bands[2][2];
int frameBits[15];
int used_bits;
@@ -1904,7 +1904,7 @@ ABR_iteration_loop(lame_internal_flags *
SessionConfig_t const *const cfg = &gfc->cfg;
EncResult_t *const eov = &gfc->ov_enc;
FLOAT l3_xmin[SFBMAX];
- FLOAT xrpow[576];
+ FLOAT xrpow[576] __attribute__ ((aligned (16)));
int targ_bits[2][2];
int mean_bits, max_frame_bits;
int ch, gr, ath_over;
@@ -1991,7 +1991,7 @@ CBR_iteration_loop(lame_internal_flags *
{
SessionConfig_t const *const cfg = &gfc->cfg;
FLOAT l3_xmin[SFBMAX];
- FLOAT xrpow[576];
+ FLOAT xrpow[576] __attribute__ ((aligned (16)));
int targ_bits[2];
int mean_bits, max_bits;
int gr, ch;
--- lame-3.100/libmp3lame/quantize_pvt.c.orig 2017-09-07 04:33:36.000000000 +0900
+++ lame-3.100/libmp3lame/quantize_pvt.c 2017-10-14 12:03:44.000000000 +0900
@@ -27,6 +27,7 @@
# include <config.h>
#endif
+#undef TAKEHIRO_IEEE754_HACK
#include "lame.h"
#include "machine.h"
@@ -37,6 +38,9 @@
#include "lame-analysis.h"
#include <float.h>
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
#define NSATHSCALE 100 /* Assuming dynamic range=96dB, this value should be 92 */
@@ -767,6 +771,70 @@ calc_noise_core_c(const gr_info * const
}
}
else if (j > cod_info->big_values) {
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5;
+ int remaining = l & 1;
+ l = l >> 1;
+ const int *ixp = ix+j;
+ const FLOAT *xrp = cod_info->xr+j;
+ j += 4*l;
+ v5 = _mm_set_ss(step);
+ __asm__ __volatile__ (
+ "xorps %3, %3 \n\t"
+ "testl %5, %5 \n\t"
+ "jz 2f \n\t"
+ "shufps $0x00, %4, %4 \n\t"
+ "pcmpeqd %1, %1 \n\t"
+ "psrld $1, %1 \n\t"
+
+ "1: \n\t"
+ "pxor %0, %0 \n\t"
+ "movups (%6), %2 \n\t"
+ "pcmpeqd %0, %2 \n\t"
+ "pandn %4, %2 \n\t"
+
+ "movups (%7), %0 \n\t"
+ "andps %1, %0 \n\t"
+ "subps %2, %0 \n\t"
+ "mulps %0, %0 \n\t"
+ "addps %0, %3 \n\t"
+
+#if defined(__x86_64__)
+ "addq $16, %6 \n\t"
+ "addq $16, %7 \n\t"
+#else
+ "addl $16, %6 \n\t"
+ "addl $16, %7 \n\t"
+#endif
+ "decl %5 \n\t"
+ "jnz 1b \n\t"
+ "movhlps %3, %0 \n\t"
+ "addps %0, %3 \n\t"
+#if defined(__SSE3__)
+ "haddps %3, %3 \n\t"
+#else
+ "movaps %3, %0 \n\t"
+ "shufps $0x01, %0, %0 \n\t"
+ "addps %0, %3 \n\t"
+#endif
+ "2: \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "+x" (v5),
+ "+r" (l), "+r" (ixp), "+r" (xrp)
+ );
+ _mm_store_ss(&noise, v4);
+ if (remaining) {
+ FLOAT ix01[2];
+ ix01[0] = 0;
+ ix01[1] = step;
+ FLOAT temp;
+ temp = fabs(cod_info->xr[j]) - ix01[ix[j]];
+ j++;
+ noise += temp * temp;
+ temp = fabs(cod_info->xr[j]) - ix01[ix[j]];
+ j++;
+ noise += temp * temp;
+ }
+#else
FLOAT ix01[2];
ix01[0] = 0;
ix01[1] = step;
@@ -779,8 +847,95 @@ calc_noise_core_c(const gr_info * const
j++;
noise += temp * temp;
}
+#endif
}
else {
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6;
+ int remaining = l & 1;
+ l = l >> 1;
+#if defined(_WIN64)
+ long long tmp;
+#else
+ long tmp;
+#endif
+ const int *ixp = ix+j;
+ const FLOAT *xrp = cod_info->xr+j;
+ j += 4*l;
+ v5 = _mm_set_ss(step);
+ __asm__ __volatile__ (
+ "xorps %5, %5 \n\t"
+ "testl %6, %6 \n\t"
+ "jz 2f \n\t"
+ "shufps $0x00, %4, %4 \n\t"
+ "1: \n\t"
+
+#if defined(__x86_64__)
+ "movslq (%7), %9 \n\t"
+ "movss (%10,%9,4), %2 \n\t"
+ "movslq 4(%7), %9 \n\t"
+ "movss (%10,%9,4), %1 \n\t"
+ "movslq 8(%7), %9 \n\t"
+ "movss (%10,%9,4), %0 \n\t"
+ "movslq 12(%7), %9 \n\t"
+ "movss (%10,%9,4), %3 \n\t"
+#else
+ "movl (%7), %9 \n\t"
+ "movss (%10,%9,4), %2 \n\t"
+ "movl 4(%7), %9 \n\t"
+ "movss (%10,%9,4), %1 \n\t"
+ "movl 8(%7), %9 \n\t"
+ "movss (%10,%9,4), %0 \n\t"
+ "movl 12(%7), %9 \n\t"
+ "movss (%10,%9,4), %3 \n\t"
+#endif
+ "movlhps %1, %2 \n\t"
+ "movlhps %3, %0 \n\t"
+ "shufps $0x88, %0, %2 \n\t"
+ "mulps %4, %2 \n\t"
+
+ "movups (%8), %0 \n\t"
+ "xorps %1, %1 \n\t"
+ "subps %0, %1 \n\t"
+ "maxps %1, %0 \n\t"
+ "subps %2, %0 \n\t"
+ "mulps %0, %0 \n\t"
+ "addps %0, %5 \n\t"
+
+#if defined(__x86_64__)
+ "addq $16, %7 \n\t"
+ "addq $16, %8 \n\t"
+#else
+ "addl $16, %7 \n\t"
+ "addl $16, %8 \n\t"
+#endif
+ "decl %6 \n\t"
+ "jnz 1b \n\t"
+ "movhlps %5, %0 \n\t"
+ "addps %0, %5 \n\t"
+#if defined(__SSE3__)
+ "haddps %5, %5 \n\t"
+#else
+ "movaps %5, %0 \n\t"
+ "shufps $0x01, %0, %0 \n\t"
+ "addps %0, %5 \n\t"
+#endif
+ "2: \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "+x" (v5), "=x" (v6),
+ "+r" (l), "+r" (ixp), "+r" (xrp), "=&r" (tmp)
+ : "r" (pow43)
+ );
+ _mm_store_ss(&noise, v6);
+ if (remaining) {
+ FLOAT temp;
+ temp = fabs(cod_info->xr[j]) - pow43[ix[j]] * step;
+ j++;
+ noise += temp * temp;
+ temp = fabs(cod_info->xr[j]) - pow43[ix[j]] * step;
+ j++;
+ noise += temp * temp;
+ }
+#else
while (l--) {
FLOAT temp;
temp = fabs(cod_info->xr[j]) - pow43[ix[j]] * step;
@@ -790,6 +945,7 @@ calc_noise_core_c(const gr_info * const
j++;
noise += temp * temp;
}
+#endif
}
*startline = j;
--- lame-3.100/libmp3lame/takehiro.c.orig 2017-09-07 04:33:36.000000000 +0900
+++ lame-3.100/libmp3lame/takehiro.c 2017-10-14 12:03:44.000000000 +0900
@@ -26,6 +26,7 @@
# include <config.h>
#endif
+#undef TAKEHIRO_IEEE754_HACK
#include "lame.h"
#include "machine.h"
@@ -34,6 +35,9 @@
#include "quantize_pvt.h"
#include "tables.h"
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
static const struct {
const int region0_count;
@@ -229,6 +233,57 @@ quantize_lines_xrpow(unsigned int l, FLO
l = l >> 1;
remaining = l % 2;
l = l >> 1;
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6;
+ v6 = _mm_set_ss(istep);
+#if defined(_WIN64)
+ long long tmp;
+#else
+ long tmp;
+#endif
+ __asm__ __volatile__ (
+ "testl %6, %6 \n\t"
+ "jz 2f \n\t"
+ "shufps $0x00, %5, %5 \n\t"
+ "1: \n\t"
+ "movups (%7), %0 \n\t"
+ "mulps %5, %0 \n\t"
+
+ "cvttss2si %0, %9 \n\t"
+ "movaps %0, %1 \n\t"
+ "shufps $0xe5, %1, %1 \n\t"
+ "movss (%10,%9,4), %2 \n\t"
+ "cvttss2si %1, %9 \n\t"
+ "movhlps %1, %1 \n\t"
+ "movss (%10,%9,4), %3 \n\t"
+ "cvttss2si %1, %9 \n\t"
+ "shufps $0x55, %1, %1 \n\t"
+ "movss (%10,%9,4), %4 \n\t"
+ "cvttss2si %1, %9 \n\t"
+ "movlhps %3, %2 \n\t"
+ "movss (%10,%9,4), %3 \n\t"
+ "movlhps %3, %4 \n\t"
+ "shufps $0x88, %4, %2 \n\t"
+ "addps %2, %0 \n\t"
+ "cvttps2dq %0, %0 \n\t"
+ "movups %0, (%8) \n\t"
+
+#if defined(__x86_64__)
+ "addq $16, %7 \n\t"
+ "addq $16, %8 \n\t"
+#else
+ "addl $16, %7 \n\t"
+ "addl $16, %8 \n\t"
+#endif
+ "decl %6 \n\t"
+ "jnz 1b \n\t"
+ "2: \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "+x" (v6),
+ "+r" (l), "+r" (xr), "+r" (ix), "=&r" (tmp)
+ : "r" (adj43)
+ : "memory"
+ );
+#else
while (l--) {
FLOAT x0, x1, x2, x3;
int rx0, rx1, rx2, rx3;
@@ -250,6 +305,7 @@ quantize_lines_xrpow(unsigned int l, FLO
XRPOW_FTOI(x2, *ix++);
XRPOW_FTOI(x3, *ix++);
};
+#endif
if (remaining) {
FLOAT x0, x1;
int rx0, rx1;
@@ -423,6 +479,80 @@ quantize_xrpow(const FLOAT * xp, int *pi
static int
ix_max(const int *ix, const int *end)
{
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3;
+ int max;
+ __asm__ __volatile__ (
+ "pxor %2, %2 \n\t"
+#if defined(__x86_64__)
+ "subq $8, %4 \n\t"
+ "cmpq %4, %3 \n\t"
+#else
+ "subl $8, %4 \n\t"
+ "cmpl %4, %3 \n\t"
+#endif
+ "je 2f \n\t"
+ "1: \n\t"
+ "movups (%3), %0 \n\t"
+#if defined(__SSE4_1__)
+ "pmaxud %0, %2 \n\t"
+#else
+ "movdqa %2, %1 \n\t"
+ "pcmpgtd %0, %2 \n\t"
+ "pand %2, %1 \n\t"
+ "pandn %0, %2 \n\t"
+ "por %1, %2 \n\t"
+#endif
+#if defined(__x86_64__)
+ "addq $16, %3 \n\t"
+ "cmpq %4, %3 \n\t"
+#else
+ "addl $16, %3 \n\t"
+ "cmpl %4, %3 \n\t"
+#endif
+ "jl 1b \n\t"
+ "jne 3f \n\t"
+ "2: \n\t"
+ "movq (%3), %0 \n\t"
+#if defined(__SSE4_1__)
+ "pmaxud %0, %2 \n\t"
+#else
+ "movdqa %2, %1 \n\t"
+ "pcmpgtd %0, %2 \n\t"
+ "pand %2, %1 \n\t"
+ "pandn %0, %2 \n\t"
+ "por %1, %2 \n\t"
+#endif
+ "3: \n\t"
+#if defined(__SSE4_1__)
+ "movdqa %2, %0 \n\t"
+ "psrldq $8, %2 \n\t"
+ "pmaxud %0, %2 \n\t"
+ "movdqa %2, %0 \n\t"
+ "psrldq $4, %2 \n\t"
+ "pmaxud %2, %0 \n\t"
+#else
+ "movdqa %2, %0 \n\t"
+ "movdqa %2, %1 \n\t"
+ "psrldq $8, %2 \n\t"
+ "pcmpgtd %2, %0 \n\t"
+ "pand %0, %1 \n\t"
+ "pandn %2, %0 \n\t"
+ "por %1, %0 \n\t"
+ "movdqa %0, %2 \n\t"
+ "movdqa %0, %1 \n\t"
+ "psrldq $4, %2 \n\t"
+ "pcmpgtd %2, %0 \n\t"
+ "pand %0, %1 \n\t"
+ "pandn %2, %0 \n\t"
+ "por %1, %0 \n\t"
+#endif
+ "movd %0, %5 \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3),
+ "+r" (ix), "+r" (end), "=r" (max)
+ );
+ return max;
+#else
int max1 = 0, max2 = 0;
do {
@@ -437,6 +567,7 @@ ix_max(const int *ix, const int *end)
if (max1 < max2)
max1 = max2;
return max1;
+#endif
}
@@ -447,12 +578,74 @@ ix_max(const int *ix, const int *end)
static int
-count_bit_ESC(const int *ix, const int *const end, int t1, const int t2, unsigned int *const s)
+count_bit_ESC(const int *ix, const int *end, int t1, const int t2, unsigned int *const s)
{
/* ESC-table is used */
unsigned int const linbits = ht[t1].xlen * 65536u + ht[t2].xlen;
unsigned int sum = 0, sum2;
+#if defined(__GNUC__) && (defined(__x86_64__))
+ unsigned int tmp;
+ static short mult[8] __attribute__ ((aligned (16))) = {16, 1, 16, 1, 16, 1, 16, 1};
+ __asm__ __volatile__ (
+ "movaps (%6), %%xmm4 \n\t"
+ "pcmpeqd %%xmm2, %%xmm2 \n\t"
+ "movdqa %%xmm2, %%xmm3 \n\t"
+ "psrlw $13, %%xmm2 \n\t"
+ "psllw $4, %%xmm3 \n\t"
+ "psllw $1, %%xmm2 \n\t"
+ "pxor %%xmm5, %%xmm5 \n\t"
+ "subq $8, %3 \n\t"
+ "cmpq %3, %0 \n\t"
+ "je 2f \n\t"
+
+ "1: \n\t"
+ "movups (%0), %%xmm0 \n\t"
+ "packssdw %%xmm0, %%xmm0 \n\t"
+ "movdqa %%xmm0, %%xmm1 \n\t"
+ "paddusw %%xmm3, %%xmm1 \n\t"
+ "pcmpgtw %%xmm2, %%xmm0 \n\t"
+ "psubw %%xmm0, %%xmm5 \n\t"
+ "pmaddwd %%xmm4, %%xmm1 \n\t"
+ "movd %%xmm1, %2 \n\t"
+ "psrlq $32, %%xmm1 \n\t"
+ "cltq \n\t"
+ "addl 1088(%5,%%rax,4), %1 \n\t"
+ "movd %%xmm1, %2 \n\t"
+ "cltq \n\t"
+ "addl 1088(%5,%%rax,4), %1 \n\t"
+ "addq $16, %0 \n\t"
+ "cmpq %3, %0 \n\t"
+ "jl 1b \n\t"
+ "movdqa %%xmm5, %%xmm0 \n\t"
+ "psrlq $32, %%xmm0 \n\t"
+ "paddw %%xmm0, %%xmm5 \n\t"
+ "jne 3f \n\t"
+
+ "2: \n\t"
+ "movq (%0), %%xmm0 \n\t"
+ "packssdw %%xmm0, %%xmm0 \n\t"
+ "movdqa %%xmm0, %%xmm1 \n\t"
+ "paddusw %%xmm3, %%xmm1 \n\t"
+ "pcmpgtw %%xmm2, %%xmm0 \n\t"
+ "psubw %%xmm0, %%xmm5 \n\t"
+ "pmaddwd %%xmm4, %%xmm1 \n\t"
+ "movd %%xmm1, %2 \n\t"
+ "cltq \n\t"
+ "addl 1088(%5,%%rax,4), %1 \n\t"
+
+ "3: \n\t"
+ "movdqa %%xmm5, %%xmm0 \n\t"
+ "psrld $16, %%xmm0 \n\t"
+ "paddw %%xmm5, %%xmm0 \n\t"
+ "pextrw $0, %%xmm0, %2 \n\t"
+ "imull %4, %2 \n\t"
+ "addl %2, %1 \n\t"
+ : "+r" (ix), "+r" (sum), "=&a" (tmp), "+r" (end)
+ : "r" (linbits), "r" (largetbl), "r" (mult)
+ : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5"
+ );
+#else
do {
unsigned int x = *ix++;
unsigned int y = *ix++;
@@ -469,6 +662,7 @@ count_bit_ESC(const int *ix, const int *
x += y;
sum += largetbl[x];
} while (ix < end);
+#endif
sum2 = sum & 0xffffu;
sum >>= 16u;
@@ -790,10 +984,178 @@ count_bits(lame_internal_flags const *co
j += width;
}
else {
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5;
+#if defined(__x86_64__)
+#if defined(_WIN64)
+ long long k = j;
+#else
+ long k = j;
+#endif
+ j += width;
+#if defined(_WIN64)
+ long long l = j;
+#else
+ long l = j;
+#endif
+ v1 = _mm_set_ss(roundfac);
+ __asm__ __volatile__ (
+ "shufps $0x00, %0, %0 \n\t"
+
+ "testq $0x3, %5 \n\t"
+ "jz 7f \n\t"
+ "cmpq %6, %5 \n\t"
+ "je 6f \n\t"
+ "8: \n\t"
+ "movss (%7,%5,4), %1 \n\t"
+ "cmpnltss %0, %1 \n\t"
+ "movss (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movss %1, (%8,%5,4) \n\t"
+ "incq %5 \n\t"
+ "testq $0x3, %5 \n\t"
+ "jz 7f \n\t"
+ "cmpq %6, %5 \n\t"
+ "jne 8b \n\t"
+ "7: \n\t"
+
+ "subq $8, %6 \n\t"
+ "cmpq %6, %5 \n\t"
+ "jg 2f \n\t"
+ "1: \n\t"
+ "movaps (%7,%5,4), %1 \n\t"
+ "movaps 16(%7,%5,4), %2 \n\t"
+ "cmpnltps %0, %1 \n\t"
+ "cmpnltps %0, %2 \n\t"
+ "movaps (%8,%5,4), %3 \n\t"
+ "movaps 16(%8,%5,4), %4 \n\t"
+ "andps %3, %1 \n\t"
+ "andps %4, %2 \n\t"
+ "movaps %1, (%8,%5,4) \n\t"
+ "movaps %2, 16(%8,%5,4) \n\t"
+ "addq $8, %5 \n\t"
+ "cmpq %6, %5 \n\t"
+ "jle 1b \n\t"
+ "2: \n\t"
+ "addq $8, %6 \n\t"
+ "cmpq %6, %5 \n\t"
+ "je 6f \n\t"
+
+ "subq $4, %6 \n\t"
+ "cmpq %6, %5 \n\t"
+ "jg 4f \n\t"
+ "3: \n\t"
+ "movaps (%7,%5,4), %1 \n\t"
+ "cmpnltps %0, %1 \n\t"
+ "movaps (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movaps %1, (%8,%5,4) \n\t"
+ "addq $4, %5 \n\t"
+ "cmpq %6, %5 \n\t"
+ "jle 3b \n\t"
+ "4: \n\t"
+ "addq $4, %6 \n\t"
+ "cmpq %6, %5 \n\t"
+ "je 6f \n\t"
+
+ "5: \n\t"
+ "movss (%7,%5,4), %1 \n\t"
+ "cmpnltss %0, %1 \n\t"
+ "movss (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movss %1, (%8,%5,4) \n\t"
+ "incq %5 \n\t"
+ "cmpq %6, %5 \n\t"
+ "jne 5b \n\t"
+ "6: \n\t"
+ : "+x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5),
+ "+r" (k), "+r" (l)
+ : "r" (xr), "r" (ix)
+ );
+#else
+ int k = j;
+ j += width;
+ v1 = _mm_set_ss(roundfac);
+ __asm__ __volatile__ (
+ "shufps $0x00, %0, %0 \n\t"
+
+ "testl $0x3, %5 \n\t"
+ "jz 7f \n\t"
+ "cmpl %6, %5 \n\t"
+ "je 6f \n\t"
+ "8: \n\t"
+ "movss (%7,%5,4), %1 \n\t"
+ "cmpnltss %0, %1 \n\t"
+ "movss (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movss %1, (%8,%5,4) \n\t"
+ "incl %5 \n\t"
+ "testl $0x3, %5 \n\t"
+ "jz 7f \n\t"
+ "cmpl %6, %5 \n\t"
+ "jne 8b \n\t"
+ "7: \n\t"
+
+ "subl $8, %6 \n\t"
+ "cmpl %6, %5 \n\t"
+ "jg 2f \n\t"
+ "1: \n\t"
+ "movaps (%7,%5,4), %1 \n\t"
+ "movaps 16(%7,%5,4), %2 \n\t"
+ "cmpnltps %0, %1 \n\t"
+ "cmpnltps %0, %2 \n\t"
+ "movaps (%8,%5,4), %3 \n\t"
+ "movaps 16(%8,%5,4), %4 \n\t"
+ "andps %3, %1 \n\t"
+ "andps %4, %2 \n\t"
+ "movaps %1, (%8,%5,4) \n\t"
+ "movaps %2, 16(%8,%5,4) \n\t"
+ "addl $8, %5 \n\t"
+ "cmpl %6, %5 \n\t"
+ "jle 1b \n\t"
+ "2: \n\t"
+ "addl $8, %6 \n\t"
+ "cmpl %6, %5 \n\t"
+ "je 6f \n\t"
+
+ "subl $4, %6 \n\t"
+ "cmpl %6, %5 \n\t"
+ "jg 4f \n\t"
+ "3: \n\t"
+ "movaps (%7,%5,4), %1 \n\t"
+ "cmpnltps %0, %1 \n\t"
+ "movaps (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movaps %1, (%8,%5,4) \n\t"
+ "addl $4, %5 \n\t"
+ "cmpl %6, %5 \n\t"
+ "jle 3b \n\t"
+ "4: \n\t"
+ "addl $4, %6 \n\t"
+ "cmpl %6, %5 \n\t"
+ "je 6f \n\t"
+
+ "5: \n\t"
+ "movss (%7,%5,4), %1 \n\t"
+ "cmpnltss %0, %1 \n\t"
+ "movss (%8,%5,4), %2 \n\t"
+ "andps %2, %1 \n\t"
+ "movss %1, (%8,%5,4) \n\t"
+ "incl %5 \n\t"
+ "cmpl %6, %5 \n\t"
+ "jne 5b \n\t"
+ "6: \n\t"
+ : "+x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5),
+ "+r" (k), "+r" (j)
+ : "r" (xr), "r" (ix)
+ );
+#endif
+#else
int k;
for (k = j, j += width; k < j; ++k) {
ix[k] = (xr[k] >= roundfac) ? ix[k] : 0;
}
+#endif
}
}
}
--- lame-3.100/libmp3lame/util.c.orig 2017-09-07 04:33:36.000000000 +0900
+++ lame-3.100/libmp3lame/util.c 2017-10-14 12:03:44.000000000 +0900
@@ -140,7 +140,7 @@ freegfc(lame_internal_flags * const gfc)
gfc->VBR_seek_table.size = 0;
}
if (gfc->ATH) {
- free(gfc->ATH);
+ free_aligned16(gfc->ATH);
}
if (gfc->sv_rpg.rgdata) {
free(gfc->sv_rpg.rgdata);
@@ -162,7 +162,7 @@ freegfc(lame_internal_flags * const gfc)
free_global_data(gfc);
- free(gfc);
+ free_aligned16(gfc);
}
void
--- lame-3.100/libmp3lame/util.h.orig 2017-09-07 04:33:36.000000000 +0900
+++ lame-3.100/libmp3lame/util.h 2017-10-14 12:03:44.000000000 +0900
@@ -116,6 +116,36 @@ extern "C" {
typedef struct plotting_data plotting_data;
#endif
+#if defined(__APPLE__)
+#define malloc_aligned16(size) malloc(size)
+#define calloc_aligned16(n, size) calloc(n, size)
+#define free_aligned16(ptr) free(ptr)
+#elif defined(__MINGW32__) || defined(__MINGW64__) || defined(_MSC_VER)
+#define malloc_aligned16(size) _aligned_malloc(size, 16)
+static inline void * calloc_aligned16(size_t n, size_t size)
+{
+ void *ptr = _aligned_malloc(n * size, 16);
+ if(ptr) memset(ptr, 0, n * size);
+ return ptr;
+}
+#define free_aligned16(ptr) _aligned_free(ptr)
+#else
+static inline void * malloc_aligned16(size_t size)
+{
+ void *ptr;
+ int ret = posix_memalign(&ptr, 16, size);
+ return ret == 0 ? ptr : NULL;
+}
+static inline void * calloc_aligned16(size_t n, size_t size)
+{
+ void *ptr;
+ int ret = posix_memalign(&ptr, 16, n * size);
+ if(!ret) memset(ptr, 0, n * size);
+ return ret == 0 ? ptr : NULL;
+}
+#define free_aligned16(ptr) free(ptr)
+#endif
+
/***********************************************************************
*
* Global Type Definitions
@@ -178,7 +208,7 @@ extern "C" {
FLOAT psfb12[PSFB12]; /* ATH for partitionned sfb12 in short blocks */
FLOAT cb_l[CBANDS]; /* ATH for long block convolution bands */
FLOAT cb_s[CBANDS]; /* ATH for short block convolution bands */
- FLOAT eql_w[BLKSIZE / 2]; /* equal loudness weights (based on ATH) */
+ FLOAT eql_w[BLKSIZE / 2] __attribute__ ((aligned (16))); /* equal loudness weights (based on ATH) */
} ATH_t;
/**
@@ -492,7 +522,7 @@ extern "C" {
/* variables used by lame.c */
Bit_stream_struc bs;
- III_side_info_t l3_side;
+ III_side_info_t l3_side __attribute__ ((aligned (16)));
scalefac_struct scalefac_band;
--- lame-3.100/libmp3lame/vbrquantize.c.orig 2012-02-07 22:36:35.000000000 +0900
+++ lame-3.100/libmp3lame/vbrquantize.c 2017-10-14 12:03:44.000000000 +0900
@@ -26,6 +26,7 @@
# include <config.h>
#endif
+#undef TAKEHIRO_IEEE754_HACK
#include "lame.h"
#include "machine.h"
@@ -34,7 +35,9 @@
#include "vbrquantize.h"
#include "quantize_pvt.h"
-
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#include <xmmintrin.h>
+#endif
struct algo_s;
@@ -226,6 +229,81 @@ calc_sfb_noise_x34(const FLOAT * xr, con
unsigned int i = bw >> 2u;
unsigned int const remaining = (bw & 0x03u);
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ __m128 v1, v2, v3, v4, v5, v6, v7, v8;
+#if defined(_WIN64)
+ long long tmp;
+#else
+ long tmp;
+#endif
+ v6 = _mm_set_ss(sfpow34);
+ v7 = _mm_set_ss(sfpow);
+ __asm__ __volatile__ (
+ "xorps %7, %7 \n\t"
+ "testl %8, %8 \n\t"
+ "jz 2f \n\t"
+ "shufps $0x00, %5, %5 \n\t"
+ "shufps $0x00, %6, %6 \n\t"
+ "pcmpeqd %4, %4 \n\t"
+ "psrld $1, %4 \n\t"
+
+ "1: \n\t"
+ "movups (%10), %1 \n\t"
+ "mulps %5, %1 \n\t"
+ "cvttss2si %1, %11 \n\t"
+ "shufps $0xe5, %1, %1 \n\t"
+ "movlps (%12,%11,4), %2 \n\t"
+ "cvttss2si %1, %11 \n\t"
+ "movhlps %1, %1 \n\t"
+ "movhps (%12,%11,4), %2 \n\t"
+ "cvttss2si %1, %11 \n\t"
+ "shufps $0x55, %1, %1 \n\t"
+ "movlps (%12,%11,4), %3 \n\t"
+ "cvttss2si %1, %11 \n\t"
+ "movups (%9), %1 \n\t"
+ "movhps (%12,%11,4), %3 \n\t"
+ "mulps %6, %2 \n\t"
+ "mulps %6, %3 \n\t"
+ "movaps %2, %0 \n\t"
+ "shufps $0x88, %3, %0 \n\t"
+ "shufps $0xdd, %3, %2 \n\t"
+
+ "andps %4, %1 \n\t"
+ "subps %1, %2 \n\t"
+ "subps %0, %1 \n\t"
+ "movaps %1, %0 \n\t"
+ "cmpltps %2, %1 \n\t"
+ "andps %1, %0 \n\t"
+ "andnps %2, %1 \n\t"
+ "orps %1, %0 \n\t"
+ "mulps %0, %0 \n\t"
+ "addps %0, %7 \n\t"
+
+#if defined(__x86_64__)
+ "addq $16, %9 \n\t"
+ "addq $16, %10 \n\t"
+#else
+ "addl $16, %9 \n\t"
+ "addl $16, %10 \n\t"
+#endif
+ "decl %8 \n\t"
+ "jnz 1b \n\t"
+ "movhlps %7, %0 \n\t"
+ "addps %0, %7 \n\t"
+#if defined(__SSE3__)
+ "haddps %7, %7 \n\t"
+#else
+ "movaps %7, %0 \n\t"
+ "shufps $0x01, %0, %0 \n\t"
+ "addps %0, %7 \n\t"
+#endif
+ "2: \n\t"
+ : "=x" (v1), "=x" (v2), "=x" (v3), "=x" (v4), "=x" (v5), "+x" (v6), "+x" (v7), "=x" (v8),
+ "+r" (i), "+r" (xr), "+r" (xr34), "=&r" (tmp)
+ : "r" (pow43)
+ );
+ _mm_store_ss(&xfsf, v8);
+#else
while (i-- > 0) {
x[0] = sfpow34 * xr34[0];
x[1] = sfpow34 * xr34[1];
@@ -243,6 +321,7 @@ calc_sfb_noise_x34(const FLOAT * xr, con
xr += 4;
xr34 += 4;
}
+#endif
if (remaining) {
x[0] = x[1] = x[2] = x[3] = 0;
switch( remaining ) {
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index e343f39a..26fd330b 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -195,8 +195,8 @@ audiofile.mak_params?=LIBS="-lm -lstdc++"
flac.cfg_params?= --enable-shared=no
flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)"
giflib.cfg_params=echo "exec true" > ./configure; chmod +x ./configure;
-lame.cfg_vars?= CFLAGS+=" -O"
-lame.cfg_params?=--enable-shared=no
+lame.cfg_vars?= CFLAGS+=" -O3 -DUSE_FAST_LOG=1 -ffast-math"
+lame.cfg_params?=--enable-shared=no --enable-nasm --enable-expopt=norm
lame.mak_params?= ; cd $(call bld_path,lame,include); ln -sf . lame
libaom.cfg_vars?=$(call cmake_config,aom-master)
libaom.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
