mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/mp3: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-16 16:27:55 +09:00
parent 3f24b7193a
commit c96b54dbfb
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
audio/mp3/l3.go
View File

@ -28,19 +28,24 @@ import (
"unsafe" "unsafe"
) )
type sfBandIndices struct {
l []int
s []int
}
var ( var (
g_sf_band_indices = [3]sfBandIndices{ sfBandIndicesSet = []sfBandIndices{
{ {
l: [...]int{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 52, 62, 74, 90, 110, 134, 162, 196, 238, 288, 342, 418, 576}, l: []int{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 52, 62, 74, 90, 110, 134, 162, 196, 238, 288, 342, 418, 576},
s: [...]int{0, 4, 8, 12, 16, 22, 30, 40, 52, 66, 84, 106, 136, 192}, s: []int{0, 4, 8, 12, 16, 22, 30, 40, 52, 66, 84, 106, 136, 192},
}, },
{ {
l: [...]int{0, 4, 8, 12, 16, 20, 24, 30, 36, 42, 50, 60, 72, 88, 106, 128, 156, 190, 230, 276, 330, 384, 576}, l: []int{0, 4, 8, 12, 16, 20, 24, 30, 36, 42, 50, 60, 72, 88, 106, 128, 156, 190, 230, 276, 330, 384, 576},
s: [...]int{0, 4, 8, 12, 16, 22, 28, 38, 50, 64, 80, 100, 126, 192}, s: []int{0, 4, 8, 12, 16, 22, 28, 38, 50, 64, 80, 100, 126, 192},
}, },
{ {
l: [...]int{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 54, 66, 82, 102, 126, 156, 194, 240, 296, 364, 448, 550, 576}, l: []int{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 54, 66, 82, 102, 126, 156, 194, 240, 296, 364, 448, 550, 576},
s: [...]int{0, 4, 8, 12, 16, 22, 30, 42, 58, 78, 104, 138, 180, 192}, s: []int{0, 4, 8, 12, 16, 22, 30, 42, 58, 78, 104, 138, 180, 192},
}, },
} }
) )
@ -59,8 +64,8 @@ func L3_Reorder(gr C.unsigned, ch C.unsigned) {
if C.g_side_info.mixed_block_flag[gr][ch] != 0 { if C.g_side_info.mixed_block_flag[gr][ch] != 0 {
sfb = 3 sfb = 3
} }
next_sfb := g_sf_band_indices[sfreq].s[sfb+1] * 3 next_sfb := sfBandIndicesSet[sfreq].s[sfb+1] * 3
win_len := g_sf_band_indices[sfreq].s[sfb+1] - g_sf_band_indices[sfreq].s[sfb] win_len := sfBandIndicesSet[sfreq].s[sfb+1] - sfBandIndicesSet[sfreq].s[sfb]
i := 36 i := 36
if sfb == 0 { if sfb == 0 {
i = 0 i = 0
@ -70,15 +75,15 @@ func L3_Reorder(gr C.unsigned, ch C.unsigned) {
if i == next_sfb { if i == next_sfb {
/* Copy reordered data back to the original vector */ /* Copy reordered data back to the original vector */
for j := 0; j < 3*win_len; j++ { for j := 0; j < 3*win_len; j++ {
C.g_main_data.is[gr][ch][3*g_sf_band_indices[sfreq].s[sfb]+j] = C.float(re[j]) C.g_main_data.is[gr][ch][3*sfBandIndicesSet[sfreq].s[sfb]+j] = C.float(re[j])
} }
/* Check if this band is above the rzero region,if so we're done */ /* Check if this band is above the rzero region,if so we're done */
if C.uint(i) >= C.g_side_info.count1[gr][ch] { if C.uint(i) >= C.g_side_info.count1[gr][ch] {
return return
} }
sfb++ sfb++
next_sfb = g_sf_band_indices[sfreq].s[sfb+1] * 3 next_sfb = sfBandIndicesSet[sfreq].s[sfb+1] * 3
win_len = g_sf_band_indices[sfreq].s[sfb+1] - g_sf_band_indices[sfreq].s[sfb] win_len = sfBandIndicesSet[sfreq].s[sfb+1] - sfBandIndicesSet[sfreq].s[sfb]
} }
for win := 0; win < 3; win++ { /* Do the actual reordering */ for win := 0; win < 3; win++ { /* Do the actual reordering */
for j := 0; j < win_len; j++ { for j := 0; j < win_len; j++ {
@ -89,16 +94,11 @@ func L3_Reorder(gr C.unsigned, ch C.unsigned) {
} }
/* Copy reordered data of last band back to original vector */ /* Copy reordered data of last band back to original vector */
for j := 0; j < 3*win_len; j++ { for j := 0; j < 3*win_len; j++ {
C.g_main_data.is[gr][ch][3*g_sf_band_indices[sfreq].s[12]+j] = C.float(re[j]) C.g_main_data.is[gr][ch][3*sfBandIndicesSet[sfreq].s[12]+j] = C.float(re[j])
} }
} }
} }
type sfBandIndices struct {
l [23]int
s [14]int
}
var ( var (
is_ratios = [6]float32{0.000000, 0.267949, 0.577350, 1.000000, 1.732051, 3.732051} is_ratios = [6]float32{0.000000, 0.267949, 0.577350, 1.000000, 1.732051, 3.732051}
) )
@ -110,8 +110,8 @@ func stereoProcessIntensityLong(gr int, sfb int) {
is_pos := C.g_main_data.scalefac_l[gr][0][sfb] is_pos := C.g_main_data.scalefac_l[gr][0][sfb]
if is_pos != 7 { if is_pos != 7 {
sfreq := C.g_frame_header.sampling_frequency /* Setup sampling freq index */ sfreq := C.g_frame_header.sampling_frequency /* Setup sampling freq index */
sfb_start := g_sf_band_indices[sfreq].l[sfb] sfb_start := sfBandIndicesSet[sfreq].l[sfb]
sfb_stop := g_sf_band_indices[sfreq].l[sfb+1] sfb_stop := sfBandIndicesSet[sfreq].l[sfb+1]
if is_pos == 6 { /* tan((6*PI)/12 = PI/2) needs special treatment! */ if is_pos == 6 { /* tan((6*PI)/12 = PI/2) needs special treatment! */
is_ratio_l = 1.0 is_ratio_l = 1.0
is_ratio_r = 0.0 is_ratio_r = 0.0
@ -132,13 +132,13 @@ func stereoProcessIntensityShort(gr int, sfb int) {
is_ratio_r := float32(0) is_ratio_r := float32(0)
sfreq := C.g_frame_header.sampling_frequency /* Setup sampling freq index */ sfreq := C.g_frame_header.sampling_frequency /* Setup sampling freq index */
/* The window length */ /* The window length */
win_len := g_sf_band_indices[sfreq].s[sfb+1] - g_sf_band_indices[sfreq].s[sfb] win_len := sfBandIndicesSet[sfreq].s[sfb+1] - sfBandIndicesSet[sfreq].s[sfb]
/* The three windows within the band has different scalefactors */ /* The three windows within the band has different scalefactors */
for win := 0; win < 3; win++ { for win := 0; win < 3; win++ {
/* Check that((is_pos[sfb]=scalefac) != 7) => no intensity stereo */ /* Check that((is_pos[sfb]=scalefac) != 7) => no intensity stereo */
is_pos := C.g_main_data.scalefac_s[gr][0][sfb][win] is_pos := C.g_main_data.scalefac_s[gr][0][sfb][win]
if is_pos != 7 { if is_pos != 7 {
sfb_start := g_sf_band_indices[sfreq].s[sfb]*3 + win_len*win sfb_start := sfBandIndicesSet[sfreq].s[sfb]*3 + win_len*win
sfb_stop := sfb_start + win_len sfb_stop := sfb_start + win_len
if is_pos == 6 { /* tan((6*PI)/12 = PI/2) needs special treatment! */ if is_pos == 6 { /* tan((6*PI)/12 = PI/2) needs special treatment! */
is_ratio_l = 1.0 is_ratio_l = 1.0
@ -195,21 +195,21 @@ func L3_Stereo(gr C.unsigned) {
if C.g_side_info.mixed_block_flag[gr][0] != 0 { /* 2 longbl. sb first */ if C.g_side_info.mixed_block_flag[gr][0] != 0 { /* 2 longbl. sb first */
for sfb := 0; sfb < 8; sfb++ { /* First process 8 sfb's at start */ for sfb := 0; sfb < 8; sfb++ { /* First process 8 sfb's at start */
/* Is this scale factor band above count1 for the right channel? */ /* Is this scale factor band above count1 for the right channel? */
if C.unsigned(g_sf_band_indices[sfreq].l[sfb]) >= C.g_side_info.count1[gr][1] { if C.unsigned(sfBandIndicesSet[sfreq].l[sfb]) >= C.g_side_info.count1[gr][1] {
stereoProcessIntensityLong(int(gr), int(sfb)) stereoProcessIntensityLong(int(gr), int(sfb))
} }
} }
/* And next the remaining bands which uses short blocks */ /* And next the remaining bands which uses short blocks */
for sfb := 3; sfb < 12; sfb++ { for sfb := 3; sfb < 12; sfb++ {
/* Is this scale factor band above count1 for the right channel? */ /* Is this scale factor band above count1 for the right channel? */
if C.unsigned(g_sf_band_indices[sfreq].s[sfb])*3 >= C.g_side_info.count1[gr][1] { if C.unsigned(sfBandIndicesSet[sfreq].s[sfb])*3 >= C.g_side_info.count1[gr][1] {
stereoProcessIntensityShort(int(gr), int(sfb)) /* intensity stereo processing */ stereoProcessIntensityShort(int(gr), int(sfb)) /* intensity stereo processing */
} }
} }
} else { /* Only short blocks */ } else { /* Only short blocks */
for sfb := 0; sfb < 12; sfb++ { for sfb := 0; sfb < 12; sfb++ {
/* Is this scale factor band above count1 for the right channel? */ /* Is this scale factor band above count1 for the right channel? */
if C.unsigned(g_sf_band_indices[sfreq].s[sfb])*3 >= C.g_side_info.count1[gr][1] { if C.unsigned(sfBandIndicesSet[sfreq].s[sfb])*3 >= C.g_side_info.count1[gr][1] {
stereoProcessIntensityShort(int(gr), int(sfb)) /* intensity stereo processing */ stereoProcessIntensityShort(int(gr), int(sfb)) /* intensity stereo processing */
} }
} }
@ -217,7 +217,7 @@ func L3_Stereo(gr C.unsigned) {
} else { /* Only long blocks */ } else { /* Only long blocks */
for sfb := 0; sfb < 21; sfb++ { for sfb := 0; sfb < 21; sfb++ {
/* Is this scale factor band above count1 for the right channel? */ /* Is this scale factor band above count1 for the right channel? */
if C.unsigned(g_sf_band_indices[sfreq].l[sfb]) >= C.g_side_info.count1[gr][1] { if C.unsigned(sfBandIndicesSet[sfreq].l[sfb]) >= C.g_side_info.count1[gr][1] {
/* Perform the intensity stereo processing */ /* Perform the intensity stereo processing */
stereoProcessIntensityLong(int(gr), int(sfb)) stereoProcessIntensityLong(int(gr), int(sfb))
} }