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

audio/mp3: Move Read_Main_L3 to Go

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-14 10:56:42 +09:00
parent 746548f5d2
commit 78626426fe
5 changed files with 160 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/mp3/huffman.go
View File

@ -371,7 +371,7 @@ func Huffman_Decode(table_num C.unsigned, x, y, v, w *C.int32_t) C.int {
*y = C.int32_t(htptr[point] & 0xf)
break
}
if C.Get_Main_Bit() != 0 { /* Go right in tree */
if getMainBit() != 0 { /* Go right in tree */
for (htptr[point] & 0xff) >= 250 {
point += int(htptr[point]) & 0xff
}
@ -399,29 +399,29 @@ func Huffman_Decode(table_num C.unsigned, x, y, v, w *C.int32_t) C.int {
*w = (*y >> 2) & 1
*x = (*y >> 1) & 1
*y = *y & 1
if (*v > 0) && (C.Get_Main_Bit() == 1) {
if (*v > 0) && (getMainBit() == 1) {
*v = -*v
}
if (*w > 0) && (C.Get_Main_Bit() == 1) {
if (*w > 0) && (getMainBit() == 1) {
*w = -*w
}
if (*x > 0) && (C.Get_Main_Bit() == 1) {
if (*x > 0) && (getMainBit() == 1) {
*x = -*x
}
if (*y > 0) && (C.Get_Main_Bit() == 1) {
if (*y > 0) && (getMainBit() == 1) {
*y = -*y
}
} else {
if (linbits > 0) && (*x == 15) {
*x += C.int32_t(C.Get_Main_Bits(C.unsigned(linbits))) /* Get linbits */
*x += C.int32_t(getMainBits(linbits)) /* Get linbits */
}
if (*x > 0) && (C.Get_Main_Bit() == 1) {
if (*x > 0) && (getMainBit() == 1) {
*x = -*x /* Get sign bit */
}
if (linbits > 0) && (*y == 15) {
*y += C.int32_t(C.Get_Main_Bits(C.unsigned(linbits))) /* Get linbits */
*y += C.int32_t(getMainBits(linbits)) /* Get linbits */
}
if (*y > 0) && (C.Get_Main_Bit() == 1) {
if (*y > 0) && (getMainBit() == 1) {
*y = -*y /* Get sign bit */
}
}

162
audio/mp3/maindata.go
View File

@ -17,12 +17,145 @@
package mp3
// #include "pdmp3.h"
//
// extern t_mpeg1_main_data g_main_data;
// extern t_mpeg1_header g_frame_header;
// extern t_mpeg1_side_info g_side_info;
import "C"
import (
"fmt"
)
var mpeg1_scalefac_sizes = [16][2]int{
{0, 0}, {0, 1}, {0, 2}, {0, 3}, {3, 0}, {1, 1}, {1, 2}, {1, 3},
{2, 1}, {2, 2}, {2, 3}, {3, 1}, {3, 2}, {3, 3}, {4, 2}, {4, 3},
}
//export Read_Main_L3
func Read_Main_L3() C.int {
/* Number of channels(1 for mono and 2 for stereo) */
nch := 2
if C.g_frame_header.mode == C.mpeg1_mode_single_channel {
nch = 1
}
/* Calculate header audio data size */
framesize := (144*
g_mpeg1_bitrates[C.g_frame_header.layer-1][C.g_frame_header.bitrate_index])/
g_sampling_frequency[C.g_frame_header.sampling_frequency] +
int(C.g_frame_header.padding_bit)
if framesize > 2000 {
g_error = fmt.Errorf("mp3: framesize = %d", framesize)
return C.ERROR
}
/* Sideinfo is 17 bytes for one channel and 32 bytes for two */
sideinfo_size := 32
if nch == 1 {
sideinfo_size = 17
}
/* Main data size is the rest of the frame,including ancillary data */
main_data_size := framesize - sideinfo_size - 4 /* sync+header */
/* CRC is 2 bytes */
if C.g_frame_header.protection_bit == 0 {
main_data_size -= 2
}
/* Assemble main data buffer with data from this frame and the previous
* two frames. main_data_begin indicates how many bytes from previous
* frames that should be used. This buffer is later accessed by the
* getMainBits function in the same way as the side info is.
*/
if getMainData(main_data_size, int(C.g_side_info.main_data_begin)) != C.OK {
return C.ERROR /* This could be due to not enough data in reservoir */
}
for gr := 0; gr < 2; gr++ {
for ch := 0; ch < nch; ch++ {
part_2_start := Get_Main_Pos()
/* Number of bits in the bitstream for the bands */
slen1 := mpeg1_scalefac_sizes[C.g_side_info.scalefac_compress[gr][ch]][0]
slen2 := mpeg1_scalefac_sizes[C.g_side_info.scalefac_compress[gr][ch]][1]
if (C.g_side_info.win_switch_flag[gr][ch] != 0) && (C.g_side_info.block_type[gr][ch] == 2) {
if C.g_side_info.mixed_block_flag[gr][ch] != 0 {
for sfb := 0; sfb < 8; sfb++ {
C.g_main_data.scalefac_l[gr][ch][sfb] = C.uint(getMainBits(slen1))
}
for sfb := 3; sfb < 12; sfb++ {
/*slen1 for band 3-5,slen2 for 6-11*/
nbits := slen2
if sfb < 6 {
nbits = slen1
}
for win := 0; win < 3; win++ {
C.g_main_data.scalefac_s[gr][ch][sfb][win] = C.uint(getMainBits(nbits))
}
}
} else {
for sfb := 0; sfb < 12; sfb++ {
/*slen1 for band 3-5,slen2 for 6-11*/
nbits := slen2
if sfb < 6 {
nbits = slen1
}
for win := 0; win < 3; win++ {
C.g_main_data.scalefac_s[gr][ch][sfb][win] = C.uint(getMainBits(nbits))
}
}
}
} else { /* block_type == 0 if winswitch == 0 */
/* Scale factor bands 0-5 */
if (C.g_side_info.scfsi[ch][0] == 0) || (gr == 0) {
for sfb := 0; sfb < 6; sfb++ {
C.g_main_data.scalefac_l[gr][ch][sfb] = C.uint(getMainBits(slen1))
}
} else if (C.g_side_info.scfsi[ch][0] == 1) && (gr == 1) {
/* Copy scalefactors from granule 0 to granule 1 */
for sfb := 0; sfb < 6; sfb++ {
C.g_main_data.scalefac_l[1][ch][sfb] = C.g_main_data.scalefac_l[0][ch][sfb]
}
}
/* Scale factor bands 6-10 */
if (C.g_side_info.scfsi[ch][1] == 0) || (gr == 0) {
for sfb := 6; sfb < 11; sfb++ {
C.g_main_data.scalefac_l[gr][ch][sfb] = C.uint(getMainBits(slen1))
}
} else if (C.g_side_info.scfsi[ch][1] == 1) && (gr == 1) {
/* Copy scalefactors from granule 0 to granule 1 */
for sfb := 6; sfb < 11; sfb++ {
C.g_main_data.scalefac_l[1][ch][sfb] = C.g_main_data.scalefac_l[0][ch][sfb]
}
}
/* Scale factor bands 11-15 */
if (C.g_side_info.scfsi[ch][2] == 0) || (gr == 0) {
for sfb := 11; sfb < 16; sfb++ {
C.g_main_data.scalefac_l[gr][ch][sfb] = C.uint(getMainBits(slen2))
}
} else if (C.g_side_info.scfsi[ch][2] == 1) && (gr == 1) {
/* Copy scalefactors from granule 0 to granule 1 */
for sfb := 11; sfb < 16; sfb++ {
C.g_main_data.scalefac_l[1][ch][sfb] = C.uint(C.g_main_data.scalefac_l[0][ch][sfb])
}
}
/* Scale factor bands 16-20 */
if (C.g_side_info.scfsi[ch][3] == 0) || (gr == 0) {
for sfb := 16; sfb < 21; sfb++ {
C.g_main_data.scalefac_l[gr][ch][sfb] = C.uint(getMainBits(slen2))
}
} else if (C.g_side_info.scfsi[ch][3] == 1) && (gr == 1) {
/* Copy scalefactors from granule 0 to granule 1 */
for sfb := 16; sfb < 21; sfb++ {
C.g_main_data.scalefac_l[1][ch][sfb] = C.g_main_data.scalefac_l[0][ch][sfb]
}
}
}
/* Read Huffman coded data. Skip stuffing bits. */
C.Read_Huffman(part_2_start, C.uint(gr), C.uint(ch))
}
}
/* The ancillary data is stored here,but we ignore it. */
return C.OK
}
type mainDataBytes struct {
// Large static data
vec [2 * 1024]int
@ -38,8 +171,7 @@ type mainDataBytes struct {
var theMainDataBytes mainDataBytes
//export Get_Main_Data
func Get_Main_Data(size C.unsigned, begin C.unsigned) C.int {
func getMainData(size int, begin int) int {
if size > 1500 {
g_error = fmt.Errorf("size = %d", size)
}
@ -48,7 +180,7 @@ func Get_Main_Data(size C.unsigned, begin C.unsigned) C.int {
// No,there is not,so we skip decoding this frame,but we have to
// read the main_data bits from the bitstream in case they are needed
// for decoding the next frame.
b, err := getBytes(int(size))
b, err := getBytes(size)
if err != nil {
g_error = err
return C.ERROR
@ -58,12 +190,12 @@ func Get_Main_Data(size C.unsigned, begin C.unsigned) C.int {
theMainDataBytes.ptr = theMainDataBytes.vec[0:]
theMainDataBytes.pos = 0
theMainDataBytes.idx = 0
theMainDataBytes.top += int(size)
theMainDataBytes.top += size
return C.ERROR
}
/* Copy data from previous frames */
for i := 0; i < int(begin); i++ {
theMainDataBytes.vec[i] = theMainDataBytes.vec[theMainDataBytes.top-int(begin)+i]
for i := 0; i < begin; i++ {
theMainDataBytes.vec[i] = theMainDataBytes.vec[theMainDataBytes.top-begin+i]
}
/* Read the main_data from file */
b, err := getBytes(int(size))
@ -76,22 +208,20 @@ func Get_Main_Data(size C.unsigned, begin C.unsigned) C.int {
theMainDataBytes.ptr = theMainDataBytes.vec[0:]
theMainDataBytes.pos = 0
theMainDataBytes.idx = 0
theMainDataBytes.top = int(begin) + int(size)
theMainDataBytes.top = begin + size
return C.OK
}
//export Get_Main_Bit
func Get_Main_Bit() C.unsigned {
func getMainBit() int {
tmp := uint(theMainDataBytes.ptr[0]) >> (7 - uint(theMainDataBytes.idx))
tmp &= 0x01
theMainDataBytes.ptr = theMainDataBytes.ptr[(theMainDataBytes.idx+1)>>3:]
theMainDataBytes.pos += (theMainDataBytes.idx + 1) >> 3
theMainDataBytes.idx = (theMainDataBytes.idx + 1) & 0x07
return C.unsigned(tmp)
return int(tmp)
}
//export Get_Main_Bits
func Get_Main_Bits(num C.unsigned) C.unsigned {
func getMainBits(num int) int {
if num == 0 {
return 0
}
@ -108,15 +238,15 @@ func Get_Main_Bits(num C.unsigned) C.unsigned {
tmp = tmp << uint(theMainDataBytes.idx)
/* Remove bits after the desired bits */
tmp = tmp >> (32 - num)
tmp = tmp >> (32 - uint(num))
/* Update pointers */
theMainDataBytes.ptr = theMainDataBytes.ptr[(theMainDataBytes.idx+int(num))>>3:]
theMainDataBytes.pos += (theMainDataBytes.idx + int(num)) >> 3
theMainDataBytes.idx = (theMainDataBytes.idx + int(num)) & 0x07
theMainDataBytes.pos += (theMainDataBytes.idx + num) >> 3
theMainDataBytes.idx = (theMainDataBytes.idx + num) & 0x07
/* Done */
return C.unsigned(tmp)
return int(tmp)
}
//export Get_Main_Pos

110
audio/mp3/pdmp3.c
View File

@ -52,7 +52,6 @@ static void L3_Reorder(unsigned gr,unsigned ch);
static void L3_Stereo(unsigned gr);
static void L3_Subband_Synthesis(unsigned gr,unsigned ch,unsigned outdata[576]);
static void Read_Ancillary(void);
static void Read_Huffman(unsigned part_2_start,unsigned gr,unsigned ch);
static void Requantize_Process_Long(unsigned gr,unsigned ch,unsigned is_pos,unsigned sfb);
static void Requantize_Process_Short(unsigned gr,unsigned ch,unsigned is_pos,unsigned sfb,unsigned win);
static void Stereo_Process_Intensity_Long(unsigned gr,unsigned sfb);
@ -70,11 +69,7 @@ static const unsigned g_mpeg1_bitrates[3 /* layer 1-3 */][15 /* header bitrate_i
112000,128000,160000,192000,224000,256000,320000
}
},
g_sampling_frequency[3] = { 44100 * Hz,48000 * Hz,32000 * Hz },
mpeg1_scalefac_sizes[16][2 /* slen1,slen2 */] = {
{0,0},{0,1},{0,2},{0,3},{3,0},{1,1},{1,2},{1,3},
{2,1},{2,2},{2,3},{3,1},{3,2},{3,3},{4,2},{4,3}
};
g_sampling_frequency[3] = { 44100 * Hz,48000 * Hz,32000 * Hz };
static const float //ci[8]={-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037},
cs[8]={0.857493,0.881742,0.949629,0.983315,0.995518,0.999161,0.999899,0.999993},
@ -548,107 +543,6 @@ static int Read_Header(void) {
return(OK); /* Done */
}
/**Description: reads main data for layer 3 from main_data bit reservoir.
* Parameters: None
* Return value: OK or ERROR if the data contains errors.
* Author: Krister Lagerström(krister@kmlager.com) **/
static int Read_Main_L3(void){
unsigned framesize,sideinfo_size,main_data_size,gr,ch,nch,sfb,win,slen1,slen2,nbits,part_2_start;
/* Number of channels(1 for mono and 2 for stereo) */
nch =(g_frame_header.mode == mpeg1_mode_single_channel ? 1 : 2);
/* Calculate header audio data size */
framesize = (144 *
g_mpeg1_bitrates[g_frame_header.layer-1][g_frame_header.bitrate_index]) /
g_sampling_frequency[g_frame_header.sampling_frequency] +
g_frame_header.padding_bit;
if(framesize > 2000) {
ERR("framesize = %d\n",framesize);
return(ERROR);
}
/* Sideinfo is 17 bytes for one channel and 32 bytes for two */
sideinfo_size =(nch == 1 ? 17 : 32);
/* Main data size is the rest of the frame,including ancillary data */
main_data_size = framesize - sideinfo_size - 4 /* sync+header */;
/* CRC is 2 bytes */
if(g_frame_header.protection_bit == 0) main_data_size -= 2;
/* Assemble main data buffer with data from this frame and the previous
* two frames. main_data_begin indicates how many bytes from previous
* frames that should be used. This buffer is later accessed by the
* Get_Main_Bits function in the same way as the side info is.
*/
if(Get_Main_Data(main_data_size,g_side_info.main_data_begin) != OK)
return(ERROR); /* This could be due to not enough data in reservoir */
for(gr = 0; gr < 2; gr++) {
for(ch = 0; ch < nch; ch++) {
part_2_start = Get_Main_Pos();
/* Number of bits in the bitstream for the bands */
slen1 = mpeg1_scalefac_sizes[g_side_info.scalefac_compress[gr][ch]][0];
slen2 = mpeg1_scalefac_sizes[g_side_info.scalefac_compress[gr][ch]][1];
if((g_side_info.win_switch_flag[gr][ch] != 0)&&(g_side_info.block_type[gr][ch] == 2)) {
if(g_side_info.mixed_block_flag[gr][ch] != 0) {
for(sfb = 0; sfb < 8; sfb++)
g_main_data.scalefac_l[gr][ch][sfb] = Get_Main_Bits(slen1);
for(sfb = 3; sfb < 12; sfb++) {
nbits = (sfb < 6)?slen1:slen2;/*slen1 for band 3-5,slen2 for 6-11*/
for(win = 0; win < 3; win++)
g_main_data.scalefac_s[gr][ch][sfb][win]=Get_Main_Bits(nbits);
}
}else{
for(sfb = 0; sfb < 12; sfb++){
nbits = (sfb < 6)?slen1:slen2;/*slen1 for band 3-5,slen2 for 6-11*/
for(win = 0; win < 3; win++)
g_main_data.scalefac_s[gr][ch][sfb][win]=Get_Main_Bits(nbits);
}
}
}else{ /* block_type == 0 if winswitch == 0 */
/* Scale factor bands 0-5 */
if((g_side_info.scfsi[ch][0] == 0) ||(gr == 0)) {
for(sfb = 0; sfb < 6; sfb++)
g_main_data.scalefac_l[gr][ch][sfb] = Get_Main_Bits(slen1);
}else if((g_side_info.scfsi[ch][0] == 1) &&(gr == 1)) {
/* Copy scalefactors from granule 0 to granule 1 */
for(sfb = 0; sfb < 6; sfb++)
g_main_data.scalefac_l[1][ch][sfb]=g_main_data.scalefac_l[0][ch][sfb];
}
/* Scale factor bands 6-10 */
if((g_side_info.scfsi[ch][1] == 0) ||(gr == 0)) {
for(sfb = 6; sfb < 11; sfb++)
g_main_data.scalefac_l[gr][ch][sfb] = Get_Main_Bits(slen1);
}else if((g_side_info.scfsi[ch][1] == 1) &&(gr == 1)) {
/* Copy scalefactors from granule 0 to granule 1 */
for(sfb = 6; sfb < 11; sfb++)
g_main_data.scalefac_l[1][ch][sfb]=g_main_data.scalefac_l[0][ch][sfb];
}
/* Scale factor bands 11-15 */
if((g_side_info.scfsi[ch][2] == 0) ||(gr == 0)) {
for(sfb = 11; sfb < 16; sfb++)
g_main_data.scalefac_l[gr][ch][sfb] = Get_Main_Bits(slen2);
} else if((g_side_info.scfsi[ch][2] == 1) &&(gr == 1)) {
/* Copy scalefactors from granule 0 to granule 1 */
for(sfb = 11; sfb < 16; sfb++)
g_main_data.scalefac_l[1][ch][sfb]=g_main_data.scalefac_l[0][ch][sfb];
}
/* Scale factor bands 16-20 */
if((g_side_info.scfsi[ch][3] == 0) ||(gr == 0)) {
for(sfb = 16; sfb < 21; sfb++)
g_main_data.scalefac_l[gr][ch][sfb] = Get_Main_Bits(slen2);
}else if((g_side_info.scfsi[ch][3] == 1) &&(gr == 1)) {
/* Copy scalefactors from granule 0 to granule 1 */
for(sfb = 16; sfb < 21; sfb++)
g_main_data.scalefac_l[1][ch][sfb]=g_main_data.scalefac_l[0][ch][sfb];
}
}
/* Read Huffman coded data. Skip stuffing bits. */
Read_Huffman(part_2_start,gr,ch);
} /* end for(gr... */
} /* end for(ch... */
/* The ancillary data is stored here,but we ignore it. */
return(OK); /* Done */
}
/**Description: TBD
* Parameters: TBD
* Return value: TBD
@ -1015,7 +909,7 @@ static void L3_Subband_Synthesis(unsigned gr,unsigned ch,unsigned outdata[576]){
* Parameters: None
* Return value: None. The data is stored in g_main_data.is[ch][gr][freqline].
* Author: Krister Lagerström(krister@kmlager.com) **/
static void Read_Huffman(unsigned part_2_start,unsigned gr,unsigned ch){
void Read_Huffman(unsigned part_2_start,unsigned gr,unsigned ch){
int32_t x,y,v,w;
unsigned table_num,is_pos,bit_pos_end,sfreq;
unsigned region_1_start,region_2_start; /* region_0_start = 0 */

8
audio/mp3/pdmp3.h
View File

@ -91,17 +91,13 @@ int Decode_L3(void);
int Read_Frame(void);
size_t writeToWriter(void* data, int size);
int Get_Main_Data(unsigned main_data_size,unsigned main_data_begin);
unsigned Get_Main_Bit(void);
unsigned Get_Main_Bits(unsigned number_of_bits);
unsigned Get_Main_Pos(void);
int Set_Main_Pos(unsigned bit_pos);
unsigned Get_Main_Bit(void);
unsigned Get_Main_Bits(unsigned number_of_bits);
int Read_Main_L3(void);
int Read_Audio_L3(void);
static int Read_Header(void);
static int Read_Main_L3(void);
void Read_Huffman(unsigned part_2_start,unsigned gr,unsigned ch);
void IMDCT_Win(float* in, float* out,unsigned block_type);

1
audio/mp3/sideinfo.go
View File

@ -20,7 +20,6 @@ package mp3
//
// extern t_mpeg1_header g_frame_header;
// extern t_mpeg1_side_info g_side_info;
// extern t_mpeg1_main_data g_main_data;
import "C"
import (