From df62b162702a35cd94499832a9fb43b2f1600c69 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 31 Dec 2017 01:28:08 +0900 Subject: [PATCH] audio: Use bigger buffer size for mobile phones --- audio/audio.go | 5 +---- audio/buffersize.go | 25 +++++++++++++++++++++++++ audio/buffersize_mobile.go | 21 +++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 audio/buffersize.go create mode 100644 audio/buffersize_mobile.go diff --git a/audio/audio.go b/audio/audio.go index 625c8e47c..35322a000 100644 --- a/audio/audio.go +++ b/audio/audio.go @@ -230,10 +230,7 @@ func (c *Context) loop() { // e.g. a variable for JVM on Android might not be set. <-initCh - // This is a heuristic decision of audio buffer size. - // On most environments, 4096 [bytes] is enough but there are some known environment that is too short (e.g. Windows on Parallels). - bufferSize := 8192 - p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample, bufferSize) + p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample, bufferSize()) if err != nil { audiobinding.SetError(err) return diff --git a/audio/buffersize.go b/audio/buffersize.go new file mode 100644 index 000000000..d80f20c1b --- /dev/null +++ b/audio/buffersize.go @@ -0,0 +1,25 @@ +// Copyright 2017 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 !android +// +build !ios + +package audio + +// bufferSize returns a heuristic decision of audio buffer size. +func bufferSize() int { + // On most desktop environments, 4096 [bytes] is enough + // but there are some known environment that is too short (e.g. Windows on Parallels). + return 8192 +} diff --git a/audio/buffersize_mobile.go b/audio/buffersize_mobile.go new file mode 100644 index 000000000..7ed7e1efe --- /dev/null +++ b/audio/buffersize_mobile.go @@ -0,0 +1,21 @@ +// Copyright 2017 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 android ios + +package audio + +func bufferSize() int { + return 12288 +}