mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/mp3: Use TypedArray (#642)

Browse Source
This commit is contained in:
Hajime Hoshi 2018-07-07 17:19:47 +09:00
parent 8f12dfc496
commit c0ccc16767
3 changed files with 10 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/mp3/decode_js.go
View File

@ -172,6 +172,14 @@ func init() {
}
}
func float32ArrayToSlice(arr js.Value) []float32 {
f := make([]float32, arr.Length())
a := js.TypedArrayOf(f)
a.Call("set", arr)
a.Release()
return f
}
func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
if offlineAudioContextClass == js.Null() {
return nil, errors.New("audio/mp3: OfflineAudioContext is not available")
@ -187,7 +195,7 @@ func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
// TODO: 1 is a correct second argument?
oc := offlineAudioContextClass.New(2, 1, context.SampleRate())
u8 := js.ValueOf(buf)
u8 := js.TypedArrayOf(buf)
a := u8.Get("buffer").Call("slice", u8.Get("byteOffset"), u8.Get("byteOffset").Int()+u8.Get("byteLength").Int())
oc.Call("decodeAudioData", a, js.NewCallback(func(args []js.Value) {
@ -213,6 +221,7 @@ func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
ch <- errTryAgain
}
}))
u8.Release()
timeout := time.Duration(math.Pow(2, float64(try))) * time.Second

26
audio/mp3/float32_notwasm.go
View File

@ -1,26 +0,0 @@
// Copyright 2018 The Ebiten Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build js,!wasm
package mp3
import (
gjs "github.com/gopherjs/gopherjs/js"
"github.com/gopherjs/gopherwasm/js"
)
func float32ArrayToSlice(arr js.Value) []float32 {
return js.GetInternalObject(arr).(*gjs.Object).Interface().([]float32)
}

38
audio/mp3/float32_wasm.go
View File

@ -1,38 +0,0 @@
// Copyright 2018 The Ebiten Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build js,wasm
package mp3
import (
"reflect"
"syscall/js"
"unsafe"
)
func float32ArrayToSlice(arr js.Value) []float32 {
bytes := make([]byte, arr.Length()*4)
buf := arr.Get("buffer").Call("slice", arr.Get("byteOffset"), arr.Get("byteOffset").Int()+arr.Get("byteLength").Int())
js.ValueOf(bytes).Call("set", js.Global().Get("Uint8Array").New(buf))
bh := (*reflect.SliceHeader)(unsafe.Pointer(&bytes))
var f []float32
fh := (*reflect.SliceHeader)(unsafe.Pointer(&f))
fh.Data = bh.Data
fh.Len = bh.Len / 4
fh.Cap = bh.Cap / 4
return f
}