Update minimp3
This commit is contained in:
521
Source/ThirdParty/minimp3/minimp3.h
vendored
521
Source/ThirdParty/minimp3/minimp3.h
vendored
@@ -6,48 +6,50 @@
|
||||
This software is distributed without any warranty.
|
||||
See <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||
*/
|
||||
#include <stdint.h>
|
||||
|
||||
#define MINIMP3_MAX_SAMPLES_PER_FRAME (1152*2)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int frame_bytes;
|
||||
int channels;
|
||||
int hz;
|
||||
int layer;
|
||||
int bitrate_kbps;
|
||||
int frame_bytes, frame_offset, channels, hz, layer, bitrate_kbps;
|
||||
} mp3dec_frame_info_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
float mdct_overlap[2][9*32];
|
||||
float qmf_state[15*2*32];
|
||||
int reserv;
|
||||
int free_format_bytes;
|
||||
unsigned char header[4];
|
||||
unsigned char reserv_buf[511];
|
||||
float mdct_overlap[2][9*32], qmf_state[15*2*32];
|
||||
int reserv, free_format_bytes;
|
||||
unsigned char header[4], reserv_buf[511];
|
||||
} mp3dec_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#endif /* __cplusplus */
|
||||
|
||||
void mp3dec_init(mp3dec_t *dec);
|
||||
int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes, short *pcm, mp3dec_frame_info_t *info);
|
||||
#ifndef MINIMP3_FLOAT_OUTPUT
|
||||
typedef int16_t mp3d_sample_t;
|
||||
#else /* MINIMP3_FLOAT_OUTPUT */
|
||||
typedef float mp3d_sample_t;
|
||||
void mp3dec_f32_to_s16(const float *in, int16_t *out, int num_samples);
|
||||
#endif /* MINIMP3_FLOAT_OUTPUT */
|
||||
int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_sample_t *pcm, mp3dec_frame_info_t *info);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /*MINIMP3_H*/
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifdef MINIMP3_IMPLEMENTATION
|
||||
#endif /* MINIMP3_H */
|
||||
#if defined(MINIMP3_IMPLEMENTATION) && !defined(_MINIMP3_IMPLEMENTATION_GUARD)
|
||||
#define _MINIMP3_IMPLEMENTATION_GUARD
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#define MAX_FREE_FORMAT_FRAME_SIZE 2304 /* more than ISO spec's */
|
||||
#ifndef MAX_FRAME_SYNC_MATCHES
|
||||
#define MAX_FRAME_SYNC_MATCHES 10
|
||||
#endif /* MAX_FRAME_SYNC_MATCHES */
|
||||
|
||||
#define MAX_L3_FRAME_PAYLOAD_BYTES MAX_FREE_FORMAT_FRAME_SIZE /* MUST be >= 320000/8/32000*1152 = 1440 */
|
||||
|
||||
@@ -71,12 +73,12 @@ int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes,
|
||||
#define HDR_GET_LAYER(h) (((h[1]) >> 1) & 3)
|
||||
#define HDR_GET_BITRATE(h) ((h[2]) >> 4)
|
||||
#define HDR_GET_SAMPLE_RATE(h) (((h[2]) >> 2) & 3)
|
||||
#define HDR_GET_MY_SAMPLE_RATE(h) (HDR_GET_SAMPLE_RATE(h) + (((h[1] >> 3) & 1) + ((h[1] >> 4) & 1)) * 3)
|
||||
#define HDR_GET_MY_SAMPLE_RATE(h) (HDR_GET_SAMPLE_RATE(h) + (((h[1] >> 3) & 1) + ((h[1] >> 4) & 1))*3)
|
||||
#define HDR_IS_FRAME_576(h) ((h[1] & 14) == 2)
|
||||
#define HDR_IS_LAYER_1(h) ((h[1] & 6) == 6)
|
||||
|
||||
#define BITS_DEQUANTIZER_OUT -1
|
||||
#define MAX_SCF (255 + BITS_DEQUANTIZER_OUT * 4 - 210)
|
||||
#define MAX_SCF (255 + BITS_DEQUANTIZER_OUT*4 - 210)
|
||||
#define MAX_SCFI ((MAX_SCF + 3) & ~3)
|
||||
|
||||
#define MINIMP3_MIN(a, b) ((a) > (b) ? (b) : (a))
|
||||
@@ -84,15 +86,15 @@ int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes,
|
||||
|
||||
#if !defined(MINIMP3_NO_SIMD)
|
||||
|
||||
#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(_M_ARM64) || defined(__x86_64__) || defined(__aarch64__))
|
||||
#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64))
|
||||
/* x64 always have SSE2, arm64 always have neon, no need for generic code */
|
||||
#define MINIMP3_ONLY_SIMD
|
||||
#endif
|
||||
#endif /* SIMD checks... */
|
||||
|
||||
#if defined(_MSC_VER) || ((defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__))
|
||||
#if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || ((defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__))
|
||||
#if defined(_MSC_VER)
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
#endif /* defined(_MSC_VER) */
|
||||
#include <immintrin.h>
|
||||
#define HAVE_SSE 1
|
||||
#define HAVE_SIMD 1
|
||||
@@ -109,7 +111,7 @@ int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes,
|
||||
typedef __m128 f4;
|
||||
#if defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD)
|
||||
#define minimp3_cpuid __cpuid
|
||||
#else
|
||||
#else /* defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD) */
|
||||
static __inline__ __attribute__((always_inline)) void minimp3_cpuid(int CPUInfo[], const int InfoType)
|
||||
{
|
||||
#if defined(__PIC__)
|
||||
@@ -119,51 +121,49 @@ static __inline__ __attribute__((always_inline)) void minimp3_cpuid(int CPUInfo[
|
||||
"cpuid\n"
|
||||
"xchgl %%ebx, %1\n"
|
||||
"pop %%rbx\n"
|
||||
#else
|
||||
#else /* defined(__x86_64__) */
|
||||
"xchgl %%ebx, %1\n"
|
||||
"cpuid\n"
|
||||
"xchgl %%ebx, %1\n"
|
||||
#endif
|
||||
#endif /* defined(__x86_64__) */
|
||||
: "=a" (CPUInfo[0]), "=r" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3])
|
||||
: "a" (InfoType));
|
||||
#else
|
||||
#else /* defined(__PIC__) */
|
||||
__asm__ __volatile__(
|
||||
"cpuid"
|
||||
: "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3])
|
||||
: "a" (InfoType));
|
||||
#endif
|
||||
#endif /* defined(__PIC__)*/
|
||||
}
|
||||
#endif
|
||||
static int have_simd()
|
||||
#endif /* defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD) */
|
||||
static int have_simd(void)
|
||||
{
|
||||
#ifdef MINIMP3_ONLY_SIMD
|
||||
return 1;
|
||||
#else
|
||||
#else /* MINIMP3_ONLY_SIMD */
|
||||
static int g_have_simd;
|
||||
int CPUInfo[4];
|
||||
#ifdef MINIMP3_TEST
|
||||
static int g_counter;
|
||||
if (g_counter++ > 100)
|
||||
goto test_nosimd;
|
||||
#endif
|
||||
return 0;
|
||||
#endif /* MINIMP3_TEST */
|
||||
if (g_have_simd)
|
||||
return g_have_simd - 1;
|
||||
goto end;
|
||||
minimp3_cpuid(CPUInfo, 0);
|
||||
g_have_simd = 1;
|
||||
if (CPUInfo[0] > 0)
|
||||
{
|
||||
minimp3_cpuid(CPUInfo, 1);
|
||||
g_have_simd = (CPUInfo[3] & (1 << 26)) + 1; /* SSE2 */
|
||||
return g_have_simd - 1;
|
||||
}
|
||||
#ifdef MINIMP3_TEST
|
||||
test_nosimd:
|
||||
#endif
|
||||
g_have_simd = 1;
|
||||
return 0;
|
||||
#endif
|
||||
end:
|
||||
return g_have_simd - 1;
|
||||
#endif /* MINIMP3_ONLY_SIMD */
|
||||
}
|
||||
#elif defined(__ARM_NEON) || defined(__aarch64__)
|
||||
#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)
|
||||
#include <arm_neon.h>
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SIMD 1
|
||||
#define VSTORE vst1q_f32
|
||||
#define VLD vld1q_f32
|
||||
@@ -180,60 +180,53 @@ static int have_simd()
|
||||
{ /* TODO: detect neon for !MINIMP3_ONLY_SIMD */
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
#else /* SIMD checks... */
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SIMD 0
|
||||
#ifdef MINIMP3_ONLY_SIMD
|
||||
#error MINIMP3_ONLY_SIMD used, but SSE/NEON not enabled
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#endif /* MINIMP3_ONLY_SIMD */
|
||||
#endif /* SIMD checks... */
|
||||
#else /* !defined(MINIMP3_NO_SIMD) */
|
||||
#define HAVE_SIMD 0
|
||||
#endif /* !defined(MINIMP3_NO_SIMD) */
|
||||
|
||||
#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64)
|
||||
#define HAVE_ARMV6 1
|
||||
static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a)
|
||||
{
|
||||
int32_t x = 0;
|
||||
__asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a));
|
||||
return x;
|
||||
}
|
||||
#else
|
||||
#define HAVE_ARMV6 0
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
{
|
||||
const uint8_t *buf;
|
||||
int pos;
|
||||
int limit;
|
||||
int pos, limit;
|
||||
} bs_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint8_t total_bands;
|
||||
uint8_t stereo_bands;
|
||||
uint8_t bitalloc[64];
|
||||
uint8_t scfcod[64];
|
||||
float scf[3*64];
|
||||
uint8_t total_bands, stereo_bands, bitalloc[64], scfcod[64];
|
||||
} L12_scale_info;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint8_t tab_offset;
|
||||
uint8_t code_tab_width;
|
||||
uint8_t band_count;
|
||||
uint8_t tab_offset, code_tab_width, band_count;
|
||||
} L12_subband_alloc_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
const uint8_t *sfbtab;
|
||||
uint16_t part_23_length;
|
||||
uint16_t big_values;
|
||||
uint16_t scalefac_compress;
|
||||
uint8_t global_gain;
|
||||
uint8_t block_type;
|
||||
uint8_t mixed_block_flag;
|
||||
uint8_t n_long_sfb;
|
||||
uint8_t n_short_sfb;
|
||||
uint8_t table_select[3];
|
||||
uint8_t region_count[3];
|
||||
uint8_t subblock_gain[3];
|
||||
uint8_t preflag;
|
||||
uint8_t scalefac_scale;
|
||||
uint8_t count1_table;
|
||||
uint8_t scfsi;
|
||||
uint16_t part_23_length, big_values, scalefac_compress;
|
||||
uint8_t global_gain, block_type, mixed_block_flag, n_long_sfb, n_short_sfb;
|
||||
uint8_t table_select[3], region_count[3], subblock_gain[3];
|
||||
uint8_t preflag, scalefac_scale, count1_table, scfsi;
|
||||
} L3_gr_info_t;
|
||||
|
||||
typedef struct
|
||||
@@ -241,10 +234,8 @@ typedef struct
|
||||
bs_t bs;
|
||||
uint8_t maindata[MAX_BITRESERVOIR_BYTES + MAX_L3_FRAME_PAYLOAD_BYTES];
|
||||
L3_gr_info_t gr_info[4];
|
||||
float grbuf[2][576];
|
||||
float scf[40];
|
||||
float grbuf[2][576], scf[40], syn[18 + 15][2*32];
|
||||
uint8_t ist_pos[2][39];
|
||||
float syn[18 + 15][2*32];
|
||||
} mp3dec_scratch_t;
|
||||
|
||||
static void bs_init(bs_t *bs, const uint8_t *data, int bytes)
|
||||
@@ -309,7 +300,7 @@ static unsigned hdr_frame_samples(const uint8_t *h)
|
||||
|
||||
static int hdr_frame_bytes(const uint8_t *h, int free_format_size)
|
||||
{
|
||||
int frame_bytes = hdr_frame_samples(h) * hdr_bitrate_kbps(h) * 125 / hdr_sample_rate_hz(h);
|
||||
int frame_bytes = hdr_frame_samples(h)*hdr_bitrate_kbps(h)*125/hdr_sample_rate_hz(h);
|
||||
if (HDR_IS_LAYER_1(h))
|
||||
{
|
||||
frame_bytes &= ~3; /* slot align */
|
||||
@@ -385,7 +376,7 @@ static void L12_read_scalefactors(bs_t *bs, uint8_t *pba, uint8_t *scfcod, int b
|
||||
if (mask & m)
|
||||
{
|
||||
int b = get_bits(bs, 6);
|
||||
s = g_deq_L12[ba*3 - 6 + b % 3] * (1 << 21 >> b/3);
|
||||
s = g_deq_L12[ba*3 - 6 + b % 3]*(1 << 21 >> b/3);
|
||||
}
|
||||
*scf++ = s;
|
||||
}
|
||||
@@ -403,7 +394,7 @@ static void L12_read_scale_info(const uint8_t *hdr, bs_t *bs, L12_scale_info *sc
|
||||
0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,14,
|
||||
0, 2, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16
|
||||
};
|
||||
const L12_subband_alloc_t * subband_alloc = L12_subband_alloc_table(hdr, sci);
|
||||
const L12_subband_alloc_t *subband_alloc = L12_subband_alloc_table(hdr, sci);
|
||||
|
||||
int i, k = 0, ba_bits = 0;
|
||||
const uint8_t *ba_code_tab = g_bitalloc_code_tab;
|
||||
@@ -427,12 +418,12 @@ static void L12_read_scale_info(const uint8_t *hdr, bs_t *bs, L12_scale_info *sc
|
||||
sci->bitalloc[2*i + 1] = sci->stereo_bands ? ba : 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < 2 * sci->total_bands; i++)
|
||||
for (i = 0; i < 2*sci->total_bands; i++)
|
||||
{
|
||||
sci->scfcod[i] = sci->bitalloc[i] ? HDR_IS_LAYER_1(hdr) ? 2 : get_bits(bs, 2) : 6;
|
||||
}
|
||||
|
||||
L12_read_scalefactors(bs, sci->bitalloc, sci->scfcod, sci->total_bands * 2, sci->scf);
|
||||
L12_read_scalefactors(bs, sci->bitalloc, sci->scfcod, sci->total_bands*2, sci->scf);
|
||||
|
||||
for (i = sci->stereo_bands; i < sci->total_bands; i++)
|
||||
{
|
||||
@@ -488,12 +479,11 @@ static void L12_apply_scf_384(L12_scale_info *sci, const float *scf, float *dst)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif /* MINIMP3_ONLY_MP3 */
|
||||
|
||||
static int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr)
|
||||
{
|
||||
static const uint8_t g_scf_long[9][23] = {
|
||||
{ 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
|
||||
static const uint8_t g_scf_long[8][23] = {
|
||||
{ 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
|
||||
{ 12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2,0 },
|
||||
{ 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
|
||||
@@ -503,8 +493,7 @@ static int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr)
|
||||
{ 4,4,4,4,4,4,6,6,6,8,10,12,16,18,22,28,34,40,46,54,54,192,0 },
|
||||
{ 4,4,4,4,4,4,6,6,8,10,12,16,20,24,30,38,46,56,68,84,102,26,0 }
|
||||
};
|
||||
static const uint8_t g_scf_short[9][40] = {
|
||||
{ 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
|
||||
static const uint8_t g_scf_short[8][40] = {
|
||||
{ 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
|
||||
{ 8,8,8,8,8,8,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 },
|
||||
{ 4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 },
|
||||
@@ -514,8 +503,7 @@ static int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr)
|
||||
{ 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,10,10,10,12,12,12,14,14,14,16,16,16,20,20,20,26,26,26,66,66,66,0 },
|
||||
{ 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,12,12,12,16,16,16,20,20,20,26,26,26,34,34,34,42,42,42,12,12,12,0 }
|
||||
};
|
||||
static const uint8_t g_scf_mixed[9][40] = {
|
||||
{ 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
|
||||
static const uint8_t g_scf_mixed[8][40] = {
|
||||
{ 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
|
||||
{ 12,12,12,4,4,4,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 },
|
||||
{ 6,6,6,6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 },
|
||||
@@ -528,7 +516,7 @@ static int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr)
|
||||
|
||||
unsigned tables, scfsi = 0;
|
||||
int main_data_begin, part_23_sum = 0;
|
||||
int sr_idx = HDR_GET_MY_SAMPLE_RATE(hdr);
|
||||
int sr_idx = HDR_GET_MY_SAMPLE_RATE(hdr); sr_idx -= (sr_idx != 0);
|
||||
int gr_count = HDR_IS_MONO(hdr) ? 1 : 2;
|
||||
|
||||
if (HDR_TEST_MPEG1(hdr))
|
||||
@@ -725,17 +713,19 @@ static void L3_decode_scalefactors(const uint8_t *hdr, uint8_t *ist_pos, bs_t *b
|
||||
}
|
||||
}
|
||||
|
||||
static const float g_pow43[129 + 16] = {
|
||||
0,-1,-2.519842f,-4.326749f,-6.349604f,-8.549880f,-10.902724f,-13.390518f,-16.000000f,-18.720754f,-21.544347f,-24.463781f,-27.473142f,-30.567351f,-33.741992f,-36.993181f,
|
||||
0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f
|
||||
};
|
||||
|
||||
static float L3_pow_43(int x)
|
||||
{
|
||||
static const float g_pow43[129] = {
|
||||
0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f
|
||||
};
|
||||
float frac;
|
||||
int sign, mult = 256;
|
||||
|
||||
if (x < 129)
|
||||
{
|
||||
return g_pow43[x];
|
||||
return g_pow43[16 + x];
|
||||
}
|
||||
|
||||
if (x < 1024)
|
||||
@@ -746,37 +736,36 @@ static float L3_pow_43(int x)
|
||||
|
||||
sign = 2*x & 64;
|
||||
frac = (float)((x & 63) - sign) / ((x & ~63) + sign);
|
||||
return g_pow43[(x + sign) >> 6] * (1.f + frac * ((4.f/3) + frac * (2.f/9))) * mult;
|
||||
return g_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult;
|
||||
}
|
||||
|
||||
static void L3_huffman(float *dst, bs_t *bs, const L3_gr_info_t *gr_info, const float *scf, int layer3gr_limit)
|
||||
{
|
||||
static const float g_pow43_signed[32] = { 0,0,1,-1,2.519842f,-2.519842f,4.326749f,-4.326749f,6.349604f,-6.349604f,8.549880f,-8.549880f,10.902724f,-10.902724f,13.390518f,-13.390518f,16.000000f,-16.000000f,18.720754f,-18.720754f,21.544347f,-21.544347f,24.463781f,-24.463781f,27.473142f,-27.473142f,30.567351f,-30.567351f,33.741992f,-33.741992f,36.993181f,-36.993181f };
|
||||
static const int16_t tab0[32] = { 0, };
|
||||
static const int16_t tab1[] = { 785,785,785,785,784,784,784,784,513,513,513,513,513,513,513,513,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256 };
|
||||
static const int16_t tab2[] = { -255,1313,1298,1282,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,290,288 };
|
||||
static const int16_t tab3[] = { -255,1313,1298,1282,769,769,769,769,529,529,529,529,529,529,529,529,528,528,528,528,528,528,528,528,512,512,512,512,512,512,512,512,290,288 };
|
||||
static const int16_t tab5[] = { -253,-318,-351,-367,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,819,818,547,547,275,275,275,275,561,560,515,546,289,274,288,258 };
|
||||
static const int16_t tab6[] = { -254,-287,1329,1299,1314,1312,1057,1057,1042,1042,1026,1026,784,784,784,784,529,529,529,529,529,529,529,529,769,769,769,769,768,768,768,768,563,560,306,306,291,259 };
|
||||
static const int16_t tab7[] = { -252,-413,-477,-542,1298,-575,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-383,-399,1107,1092,1106,1061,849,849,789,789,1104,1091,773,773,1076,1075,341,340,325,309,834,804,577,577,532,532,516,516,832,818,803,816,561,561,531,531,515,546,289,289,288,258 };
|
||||
static const int16_t tab8[] = { -252,-429,-493,-559,1057,1057,1042,1042,529,529,529,529,529,529,529,529,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,-382,1077,-415,1106,1061,1104,849,849,789,789,1091,1076,1029,1075,834,834,597,581,340,340,339,324,804,833,532,532,832,772,818,803,817,787,816,771,290,290,290,290,288,258 };
|
||||
static const int16_t tab9[] = { -253,-349,-414,-447,-463,1329,1299,-479,1314,1312,1057,1057,1042,1042,1026,1026,785,785,785,785,784,784,784,784,769,769,769,769,768,768,768,768,-319,851,821,-335,836,850,805,849,341,340,325,336,533,533,579,579,564,564,773,832,578,548,563,516,321,276,306,291,304,259 };
|
||||
static const int16_t tab10[] = { -251,-572,-733,-830,-863,-879,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,1396,1351,1381,1366,1395,1335,1380,-559,1334,1138,1138,1063,1063,1350,1392,1031,1031,1062,1062,1364,1363,1120,1120,1333,1348,881,881,881,881,375,374,359,373,343,358,341,325,791,791,1123,1122,-703,1105,1045,-719,865,865,790,790,774,774,1104,1029,338,293,323,308,-799,-815,833,788,772,818,803,816,322,292,307,320,561,531,515,546,289,274,288,258 };
|
||||
static const int16_t tab11[] = { -251,-525,-605,-685,-765,-831,-846,1298,1057,1057,1312,1282,785,785,785,785,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,1399,1398,1383,1367,1382,1396,1351,-511,1381,1366,1139,1139,1079,1079,1124,1124,1364,1349,1363,1333,882,882,882,882,807,807,807,807,1094,1094,1136,1136,373,341,535,535,881,775,867,822,774,-591,324,338,-671,849,550,550,866,864,609,609,293,336,534,534,789,835,773,-751,834,804,308,307,833,788,832,772,562,562,547,547,305,275,560,515,290,290 };
|
||||
static const int16_t tab12[] = { -252,-397,-477,-557,-622,-653,-719,-735,-750,1329,1299,1314,1057,1057,1042,1042,1312,1282,1024,1024,785,785,785,785,784,784,784,784,769,769,769,769,-383,1127,1141,1111,1126,1140,1095,1110,869,869,883,883,1079,1109,882,882,375,374,807,868,838,881,791,-463,867,822,368,263,852,837,836,-543,610,610,550,550,352,336,534,534,865,774,851,821,850,805,593,533,579,564,773,832,578,578,548,548,577,577,307,276,306,291,516,560,259,259 };
|
||||
static const int16_t tab13[] = { -250,-2107,-2507,-2764,-2909,-2974,-3007,-3023,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-767,-1052,-1213,-1277,-1358,-1405,-1469,-1535,-1550,-1582,-1614,-1647,-1662,-1694,-1726,-1759,-1774,-1807,-1822,-1854,-1886,1565,-1919,-1935,-1951,-1967,1731,1730,1580,1717,-1983,1729,1564,-1999,1548,-2015,-2031,1715,1595,-2047,1714,-2063,1610,-2079,1609,-2095,1323,1323,1457,1457,1307,1307,1712,1547,1641,1700,1699,1594,1685,1625,1442,1442,1322,1322,-780,-973,-910,1279,1278,1277,1262,1276,1261,1275,1215,1260,1229,-959,974,974,989,989,-943,735,478,478,495,463,506,414,-1039,1003,958,1017,927,942,987,957,431,476,1272,1167,1228,-1183,1256,-1199,895,895,941,941,1242,1227,1212,1135,1014,1014,490,489,503,487,910,1013,985,925,863,894,970,955,1012,847,-1343,831,755,755,984,909,428,366,754,559,-1391,752,486,457,924,997,698,698,983,893,740,740,908,877,739,739,667,667,953,938,497,287,271,271,683,606,590,712,726,574,302,302,738,736,481,286,526,725,605,711,636,724,696,651,589,681,666,710,364,467,573,695,466,466,301,465,379,379,709,604,665,679,316,316,634,633,436,436,464,269,424,394,452,332,438,363,347,408,393,448,331,422,362,407,392,421,346,406,391,376,375,359,1441,1306,-2367,1290,-2383,1337,-2399,-2415,1426,1321,-2431,1411,1336,-2447,-2463,-2479,1169,1169,1049,1049,1424,1289,1412,1352,1319,-2495,1154,1154,1064,1064,1153,1153,416,390,360,404,403,389,344,374,373,343,358,372,327,357,342,311,356,326,1395,1394,1137,1137,1047,1047,1365,1392,1287,1379,1334,1364,1349,1378,1318,1363,792,792,792,792,1152,1152,1032,1032,1121,1121,1046,1046,1120,1120,1030,1030,-2895,1106,1061,1104,849,849,789,789,1091,1076,1029,1090,1060,1075,833,833,309,324,532,532,832,772,818,803,561,561,531,560,515,546,289,274,288,258 };
|
||||
static const int16_t tab15[] = { -250,-1179,-1579,-1836,-1996,-2124,-2253,-2333,-2413,-2477,-2542,-2574,-2607,-2622,-2655,1314,1313,1298,1312,1282,785,785,785,785,1040,1040,1025,1025,768,768,768,768,-766,-798,-830,-862,-895,-911,-927,-943,-959,-975,-991,-1007,-1023,-1039,-1055,-1070,1724,1647,-1103,-1119,1631,1767,1662,1738,1708,1723,-1135,1780,1615,1779,1599,1677,1646,1778,1583,-1151,1777,1567,1737,1692,1765,1722,1707,1630,1751,1661,1764,1614,1736,1676,1763,1750,1645,1598,1721,1691,1762,1706,1582,1761,1566,-1167,1749,1629,767,766,751,765,494,494,735,764,719,749,734,763,447,447,748,718,477,506,431,491,446,476,461,505,415,430,475,445,504,399,460,489,414,503,383,474,429,459,502,502,746,752,488,398,501,473,413,472,486,271,480,270,-1439,-1455,1357,-1471,-1487,-1503,1341,1325,-1519,1489,1463,1403,1309,-1535,1372,1448,1418,1476,1356,1462,1387,-1551,1475,1340,1447,1402,1386,-1567,1068,1068,1474,1461,455,380,468,440,395,425,410,454,364,467,466,464,453,269,409,448,268,432,1371,1473,1432,1417,1308,1460,1355,1446,1459,1431,1083,1083,1401,1416,1458,1445,1067,1067,1370,1457,1051,1051,1291,1430,1385,1444,1354,1415,1400,1443,1082,1082,1173,1113,1186,1066,1185,1050,-1967,1158,1128,1172,1097,1171,1081,-1983,1157,1112,416,266,375,400,1170,1142,1127,1065,793,793,1169,1033,1156,1096,1141,1111,1155,1080,1126,1140,898,898,808,808,897,897,792,792,1095,1152,1032,1125,1110,1139,1079,1124,882,807,838,881,853,791,-2319,867,368,263,822,852,837,866,806,865,-2399,851,352,262,534,534,821,836,594,594,549,549,593,593,533,533,848,773,579,579,564,578,548,563,276,276,577,576,306,291,516,560,305,305,275,259 };
|
||||
static const int16_t tab16[] = { -251,-892,-2058,-2620,-2828,-2957,-3023,-3039,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,-559,1530,-575,-591,1528,1527,1407,1526,1391,1023,1023,1023,1023,1525,1375,1268,1268,1103,1103,1087,1087,1039,1039,1523,-604,815,815,815,815,510,495,509,479,508,463,507,447,431,505,415,399,-734,-782,1262,-815,1259,1244,-831,1258,1228,-847,-863,1196,-879,1253,987,987,748,-767,493,493,462,477,414,414,686,669,478,446,461,445,474,429,487,458,412,471,1266,1264,1009,1009,799,799,-1019,-1276,-1452,-1581,-1677,-1757,-1821,-1886,-1933,-1997,1257,1257,1483,1468,1512,1422,1497,1406,1467,1496,1421,1510,1134,1134,1225,1225,1466,1451,1374,1405,1252,1252,1358,1480,1164,1164,1251,1251,1238,1238,1389,1465,-1407,1054,1101,-1423,1207,-1439,830,830,1248,1038,1237,1117,1223,1148,1236,1208,411,426,395,410,379,269,1193,1222,1132,1235,1221,1116,976,976,1192,1162,1177,1220,1131,1191,963,963,-1647,961,780,-1663,558,558,994,993,437,408,393,407,829,978,813,797,947,-1743,721,721,377,392,844,950,828,890,706,706,812,859,796,960,948,843,934,874,571,571,-1919,690,555,689,421,346,539,539,944,779,918,873,932,842,903,888,570,570,931,917,674,674,-2575,1562,-2591,1609,-2607,1654,1322,1322,1441,1441,1696,1546,1683,1593,1669,1624,1426,1426,1321,1321,1639,1680,1425,1425,1305,1305,1545,1668,1608,1623,1667,1592,1638,1666,1320,1320,1652,1607,1409,1409,1304,1304,1288,1288,1664,1637,1395,1395,1335,1335,1622,1636,1394,1394,1319,1319,1606,1621,1392,1392,1137,1137,1137,1137,345,390,360,375,404,373,1047,-2751,-2767,-2783,1062,1121,1046,-2799,1077,-2815,1106,1061,789,789,1105,1104,263,355,310,340,325,354,352,262,339,324,1091,1076,1029,1090,1060,1075,833,833,788,788,1088,1028,818,818,803,803,561,561,531,531,816,771,546,546,289,274,288,258 };
|
||||
static const int16_t tab24[] = { -253,-317,-381,-446,-478,-509,1279,1279,-811,-1179,-1451,-1756,-1900,-2028,-2189,-2253,-2333,-2414,-2445,-2511,-2526,1313,1298,-2559,1041,1041,1040,1040,1025,1025,1024,1024,1022,1007,1021,991,1020,975,1019,959,687,687,1018,1017,671,671,655,655,1016,1015,639,639,758,758,623,623,757,607,756,591,755,575,754,559,543,543,1009,783,-575,-621,-685,-749,496,-590,750,749,734,748,974,989,1003,958,988,973,1002,942,987,957,972,1001,926,986,941,971,956,1000,910,985,925,999,894,970,-1071,-1087,-1102,1390,-1135,1436,1509,1451,1374,-1151,1405,1358,1480,1420,-1167,1507,1494,1389,1342,1465,1435,1450,1326,1505,1310,1493,1373,1479,1404,1492,1464,1419,428,443,472,397,736,526,464,464,486,457,442,471,484,482,1357,1449,1434,1478,1388,1491,1341,1490,1325,1489,1463,1403,1309,1477,1372,1448,1418,1433,1476,1356,1462,1387,-1439,1475,1340,1447,1402,1474,1324,1461,1371,1473,269,448,1432,1417,1308,1460,-1711,1459,-1727,1441,1099,1099,1446,1386,1431,1401,-1743,1289,1083,1083,1160,1160,1458,1445,1067,1067,1370,1457,1307,1430,1129,1129,1098,1098,268,432,267,416,266,400,-1887,1144,1187,1082,1173,1113,1186,1066,1050,1158,1128,1143,1172,1097,1171,1081,420,391,1157,1112,1170,1142,1127,1065,1169,1049,1156,1096,1141,1111,1155,1080,1126,1154,1064,1153,1140,1095,1048,-2159,1125,1110,1137,-2175,823,823,1139,1138,807,807,384,264,368,263,868,838,853,791,867,822,852,837,866,806,865,790,-2319,851,821,836,352,262,850,805,849,-2399,533,533,835,820,336,261,578,548,563,577,532,532,832,772,562,562,547,547,305,275,560,515,290,290,288,258 };
|
||||
static const uint8_t tab32[] = { 130,162,193,209,44,28,76,140,9,9,9,9,9,9,9,9,190,254,222,238,126,94,157,157,109,61,173,205};
|
||||
static const int16_t tabs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
785,785,785,785,784,784,784,784,513,513,513,513,513,513,513,513,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
|
||||
-255,1313,1298,1282,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,290,288,
|
||||
-255,1313,1298,1282,769,769,769,769,529,529,529,529,529,529,529,529,528,528,528,528,528,528,528,528,512,512,512,512,512,512,512,512,290,288,
|
||||
-253,-318,-351,-367,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,819,818,547,547,275,275,275,275,561,560,515,546,289,274,288,258,
|
||||
-254,-287,1329,1299,1314,1312,1057,1057,1042,1042,1026,1026,784,784,784,784,529,529,529,529,529,529,529,529,769,769,769,769,768,768,768,768,563,560,306,306,291,259,
|
||||
-252,-413,-477,-542,1298,-575,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-383,-399,1107,1092,1106,1061,849,849,789,789,1104,1091,773,773,1076,1075,341,340,325,309,834,804,577,577,532,532,516,516,832,818,803,816,561,561,531,531,515,546,289,289,288,258,
|
||||
-252,-429,-493,-559,1057,1057,1042,1042,529,529,529,529,529,529,529,529,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,-382,1077,-415,1106,1061,1104,849,849,789,789,1091,1076,1029,1075,834,834,597,581,340,340,339,324,804,833,532,532,832,772,818,803,817,787,816,771,290,290,290,290,288,258,
|
||||
-253,-349,-414,-447,-463,1329,1299,-479,1314,1312,1057,1057,1042,1042,1026,1026,785,785,785,785,784,784,784,784,769,769,769,769,768,768,768,768,-319,851,821,-335,836,850,805,849,341,340,325,336,533,533,579,579,564,564,773,832,578,548,563,516,321,276,306,291,304,259,
|
||||
-251,-572,-733,-830,-863,-879,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,1396,1351,1381,1366,1395,1335,1380,-559,1334,1138,1138,1063,1063,1350,1392,1031,1031,1062,1062,1364,1363,1120,1120,1333,1348,881,881,881,881,375,374,359,373,343,358,341,325,791,791,1123,1122,-703,1105,1045,-719,865,865,790,790,774,774,1104,1029,338,293,323,308,-799,-815,833,788,772,818,803,816,322,292,307,320,561,531,515,546,289,274,288,258,
|
||||
-251,-525,-605,-685,-765,-831,-846,1298,1057,1057,1312,1282,785,785,785,785,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,1399,1398,1383,1367,1382,1396,1351,-511,1381,1366,1139,1139,1079,1079,1124,1124,1364,1349,1363,1333,882,882,882,882,807,807,807,807,1094,1094,1136,1136,373,341,535,535,881,775,867,822,774,-591,324,338,-671,849,550,550,866,864,609,609,293,336,534,534,789,835,773,-751,834,804,308,307,833,788,832,772,562,562,547,547,305,275,560,515,290,290,
|
||||
-252,-397,-477,-557,-622,-653,-719,-735,-750,1329,1299,1314,1057,1057,1042,1042,1312,1282,1024,1024,785,785,785,785,784,784,784,784,769,769,769,769,-383,1127,1141,1111,1126,1140,1095,1110,869,869,883,883,1079,1109,882,882,375,374,807,868,838,881,791,-463,867,822,368,263,852,837,836,-543,610,610,550,550,352,336,534,534,865,774,851,821,850,805,593,533,579,564,773,832,578,578,548,548,577,577,307,276,306,291,516,560,259,259,
|
||||
-250,-2107,-2507,-2764,-2909,-2974,-3007,-3023,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-767,-1052,-1213,-1277,-1358,-1405,-1469,-1535,-1550,-1582,-1614,-1647,-1662,-1694,-1726,-1759,-1774,-1807,-1822,-1854,-1886,1565,-1919,-1935,-1951,-1967,1731,1730,1580,1717,-1983,1729,1564,-1999,1548,-2015,-2031,1715,1595,-2047,1714,-2063,1610,-2079,1609,-2095,1323,1323,1457,1457,1307,1307,1712,1547,1641,1700,1699,1594,1685,1625,1442,1442,1322,1322,-780,-973,-910,1279,1278,1277,1262,1276,1261,1275,1215,1260,1229,-959,974,974,989,989,-943,735,478,478,495,463,506,414,-1039,1003,958,1017,927,942,987,957,431,476,1272,1167,1228,-1183,1256,-1199,895,895,941,941,1242,1227,1212,1135,1014,1014,490,489,503,487,910,1013,985,925,863,894,970,955,1012,847,-1343,831,755,755,984,909,428,366,754,559,-1391,752,486,457,924,997,698,698,983,893,740,740,908,877,739,739,667,667,953,938,497,287,271,271,683,606,590,712,726,574,302,302,738,736,481,286,526,725,605,711,636,724,696,651,589,681,666,710,364,467,573,695,466,466,301,465,379,379,709,604,665,679,316,316,634,633,436,436,464,269,424,394,452,332,438,363,347,408,393,448,331,422,362,407,392,421,346,406,391,376,375,359,1441,1306,-2367,1290,-2383,1337,-2399,-2415,1426,1321,-2431,1411,1336,-2447,-2463,-2479,1169,1169,1049,1049,1424,1289,1412,1352,1319,-2495,1154,1154,1064,1064,1153,1153,416,390,360,404,403,389,344,374,373,343,358,372,327,357,342,311,356,326,1395,1394,1137,1137,1047,1047,1365,1392,1287,1379,1334,1364,1349,1378,1318,1363,792,792,792,792,1152,1152,1032,1032,1121,1121,1046,1046,1120,1120,1030,1030,-2895,1106,1061,1104,849,849,789,789,1091,1076,1029,1090,1060,1075,833,833,309,324,532,532,832,772,818,803,561,561,531,560,515,546,289,274,288,258,
|
||||
-250,-1179,-1579,-1836,-1996,-2124,-2253,-2333,-2413,-2477,-2542,-2574,-2607,-2622,-2655,1314,1313,1298,1312,1282,785,785,785,785,1040,1040,1025,1025,768,768,768,768,-766,-798,-830,-862,-895,-911,-927,-943,-959,-975,-991,-1007,-1023,-1039,-1055,-1070,1724,1647,-1103,-1119,1631,1767,1662,1738,1708,1723,-1135,1780,1615,1779,1599,1677,1646,1778,1583,-1151,1777,1567,1737,1692,1765,1722,1707,1630,1751,1661,1764,1614,1736,1676,1763,1750,1645,1598,1721,1691,1762,1706,1582,1761,1566,-1167,1749,1629,767,766,751,765,494,494,735,764,719,749,734,763,447,447,748,718,477,506,431,491,446,476,461,505,415,430,475,445,504,399,460,489,414,503,383,474,429,459,502,502,746,752,488,398,501,473,413,472,486,271,480,270,-1439,-1455,1357,-1471,-1487,-1503,1341,1325,-1519,1489,1463,1403,1309,-1535,1372,1448,1418,1476,1356,1462,1387,-1551,1475,1340,1447,1402,1386,-1567,1068,1068,1474,1461,455,380,468,440,395,425,410,454,364,467,466,464,453,269,409,448,268,432,1371,1473,1432,1417,1308,1460,1355,1446,1459,1431,1083,1083,1401,1416,1458,1445,1067,1067,1370,1457,1051,1051,1291,1430,1385,1444,1354,1415,1400,1443,1082,1082,1173,1113,1186,1066,1185,1050,-1967,1158,1128,1172,1097,1171,1081,-1983,1157,1112,416,266,375,400,1170,1142,1127,1065,793,793,1169,1033,1156,1096,1141,1111,1155,1080,1126,1140,898,898,808,808,897,897,792,792,1095,1152,1032,1125,1110,1139,1079,1124,882,807,838,881,853,791,-2319,867,368,263,822,852,837,866,806,865,-2399,851,352,262,534,534,821,836,594,594,549,549,593,593,533,533,848,773,579,579,564,578,548,563,276,276,577,576,306,291,516,560,305,305,275,259,
|
||||
-251,-892,-2058,-2620,-2828,-2957,-3023,-3039,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,-559,1530,-575,-591,1528,1527,1407,1526,1391,1023,1023,1023,1023,1525,1375,1268,1268,1103,1103,1087,1087,1039,1039,1523,-604,815,815,815,815,510,495,509,479,508,463,507,447,431,505,415,399,-734,-782,1262,-815,1259,1244,-831,1258,1228,-847,-863,1196,-879,1253,987,987,748,-767,493,493,462,477,414,414,686,669,478,446,461,445,474,429,487,458,412,471,1266,1264,1009,1009,799,799,-1019,-1276,-1452,-1581,-1677,-1757,-1821,-1886,-1933,-1997,1257,1257,1483,1468,1512,1422,1497,1406,1467,1496,1421,1510,1134,1134,1225,1225,1466,1451,1374,1405,1252,1252,1358,1480,1164,1164,1251,1251,1238,1238,1389,1465,-1407,1054,1101,-1423,1207,-1439,830,830,1248,1038,1237,1117,1223,1148,1236,1208,411,426,395,410,379,269,1193,1222,1132,1235,1221,1116,976,976,1192,1162,1177,1220,1131,1191,963,963,-1647,961,780,-1663,558,558,994,993,437,408,393,407,829,978,813,797,947,-1743,721,721,377,392,844,950,828,890,706,706,812,859,796,960,948,843,934,874,571,571,-1919,690,555,689,421,346,539,539,944,779,918,873,932,842,903,888,570,570,931,917,674,674,-2575,1562,-2591,1609,-2607,1654,1322,1322,1441,1441,1696,1546,1683,1593,1669,1624,1426,1426,1321,1321,1639,1680,1425,1425,1305,1305,1545,1668,1608,1623,1667,1592,1638,1666,1320,1320,1652,1607,1409,1409,1304,1304,1288,1288,1664,1637,1395,1395,1335,1335,1622,1636,1394,1394,1319,1319,1606,1621,1392,1392,1137,1137,1137,1137,345,390,360,375,404,373,1047,-2751,-2767,-2783,1062,1121,1046,-2799,1077,-2815,1106,1061,789,789,1105,1104,263,355,310,340,325,354,352,262,339,324,1091,1076,1029,1090,1060,1075,833,833,788,788,1088,1028,818,818,803,803,561,561,531,531,816,771,546,546,289,274,288,258,
|
||||
-253,-317,-381,-446,-478,-509,1279,1279,-811,-1179,-1451,-1756,-1900,-2028,-2189,-2253,-2333,-2414,-2445,-2511,-2526,1313,1298,-2559,1041,1041,1040,1040,1025,1025,1024,1024,1022,1007,1021,991,1020,975,1019,959,687,687,1018,1017,671,671,655,655,1016,1015,639,639,758,758,623,623,757,607,756,591,755,575,754,559,543,543,1009,783,-575,-621,-685,-749,496,-590,750,749,734,748,974,989,1003,958,988,973,1002,942,987,957,972,1001,926,986,941,971,956,1000,910,985,925,999,894,970,-1071,-1087,-1102,1390,-1135,1436,1509,1451,1374,-1151,1405,1358,1480,1420,-1167,1507,1494,1389,1342,1465,1435,1450,1326,1505,1310,1493,1373,1479,1404,1492,1464,1419,428,443,472,397,736,526,464,464,486,457,442,471,484,482,1357,1449,1434,1478,1388,1491,1341,1490,1325,1489,1463,1403,1309,1477,1372,1448,1418,1433,1476,1356,1462,1387,-1439,1475,1340,1447,1402,1474,1324,1461,1371,1473,269,448,1432,1417,1308,1460,-1711,1459,-1727,1441,1099,1099,1446,1386,1431,1401,-1743,1289,1083,1083,1160,1160,1458,1445,1067,1067,1370,1457,1307,1430,1129,1129,1098,1098,268,432,267,416,266,400,-1887,1144,1187,1082,1173,1113,1186,1066,1050,1158,1128,1143,1172,1097,1171,1081,420,391,1157,1112,1170,1142,1127,1065,1169,1049,1156,1096,1141,1111,1155,1080,1126,1154,1064,1153,1140,1095,1048,-2159,1125,1110,1137,-2175,823,823,1139,1138,807,807,384,264,368,263,868,838,853,791,867,822,852,837,866,806,865,790,-2319,851,821,836,352,262,850,805,849,-2399,533,533,835,820,336,261,578,548,563,577,532,532,832,772,562,562,547,547,305,275,560,515,290,290,288,258 };
|
||||
static const uint8_t tab32[] = { 130,162,193,209,44,28,76,140,9,9,9,9,9,9,9,9,190,254,222,238,126,94,157,157,109,61,173,205 };
|
||||
static const uint8_t tab33[] = { 252,236,220,204,188,172,156,140,124,108,92,76,60,44,28,12 };
|
||||
static const int16_t * const tabindex[2*16] = { tab0,tab1,tab2,tab3,tab0,tab5,tab6,tab7,tab8,tab9,tab10,tab11,tab12,tab13,tab0,tab15,tab16,tab16,tab16,tab16,tab16,tab16,tab16,tab16,tab24,tab24,tab24,tab24,tab24,tab24,tab24,tab24 };
|
||||
static const int16_t tabindex[2*16] = { 0,32,64,98,0,132,180,218,292,364,426,538,648,746,0,1126,1460,1460,1460,1460,1460,1460,1460,1460,1842,1842,1842,1842,1842,1842,1842,1842 };
|
||||
static const uint8_t g_linbits[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,6,8,10,13,4,5,6,7,8,9,11,13 };
|
||||
|
||||
#define PEEK_BITS(n) (bs_cache >> (32 - n))
|
||||
#define FLUSH_BITS(n) {bs_cache <<= (n); bs_sh += (n);}
|
||||
#define CHECK_BITS while (bs_sh >= 0) { bs_cache |= (uint32_t)*bs_next_ptr++ << bs_sh; bs_sh -= 8; }
|
||||
#define BSPOS ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh)
|
||||
#define PEEK_BITS(n) (bs_cache >> (32 - n))
|
||||
#define FLUSH_BITS(n) { bs_cache <<= (n); bs_sh += (n); }
|
||||
#define CHECK_BITS while (bs_sh >= 0) { bs_cache |= (uint32_t)*bs_next_ptr++ << bs_sh; bs_sh -= 8; }
|
||||
#define BSPOS ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh)
|
||||
|
||||
float one = 0.0f;
|
||||
int ireg = 0, big_val_cnt = gr_info->big_values;
|
||||
@@ -790,31 +779,31 @@ static void L3_huffman(float *dst, bs_t *bs, const L3_gr_info_t *gr_info, const
|
||||
{
|
||||
int tab_num = gr_info->table_select[ireg];
|
||||
int sfb_cnt = gr_info->region_count[ireg++];
|
||||
const short * codebook = tabindex[tab_num];
|
||||
const int16_t *codebook = tabs + tabindex[tab_num];
|
||||
int linbits = g_linbits[tab_num];
|
||||
do
|
||||
if (linbits)
|
||||
{
|
||||
np = *sfb++ / 2;
|
||||
pairs_to_decode = MINIMP3_MIN(big_val_cnt, np);
|
||||
one = *scf++;
|
||||
do
|
||||
{
|
||||
int j, w = 5;
|
||||
int leaf = codebook[PEEK_BITS(w)];
|
||||
while (leaf < 0)
|
||||
np = *sfb++ / 2;
|
||||
pairs_to_decode = MINIMP3_MIN(big_val_cnt, np);
|
||||
one = *scf++;
|
||||
do
|
||||
{
|
||||
FLUSH_BITS(w);
|
||||
w = leaf & 7;
|
||||
leaf = codebook[PEEK_BITS(w) - (leaf >> 3)];
|
||||
}
|
||||
FLUSH_BITS(leaf >> 8);
|
||||
|
||||
for (j = 0; j < 2; j++, dst++, leaf >>= 4)
|
||||
{
|
||||
int lsb = leaf & 0x0F;
|
||||
if (lsb)
|
||||
int j, w = 5;
|
||||
int leaf = codebook[PEEK_BITS(w)];
|
||||
while (leaf < 0)
|
||||
{
|
||||
if (lsb == 15 && linbits)
|
||||
FLUSH_BITS(w);
|
||||
w = leaf & 7;
|
||||
leaf = codebook[PEEK_BITS(w) - (leaf >> 3)];
|
||||
}
|
||||
FLUSH_BITS(leaf >> 8);
|
||||
|
||||
for (j = 0; j < 2; j++, dst++, leaf >>= 4)
|
||||
{
|
||||
int lsb = leaf & 0x0F;
|
||||
if (lsb == 15)
|
||||
{
|
||||
lsb += PEEK_BITS(linbits);
|
||||
FLUSH_BITS(linbits);
|
||||
@@ -822,14 +811,42 @@ static void L3_huffman(float *dst, bs_t *bs, const L3_gr_info_t *gr_info, const
|
||||
*dst = one*L3_pow_43(lsb)*((int32_t)bs_cache < 0 ? -1: 1);
|
||||
} else
|
||||
{
|
||||
*dst = g_pow43_signed[lsb*2 + (bs_cache >> 31)]*one;
|
||||
*dst = g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
|
||||
}
|
||||
FLUSH_BITS(1);
|
||||
FLUSH_BITS(lsb ? 1 : 0);
|
||||
}
|
||||
}
|
||||
CHECK_BITS;
|
||||
} while (--pairs_to_decode);
|
||||
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0 );
|
||||
CHECK_BITS;
|
||||
} while (--pairs_to_decode);
|
||||
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
|
||||
} else
|
||||
{
|
||||
do
|
||||
{
|
||||
np = *sfb++ / 2;
|
||||
pairs_to_decode = MINIMP3_MIN(big_val_cnt, np);
|
||||
one = *scf++;
|
||||
do
|
||||
{
|
||||
int j, w = 5;
|
||||
int leaf = codebook[PEEK_BITS(w)];
|
||||
while (leaf < 0)
|
||||
{
|
||||
FLUSH_BITS(w);
|
||||
w = leaf & 7;
|
||||
leaf = codebook[PEEK_BITS(w) - (leaf >> 3)];
|
||||
}
|
||||
FLUSH_BITS(leaf >> 8);
|
||||
|
||||
for (j = 0; j < 2; j++, dst++, leaf >>= 4)
|
||||
{
|
||||
int lsb = leaf & 0x0F;
|
||||
*dst = g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
|
||||
FLUSH_BITS(lsb ? 1 : 0);
|
||||
}
|
||||
CHECK_BITS;
|
||||
} while (--pairs_to_decode);
|
||||
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
|
||||
}
|
||||
}
|
||||
|
||||
for (np = 1 - big_val_cnt;; dst += 4)
|
||||
@@ -845,8 +862,8 @@ static void L3_huffman(float *dst, bs_t *bs, const L3_gr_info_t *gr_info, const
|
||||
{
|
||||
break;
|
||||
}
|
||||
#define RELOAD_SCALEFACTOR if (!--np) {np = *sfb++/2; if (!np) break; one = *scf++;}
|
||||
#define DEQ_COUNT1(s) if (leaf & (128 >> s)) {dst[s] = ((int32_t)bs_cache < 0) ? -one : one; FLUSH_BITS(1)}
|
||||
#define RELOAD_SCALEFACTOR if (!--np) { np = *sfb++/2; if (!np) break; one = *scf++; }
|
||||
#define DEQ_COUNT1(s) if (leaf & (128 >> s)) { dst[s] = ((int32_t)bs_cache < 0) ? -one : one; FLUSH_BITS(1) }
|
||||
RELOAD_SCALEFACTOR;
|
||||
DEQ_COUNT1(0);
|
||||
DEQ_COUNT1(1);
|
||||
@@ -864,14 +881,24 @@ static void L3_midside_stereo(float *left, int n)
|
||||
int i = 0;
|
||||
float *right = left + 576;
|
||||
#if HAVE_SIMD
|
||||
if (have_simd()) for (; i < n - 3; i += 4)
|
||||
if (have_simd())
|
||||
{
|
||||
f4 vl = VLD(left + i);
|
||||
f4 vr = VLD(right + i);
|
||||
VSTORE(left + i, VADD(vl, vr));
|
||||
VSTORE(right + i, VSUB(vl, vr));
|
||||
}
|
||||
for (; i < n - 3; i += 4)
|
||||
{
|
||||
f4 vl = VLD(left + i);
|
||||
f4 vr = VLD(right + i);
|
||||
VSTORE(left + i, VADD(vl, vr));
|
||||
VSTORE(right + i, VSUB(vl, vr));
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
/* Workaround for spurious -Waggressive-loop-optimizations warning from gcc.
|
||||
* For more info see: https://github.com/lieff/minimp3/issues/88
|
||||
*/
|
||||
if (__builtin_constant_p(n % 4 == 0) && n % 4 == 0)
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
#endif /* HAVE_SIMD */
|
||||
for (; i < n; i++)
|
||||
{
|
||||
float a = left[i];
|
||||
@@ -962,7 +989,7 @@ static void L3_intensity_stereo(float *left, uint8_t *ist_pos, const L3_gr_info_
|
||||
int prev = itop - max_blocks;
|
||||
ist_pos[itop] = max_band[i] >= prev ? default_pos : ist_pos[prev];
|
||||
}
|
||||
L3_stereo_process(left, ist_pos, gr->sfbtab, hdr, max_band, gr[1].scalefac_compress&1);
|
||||
L3_stereo_process(left, ist_pos, gr->sfbtab, hdr, max_band, gr[1].scalefac_compress & 1);
|
||||
}
|
||||
|
||||
static void L3_reorder(float *grbuf, float *scratch, const uint8_t *sfb)
|
||||
@@ -979,7 +1006,7 @@ static void L3_reorder(float *grbuf, float *scratch, const uint8_t *sfb)
|
||||
*dst++ = src[2*len];
|
||||
}
|
||||
}
|
||||
memcpy(grbuf, scratch, (dst - scratch) * sizeof(float));
|
||||
memcpy(grbuf, scratch, (dst - scratch)*sizeof(float));
|
||||
}
|
||||
|
||||
static void L3_antialias(float *grbuf, int nbands)
|
||||
@@ -1004,7 +1031,7 @@ static void L3_antialias(float *grbuf, int nbands)
|
||||
vd = VADD(VMUL(vu, vc1), VMUL(vd, vc0));
|
||||
VSTORE(grbuf + 14 - i, VREV(vd));
|
||||
}
|
||||
#endif
|
||||
#endif /* HAVE_SIMD */
|
||||
#ifndef MINIMP3_ONLY_SIMD
|
||||
for(; i < 8; i++)
|
||||
{
|
||||
@@ -1013,7 +1040,7 @@ static void L3_antialias(float *grbuf, int nbands)
|
||||
grbuf[18 + i] = u*g_aa[0][i] - d*g_aa[1][i];
|
||||
grbuf[17 - i] = u*g_aa[1][i] + d*g_aa[0][i];
|
||||
}
|
||||
#endif
|
||||
#endif /* MINIMP3_ONLY_SIMD */
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1102,7 +1129,7 @@ static void L3_imdct36(float *grbuf, float *overlap, const float *window, int nb
|
||||
vsum = VADD(VMUL(vovl, vw1), VMUL(vsum, vw0));
|
||||
VSTORE(grbuf + 14 - i, VREV(vsum));
|
||||
}
|
||||
#endif
|
||||
#endif /* HAVE_SIMD */
|
||||
for (; i < 9; i++)
|
||||
{
|
||||
float ovl = overlap[i];
|
||||
@@ -1302,9 +1329,9 @@ static void mp3d_DCT_II(float *grbuf, int n)
|
||||
{
|
||||
#if HAVE_SSE
|
||||
#define VSAVE2(i, v) _mm_storel_pi((__m64 *)(void*)&y[i*18], v)
|
||||
#else
|
||||
#else /* HAVE_SSE */
|
||||
#define VSAVE2(i, v) vst1_f32((float32_t *)&y[i*18], vget_low_f32(v))
|
||||
#endif
|
||||
#endif /* HAVE_SSE */
|
||||
for (i = 0; i < 7; i++, y += 4*18)
|
||||
{
|
||||
f4 s = VADD(t[3][i], t[3][i + 1]);
|
||||
@@ -1334,10 +1361,10 @@ static void mp3d_DCT_II(float *grbuf, int n)
|
||||
VSAVE4(3, t[3][7]);
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
#endif /* HAVE_SIMD */
|
||||
#ifdef MINIMP3_ONLY_SIMD
|
||||
{}
|
||||
#else
|
||||
{} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */
|
||||
#else /* MINIMP3_ONLY_SIMD */
|
||||
for (; k < n; k++)
|
||||
{
|
||||
float t[4][8], *x, *y = grbuf + k;
|
||||
@@ -1396,21 +1423,32 @@ static void mp3d_DCT_II(float *grbuf, int n)
|
||||
y[2*18] = t[1][7];
|
||||
y[3*18] = t[3][7];
|
||||
}
|
||||
#endif
|
||||
#endif /* MINIMP3_ONLY_SIMD */
|
||||
}
|
||||
|
||||
static short mp3d_scale_pcm(float sample)
|
||||
#ifndef MINIMP3_FLOAT_OUTPUT
|
||||
static int16_t mp3d_scale_pcm(float sample)
|
||||
{
|
||||
if (sample > 32767.0) return (short) 32767;
|
||||
if (sample < -32768.0) return (short)-32768;
|
||||
int s = (int)(sample + .5f);
|
||||
#if HAVE_ARMV6
|
||||
int32_t s32 = (int32_t)(sample + .5f);
|
||||
s32 -= (s32 < 0);
|
||||
int16_t s = (int16_t)minimp3_clip_int16_arm(s32);
|
||||
#else
|
||||
if (sample >= 32766.5) return (int16_t) 32767;
|
||||
if (sample <= -32767.5) return (int16_t)-32768;
|
||||
int16_t s = (int16_t)(sample + .5f);
|
||||
s -= (s < 0); /* away from zero, to be compliant */
|
||||
if (s > 32767) return (short) 32767;
|
||||
if (s < -32768) return (short)-32768;
|
||||
return (short)s;
|
||||
#endif
|
||||
return s;
|
||||
}
|
||||
#else /* MINIMP3_FLOAT_OUTPUT */
|
||||
static float mp3d_scale_pcm(float sample)
|
||||
{
|
||||
return sample*(1.f/32768.f);
|
||||
}
|
||||
#endif /* MINIMP3_FLOAT_OUTPUT */
|
||||
|
||||
static void mp3d_synth_pair(short *pcm, int nch, const float *z)
|
||||
static void mp3d_synth_pair(mp3d_sample_t *pcm, int nch, const float *z)
|
||||
{
|
||||
float a;
|
||||
a = (z[14*64] - z[ 0]) * 29;
|
||||
@@ -1435,11 +1473,11 @@ static void mp3d_synth_pair(short *pcm, int nch, const float *z)
|
||||
pcm[16*nch] = mp3d_scale_pcm(a);
|
||||
}
|
||||
|
||||
static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
static void mp3d_synth(float *xl, mp3d_sample_t *dstl, int nch, float *lins)
|
||||
{
|
||||
int i;
|
||||
float *xr = xl + 576*(nch - 1);
|
||||
short *dstr = dstl + (nch - 1);
|
||||
mp3d_sample_t *dstr = dstl + (nch - 1);
|
||||
|
||||
static const float g_win[] = {
|
||||
-1,26,-31,208,218,401,-519,2063,2000,4788,-5517,7134,5959,35640,-39336,74992,
|
||||
@@ -1458,8 +1496,8 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
-4,7,-91,117,177,-106,-1428,1698,402,545,-9416,9916,-7154,12980,-61289,66494,
|
||||
-5,6,-97,111,163,-127,-1498,1634,185,288,-9585,9838,-8540,11455,-62684,65290
|
||||
};
|
||||
float * zlin = lins + 15*64;
|
||||
const float * w = g_win;
|
||||
float *zlin = lins + 15*64;
|
||||
const float *w = g_win;
|
||||
|
||||
zlin[4*15] = xl[18*16];
|
||||
zlin[4*15 + 1] = xr[18*16];
|
||||
@@ -1480,10 +1518,10 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
if (have_simd()) for (i = 14; i >= 0; i--)
|
||||
{
|
||||
#define VLOAD(k) f4 w0 = VSET(*w++); f4 w1 = VSET(*w++); f4 vz = VLD(&zlin[4*i - 64*k]); f4 vy = VLD(&zlin[4*i - 64*(15 - k)]);
|
||||
#define V0(k) {VLOAD(k) b = VADD(VMUL(vz, w1), VMUL(vy, w0)) ; a = VSUB(VMUL(vz, w0),VMUL(vy, w1)); }
|
||||
#define V1(k) {VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vz, w0),VMUL(vy, w1))); }
|
||||
#define V2(k) {VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vy, w1),VMUL(vz, w0))); }
|
||||
f4 a,b;
|
||||
#define V0(k) { VLOAD(k) b = VADD(VMUL(vz, w1), VMUL(vy, w0)) ; a = VSUB(VMUL(vz, w0), VMUL(vy, w1)); }
|
||||
#define V1(k) { VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vz, w0), VMUL(vy, w1))); }
|
||||
#define V2(k) { VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vy, w1), VMUL(vz, w0))); }
|
||||
f4 a, b;
|
||||
zlin[4*i] = xl[18*(31 - i)];
|
||||
zlin[4*i + 1] = xr[18*(31 - i)];
|
||||
zlin[4*i + 2] = xl[1 + 18*(31 - i)];
|
||||
@@ -1496,6 +1534,7 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
V0(0) V2(1) V1(2) V2(3) V1(4) V2(5) V1(6) V2(7)
|
||||
|
||||
{
|
||||
#ifndef MINIMP3_FLOAT_OUTPUT
|
||||
#if HAVE_SSE
|
||||
static const f4 g_max = { 32767.0f, 32767.0f, 32767.0f, 32767.0f };
|
||||
static const f4 g_min = { -32768.0f, -32768.0f, -32768.0f, -32768.0f };
|
||||
@@ -1509,7 +1548,7 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
dstr[(49 + i)*nch] = _mm_extract_epi16(pcm8, 7);
|
||||
dstl[(47 - i)*nch] = _mm_extract_epi16(pcm8, 2);
|
||||
dstl[(49 + i)*nch] = _mm_extract_epi16(pcm8, 6);
|
||||
#else
|
||||
#else /* HAVE_SSE */
|
||||
int16x4_t pcma, pcmb;
|
||||
a = VADD(a, VSET(0.5f));
|
||||
b = VADD(b, VSET(0.5f));
|
||||
@@ -1523,19 +1562,45 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
vst1_lane_s16(dstr + (49 + i)*nch, pcmb, 3);
|
||||
vst1_lane_s16(dstl + (47 - i)*nch, pcma, 2);
|
||||
vst1_lane_s16(dstl + (49 + i)*nch, pcmb, 2);
|
||||
#endif
|
||||
#endif /* HAVE_SSE */
|
||||
|
||||
#else /* MINIMP3_FLOAT_OUTPUT */
|
||||
|
||||
static const f4 g_scale = { 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f };
|
||||
a = VMUL(a, g_scale);
|
||||
b = VMUL(b, g_scale);
|
||||
#if HAVE_SSE
|
||||
_mm_store_ss(dstr + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(1, 1, 1, 1)));
|
||||
_mm_store_ss(dstr + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(1, 1, 1, 1)));
|
||||
_mm_store_ss(dstl + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(0, 0, 0, 0)));
|
||||
_mm_store_ss(dstl + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(0, 0, 0, 0)));
|
||||
_mm_store_ss(dstr + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(3, 3, 3, 3)));
|
||||
_mm_store_ss(dstr + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(3, 3, 3, 3)));
|
||||
_mm_store_ss(dstl + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(2, 2, 2, 2)));
|
||||
_mm_store_ss(dstl + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(2, 2, 2, 2)));
|
||||
#else /* HAVE_SSE */
|
||||
vst1q_lane_f32(dstr + (15 - i)*nch, a, 1);
|
||||
vst1q_lane_f32(dstr + (17 + i)*nch, b, 1);
|
||||
vst1q_lane_f32(dstl + (15 - i)*nch, a, 0);
|
||||
vst1q_lane_f32(dstl + (17 + i)*nch, b, 0);
|
||||
vst1q_lane_f32(dstr + (47 - i)*nch, a, 3);
|
||||
vst1q_lane_f32(dstr + (49 + i)*nch, b, 3);
|
||||
vst1q_lane_f32(dstl + (47 - i)*nch, a, 2);
|
||||
vst1q_lane_f32(dstl + (49 + i)*nch, b, 2);
|
||||
#endif /* HAVE_SSE */
|
||||
#endif /* MINIMP3_FLOAT_OUTPUT */
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
#endif /* HAVE_SIMD */
|
||||
#ifdef MINIMP3_ONLY_SIMD
|
||||
{}
|
||||
#else
|
||||
{} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */
|
||||
#else /* MINIMP3_ONLY_SIMD */
|
||||
for (i = 14; i >= 0; i--)
|
||||
{
|
||||
#define LOAD(k) float w0 = *w++; float w1 = *w++; float * vz = &zlin[4*i - k*64]; float * vy = &zlin[4*i - (15 - k)*64];
|
||||
#define S0(k) {int j; LOAD(k); for (j = 0; j < 4; j++) b[j] = vz[j] * w1 + vy[j] * w0, a[j] = vz[j] * w0 - vy[j] * w1;}
|
||||
#define S1(k) {int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j] * w1 + vy[j] * w0, a[j] += vz[j] * w0 - vy[j] * w1;}
|
||||
#define S2(k) {int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j] * w1 + vy[j] * w0, a[j] += vy[j] * w1 - vz[j] * w0;}
|
||||
#define LOAD(k) float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - k*64]; float *vy = &zlin[4*i - (15 - k)*64];
|
||||
#define S0(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] = vz[j]*w1 + vy[j]*w0, a[j] = vz[j]*w0 - vy[j]*w1; }
|
||||
#define S1(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; }
|
||||
#define S2(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
|
||||
float a[4], b[4];
|
||||
|
||||
zlin[4*i] = xl[18*(31 - i)];
|
||||
@@ -1558,10 +1623,10 @@ static void mp3d_synth(float *xl, short *dstl, int nch, float *lins)
|
||||
dstl[(47 - i)*nch] = mp3d_scale_pcm(a[2]);
|
||||
dstl[(49 + i)*nch] = mp3d_scale_pcm(b[2]);
|
||||
}
|
||||
#endif
|
||||
#endif /* MINIMP3_ONLY_SIMD */
|
||||
}
|
||||
|
||||
static void mp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int nch, short *pcm, float *lins)
|
||||
static void mp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int nch, mp3d_sample_t *pcm, float *lins)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < nch; i++)
|
||||
@@ -1583,7 +1648,7 @@ static void mp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int n
|
||||
qmf_state[i] = lins[nbands*64 + i];
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
#endif /* MINIMP3_NONSTANDARD_BUT_LOGICAL */
|
||||
{
|
||||
memcpy(qmf_state, lins + nbands*64, sizeof(float)*15*64);
|
||||
}
|
||||
@@ -1626,9 +1691,9 @@ static int mp3d_find_frame(const uint8_t *mp3, int mp3_bytes, int *free_format_b
|
||||
*free_format_bytes = fb;
|
||||
}
|
||||
}
|
||||
|
||||
if (frame_bytes && i + frame_and_padding <= mp3_bytes &&
|
||||
mp3d_match_frame(mp3, mp3_bytes - i, frame_bytes))
|
||||
if ((frame_bytes && i + frame_and_padding <= mp3_bytes &&
|
||||
mp3d_match_frame(mp3, mp3_bytes - i, frame_bytes)) ||
|
||||
(!i && frame_and_padding == mp3_bytes))
|
||||
{
|
||||
*ptr_frame_bytes = frame_and_padding;
|
||||
return i;
|
||||
@@ -1637,7 +1702,7 @@ static int mp3d_find_frame(const uint8_t *mp3, int mp3_bytes, int *free_format_b
|
||||
}
|
||||
}
|
||||
*ptr_frame_bytes = 0;
|
||||
return i;
|
||||
return mp3_bytes;
|
||||
}
|
||||
|
||||
void mp3dec_init(mp3dec_t *dec)
|
||||
@@ -1645,7 +1710,7 @@ void mp3dec_init(mp3dec_t *dec)
|
||||
dec->header[0] = 0;
|
||||
}
|
||||
|
||||
int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, short *pcm, mp3dec_frame_info_t *info)
|
||||
int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_sample_t *pcm, mp3dec_frame_info_t *info)
|
||||
{
|
||||
int i = 0, igr, frame_size = 0, success = 1;
|
||||
const uint8_t *hdr;
|
||||
@@ -1674,11 +1739,17 @@ int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, short
|
||||
hdr = mp3 + i;
|
||||
memcpy(dec->header, hdr, HDR_SIZE);
|
||||
info->frame_bytes = i + frame_size;
|
||||
info->frame_offset = i;
|
||||
info->channels = HDR_IS_MONO(hdr) ? 1 : 2;
|
||||
info->hz = hdr_sample_rate_hz(hdr);
|
||||
info->layer = 4 - HDR_GET_LAYER(hdr);
|
||||
info->bitrate_kbps = hdr_bitrate_kbps(hdr);
|
||||
|
||||
if (!pcm)
|
||||
{
|
||||
return hdr_frame_samples(hdr);
|
||||
}
|
||||
|
||||
bs_init(bs_frame, hdr + HDR_SIZE, frame_size - HDR_SIZE);
|
||||
if (HDR_IS_CRC(hdr))
|
||||
{
|
||||
@@ -1708,7 +1779,7 @@ int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, short
|
||||
{
|
||||
#ifdef MINIMP3_ONLY_MP3
|
||||
return 0;
|
||||
#else
|
||||
#else /* MINIMP3_ONLY_MP3 */
|
||||
L12_scale_info sci[1];
|
||||
L12_read_scale_info(hdr, bs_frame, sci);
|
||||
|
||||
@@ -1729,8 +1800,66 @@ int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, short
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif /* MINIMP3_ONLY_MP3 */
|
||||
}
|
||||
return success*hdr_frame_samples(dec->header);
|
||||
}
|
||||
#endif /*MINIMP3_IMPLEMENTATION*/
|
||||
|
||||
#ifdef MINIMP3_FLOAT_OUTPUT
|
||||
void mp3dec_f32_to_s16(const float *in, int16_t *out, int num_samples)
|
||||
{
|
||||
int i = 0;
|
||||
#if HAVE_SIMD
|
||||
int aligned_count = num_samples & ~7;
|
||||
for(; i < aligned_count; i += 8)
|
||||
{
|
||||
static const f4 g_scale = { 32768.0f, 32768.0f, 32768.0f, 32768.0f };
|
||||
f4 a = VMUL(VLD(&in[i ]), g_scale);
|
||||
f4 b = VMUL(VLD(&in[i+4]), g_scale);
|
||||
#if HAVE_SSE
|
||||
static const f4 g_max = { 32767.0f, 32767.0f, 32767.0f, 32767.0f };
|
||||
static const f4 g_min = { -32768.0f, -32768.0f, -32768.0f, -32768.0f };
|
||||
__m128i pcm8 = _mm_packs_epi32(_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(a, g_max), g_min)),
|
||||
_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(b, g_max), g_min)));
|
||||
out[i ] = _mm_extract_epi16(pcm8, 0);
|
||||
out[i+1] = _mm_extract_epi16(pcm8, 1);
|
||||
out[i+2] = _mm_extract_epi16(pcm8, 2);
|
||||
out[i+3] = _mm_extract_epi16(pcm8, 3);
|
||||
out[i+4] = _mm_extract_epi16(pcm8, 4);
|
||||
out[i+5] = _mm_extract_epi16(pcm8, 5);
|
||||
out[i+6] = _mm_extract_epi16(pcm8, 6);
|
||||
out[i+7] = _mm_extract_epi16(pcm8, 7);
|
||||
#else /* HAVE_SSE */
|
||||
int16x4_t pcma, pcmb;
|
||||
a = VADD(a, VSET(0.5f));
|
||||
b = VADD(b, VSET(0.5f));
|
||||
pcma = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(a), vreinterpretq_s32_u32(vcltq_f32(a, VSET(0)))));
|
||||
pcmb = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(b), vreinterpretq_s32_u32(vcltq_f32(b, VSET(0)))));
|
||||
vst1_lane_s16(out+i , pcma, 0);
|
||||
vst1_lane_s16(out+i+1, pcma, 1);
|
||||
vst1_lane_s16(out+i+2, pcma, 2);
|
||||
vst1_lane_s16(out+i+3, pcma, 3);
|
||||
vst1_lane_s16(out+i+4, pcmb, 0);
|
||||
vst1_lane_s16(out+i+5, pcmb, 1);
|
||||
vst1_lane_s16(out+i+6, pcmb, 2);
|
||||
vst1_lane_s16(out+i+7, pcmb, 3);
|
||||
#endif /* HAVE_SSE */
|
||||
}
|
||||
#endif /* HAVE_SIMD */
|
||||
for(; i < num_samples; i++)
|
||||
{
|
||||
float sample = in[i] * 32768.0f;
|
||||
if (sample >= 32766.5)
|
||||
out[i] = (int16_t) 32767;
|
||||
else if (sample <= -32767.5)
|
||||
out[i] = (int16_t)-32768;
|
||||
else
|
||||
{
|
||||
int16_t s = (int16_t)(sample + .5f);
|
||||
s -= (s < 0); /* away from zero, to be compliant */
|
||||
out[i] = s;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* MINIMP3_FLOAT_OUTPUT */
|
||||
#endif /* MINIMP3_IMPLEMENTATION && !_MINIMP3_IMPLEMENTATION_GUARD */
|
||||
|
||||
Reference in New Issue
Block a user