mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pointer arithmetic with a variable index should be in C

Browse Source
This commit is contained in:
Hajime Hoshi 2016-05-14 02:53:14 +09:00
parent 003e3e741e
commit 88fc32c070
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/vorbis/vorbis.go
View File

@ -72,6 +72,10 @@ static inline void assert_impl(int x, const char* sentence) {
#define assert(x) assert_impl(x, #x)
static short short_array_index(short* arr, int index) {
return arr[index];
}
// Copied from stb_vorbis.c (https://github.com/nothings/stb/blob/79f29bafffdbf33cb566102b1635c144beba0f28/stb_vorbis.c)
// Fixes:
// * Replace all 'extern's with 'static'
@ -5543,12 +5547,6 @@ type decoded struct {
bytesPerSample int
}
func (d *decoded) at(offset int) C.short {
const sizeOfShort = 2
p := uintptr(unsafe.Pointer(d.data))
return *(*C.short)(unsafe.Pointer(p + uintptr(offset*sizeOfShort)))
}
func (d *decoded) Read(b []byte) (int, error) {
l := d.sampleNum*d.bytesPerSample - d.posInBytes
if l > len(b) {
@ -5557,7 +5555,7 @@ func (d *decoded) Read(b []byte) (int, error) {
// l must be even so that d.posInBytes is always even.
l = l / 2 * 2
for i := 0; i < l/2; i++ {
s := d.at(d.posInBytes/2 + i)
s := C.short_array_index(d.data, C.int(d.posInBytes/2+i))
b[2*i] = byte(s)
b[2*i+1] = byte(s >> 8)
}