mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 08:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dr_mp3.

Browse Source
This commit is contained in:
David Reid
2019-06-06 17:39:14 +10:00
parent a5ead5e337
commit 8cc7a37810
1 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/dr_mp3.h
+64 -30
View File
@@ -1,6 +1,6 @@
/* /*
MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file. MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
dr_mp3 - v0.4.4 - 2019-05-06 dr_mp3 - v0.4.5 - 2019-06-06
David Reid - mackron@gmail.com David Reid - mackron@gmail.com
@@ -1143,41 +1143,72 @@ static void drmp3_L3_huffman(float *dst, drmp3_bs *bs, const drmp3_L3_gr_info *g
int sfb_cnt = gr_info->region_count[ireg++]; int sfb_cnt = gr_info->region_count[ireg++];
const drmp3_int16 *codebook = tabs + tabindex[tab_num]; const drmp3_int16 *codebook = tabs + tabindex[tab_num];
int linbits = g_linbits[tab_num]; int linbits = g_linbits[tab_num];
do if (linbits)
{ {
np = *sfb++ / 2;
pairs_to_decode = DRMP3_MIN(big_val_cnt, np);
one = *scf++;
do do
{ {
int j, w = 5; np = *sfb++ / 2;
int leaf = codebook[DRMP3_PEEK_BITS(w)]; pairs_to_decode = DRMP3_MIN(big_val_cnt, np);
while (leaf < 0) one = *scf++;
do
{ {
DRMP3_FLUSH_BITS(w); int j, w = 5;
w = leaf & 7; int leaf = codebook[DRMP3_PEEK_BITS(w)];
leaf = codebook[DRMP3_PEEK_BITS(w) - (leaf >> 3)]; while (leaf < 0)
}
DRMP3_FLUSH_BITS(leaf >> 8);
for (j = 0; j < 2; j++, dst++, leaf >>= 4)
{
int lsb = leaf & 0x0F;
if (lsb == 15 && linbits)
{ {
lsb += DRMP3_PEEK_BITS(linbits); DRMP3_FLUSH_BITS(w);
DRMP3_FLUSH_BITS(linbits); w = leaf & 7;
DRMP3_CHECK_BITS; leaf = codebook[DRMP3_PEEK_BITS(w) - (leaf >> 3)];
*dst = one*drmp3_L3_pow_43(lsb)*((drmp3_int32)bs_cache < 0 ? -1: 1);
} else
{
*dst = g_drmp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
} }
DRMP3_FLUSH_BITS(lsb ? 1 : 0); DRMP3_FLUSH_BITS(leaf >> 8);
}
DRMP3_CHECK_BITS; for (j = 0; j < 2; j++, dst++, leaf >>= 4)
} while (--pairs_to_decode); {
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0); int lsb = leaf & 0x0F;
if (lsb == 15)
{
lsb += DRMP3_PEEK_BITS(linbits);
DRMP3_FLUSH_BITS(linbits);
DRMP3_CHECK_BITS;
*dst = one*drmp3_L3_pow_43(lsb)*((int32_t)bs_cache < 0 ? -1: 1);
} else
{
*dst = g_drmp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
}
DRMP3_FLUSH_BITS(lsb ? 1 : 0);
}
DRMP3_CHECK_BITS;
} while (--pairs_to_decode);
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
} else
{
do
{
np = *sfb++ / 2;
pairs_to_decode = DRMP3_MIN(big_val_cnt, np);
one = *scf++;
do
{
int j, w = 5;
int leaf = codebook[DRMP3_PEEK_BITS(w)];
while (leaf < 0)
{
DRMP3_FLUSH_BITS(w);
w = leaf & 7;
leaf = codebook[DRMP3_PEEK_BITS(w) - (leaf >> 3)];
}
DRMP3_FLUSH_BITS(leaf >> 8);
for (j = 0; j < 2; j++, dst++, leaf >>= 4)
{
int lsb = leaf & 0x0F;
*dst = g_drmp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
DRMP3_FLUSH_BITS(lsb ? 1 : 0);
}
DRMP3_CHECK_BITS;
} while (--pairs_to_decode);
} while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
}
} }
for (np = 1 - big_val_cnt;; dst += 4) for (np = 1 - big_val_cnt;; dst += 4)
@@ -3779,6 +3810,9 @@ DIFFERENCES BETWEEN minimp3 AND dr_mp3
/* /*
REVISION HISTORY REVISION HISTORY
================ ================
v0.4.5 - 2019-06-06
- Bring up to date with minimp3.
v0.4.4 - 2019-05-06 v0.4.4 - 2019-05-06
- Fixes to the VC6 build. - Fixes to the VC6 build.