4 Commits

Author SHA1 Message Date
6ac23c28f1 feat(audio): 添加单声道转立体声转换功能
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
- 新增 monoToStereoReader 将单声道 WAV 实时转换为立体声
- PlayWav 自动检测单声道并应用转换管线
- 添加完整的单元测试覆盖转换逻辑
- 整理 import 顺序(goimports)

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-09 10:34:45 +08:00
9825a85359 refactor: 采用 Go 1.22+ 语法简化循环和切片初始化
- 使用  替代
- 简化  为
- 统一代码风格,移除冗余的容量参数

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-09 10:34:25 +08:00
e8618f4888 chore(ci): 将 Woodpecker CI 构建镜像升级到 Go 1.26
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
与 go.mod 中声明的 Go 1.26 版本保持一致

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-09 09:43:32 +08:00
ec168be827 feat(audio): 使用 Windowed Sinc 高质量重采样器替代线性插值
Some checks failed
ci/woodpecker/tag/woodpecker Pipeline failed
统一音频输出采样率为 44100Hz,使用 go-audio-resampler 库实现
Windowed Sinc + Polyphase FIR 算法(VeryHigh 28-bit 精度),
替代原有的线性插值透传方案。

主要变更:
- 新增 sincResampler:三阶段 Read 循环(填充→处理→Flush)
- 双缓冲区架构避免输出样本丢失,复用内存减少 GC 压力
- WAV/MP3/BGM 播放管线全部接入 Sinc 重采样器
- 移除旧的 linearResampler 和透传模式

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-09 01:35:04 +08:00
15 changed files with 575 additions and 200 deletions

View File

@@ -10,7 +10,7 @@ clone:
steps: steps:
# 构建多架构二进制文件 # 构建多架构二进制文件
build: build:
image: docker.m.daocloud.io/golang:1.24-trixie image: docker.m.daocloud.io/golang:1.26-trixie
environment: environment:
GOPROXY: https://goproxy.cn GOPROXY: https://goproxy.cn
commands: commands:

View File

@@ -20,7 +20,7 @@ func main() {
} }
defer r.Close() defer r.Close()
for i := 0; i < 4; i++ { for i := range 4 {
func(num int) { func(num int) {
r.On(num) r.On(num)
defer r.Off(num) defer r.Off(num)

8
go.mod
View File

@@ -1,6 +1,6 @@
module game-driver module game-driver
go 1.23.2 go 1.26
require ( require (
github.com/adrg/libvlc-go/v3 v3.1.6 github.com/adrg/libvlc-go/v3 v3.1.6
@@ -14,10 +14,10 @@ require (
github.com/hypebeast/go-osc v0.0.0-20220308234300-cec5a8a1e5f5 github.com/hypebeast/go-osc v0.0.0-20220308234300-cec5a8a1e5f5
github.com/spf13/viper v1.21.0 github.com/spf13/viper v1.21.0
github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11 github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11
github.com/tphakala/go-audio-resampler v1.2.0
github.com/urfave/cli/v3 v3.8.0 github.com/urfave/cli/v3 v3.8.0
github.com/warthog618/go-gpiocdev v0.9.1 github.com/warthog618/go-gpiocdev v0.9.1
github.com/youpy/go-wav v0.3.2 github.com/youpy/go-wav v0.3.2
github.com/zeozeozeo/gomplerate v0.0.0-20250404113140-0fbb236df825
go.uber.org/zap v1.27.0 go.uber.org/zap v1.27.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1
) )
@@ -47,6 +47,7 @@ require (
github.com/spf13/cast v1.10.0 // indirect github.com/spf13/cast v1.10.0 // indirect
github.com/spf13/pflag v1.0.10 // indirect github.com/spf13/pflag v1.0.10 // indirect
github.com/subosito/gotenv v1.6.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect
github.com/tphakala/simd v1.0.22 // indirect
github.com/youpy/go-riff v0.1.0 // indirect github.com/youpy/go-riff v0.1.0 // indirect
github.com/ysmood/fetchup v0.3.0 // indirect github.com/ysmood/fetchup v0.3.0 // indirect
github.com/ysmood/goob v0.4.0 // indirect github.com/ysmood/goob v0.4.0 // indirect
@@ -58,8 +59,9 @@ require (
go.uber.org/multierr v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.37.0 // indirect golang.org/x/net v0.37.0 // indirect
golang.org/x/sys v0.31.0 // indirect golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.28.0 // indirect golang.org/x/text v0.28.0 // indirect
gonum.org/v1/gonum v0.17.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect
) )

12
go.sum
View File

@@ -126,6 +126,10 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11 h1:LJshkcQ14A/7XCgqalheBHv8qLwwOXr/xqttQbjWdHM= github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11 h1:LJshkcQ14A/7XCgqalheBHv8qLwwOXr/xqttQbjWdHM=
github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11/go.mod h1:WU+0TXfVbSctEsUUf4KmIKnfr+tknbjcsnx/TrEIPH4= github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11/go.mod h1:WU+0TXfVbSctEsUUf4KmIKnfr+tknbjcsnx/TrEIPH4=
github.com/tphakala/go-audio-resampler v1.2.0 h1:AeNmdDtAJU0yHkKID7YoUdS2K5ZMNtwbjbDh1hHCMww=
github.com/tphakala/go-audio-resampler v1.2.0/go.mod h1:2jZ7uTFDvnfMZiDkXS1lF/Z7KmsF2tqsNuL/NyceJ2o=
github.com/tphakala/simd v1.0.22 h1:3wHL91t4yvhCB0ycyTznvucTHax+QGpYkvOhqfraTYw=
github.com/tphakala/simd v1.0.22/go.mod h1:8xsPUbOTnNI4WUdPlXVlWXt85Y8RCm3xqGAo8PLxYyA=
github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
@@ -157,8 +161,6 @@ github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY
github.com/zaf/g711 v0.0.0-20190814101024-76a4a538f52b/go.mod h1:T2h1zV50R/q0CVYnsQOQ6L7P4a2ZxH47ixWcMXFGyx8= github.com/zaf/g711 v0.0.0-20190814101024-76a4a538f52b/go.mod h1:T2h1zV50R/q0CVYnsQOQ6L7P4a2ZxH47ixWcMXFGyx8=
github.com/zaf/g711 v1.4.0 h1:XZYkjjiAg9QTBnHqEg37m2I9q3IIDv5JRYXs2N8ma7c= github.com/zaf/g711 v1.4.0 h1:XZYkjjiAg9QTBnHqEg37m2I9q3IIDv5JRYXs2N8ma7c=
github.com/zaf/g711 v1.4.0/go.mod h1:eCDXt3dSp/kYYAoooba7ukD/Q75jvAaS4WOMr0l1Roo= github.com/zaf/g711 v1.4.0/go.mod h1:eCDXt3dSp/kYYAoooba7ukD/Q75jvAaS4WOMr0l1Roo=
github.com/zeozeozeo/gomplerate v0.0.0-20250404113140-0fbb236df825 h1:rViu1xhQRtdJogc39jF46PS01xHVD736JowXl2qOcPM=
github.com/zeozeozeo/gomplerate v0.0.0-20250404113140-0fbb236df825/go.mod h1:ASuMFHITnaVdPvMkoDGI4tTwYG9fW7Mxv2j5AuvTo8Q=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -192,8 +194,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
@@ -206,6 +208,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

View File

@@ -51,12 +51,12 @@ func (d *Device) statusEventHandler(evt gpiocdev.LineEvent) {
// initStatus 读取初始状态 // initStatus 读取初始状态
func (d *Device) initStatus() error { func (d *Device) initStatus() error {
offsets := d.inLines.Offsets() offsets := d.inLines.Offsets()
status := make([]int, len(offsets), len(offsets)) status := make([]int, len(offsets))
err := d.inLines.Values(status) err := d.inLines.Values(status)
if err != nil { if err != nil {
return err return err
} }
for i := 0; i < len(status); i++ { for i := range status {
d.status[offsets[i]] = DefaultStatusLine(status[i]) d.status[offsets[i]] = DefaultStatusLine(status[i])
} }

View File

@@ -13,8 +13,8 @@ var (
) )
const ( const (
UniversalSampleRate = 44100 // 通用采样率(高质量音频) UniversalSampleRate = 44100
DefaultChannelCount = 2 // 声道数(立体声) DefaultChannelCount = 2
) )
func initContext() (*oto.Context, error) { func initContext() (*oto.Context, error) {

View File

@@ -5,7 +5,6 @@ import (
) )
func TestInitContext(t *testing.T) { func TestInitContext(t *testing.T) {
// 第一次调用应该成功
ctx1, err := initContext() ctx1, err := initContext()
if err != nil { if err != nil {
t.Fatalf("第一次 initContext 失败: %v", err) t.Fatalf("第一次 initContext 失败: %v", err)
@@ -14,7 +13,6 @@ func TestInitContext(t *testing.T) {
t.Fatal("返回的 context 不应为 nil") t.Fatal("返回的 context 不应为 nil")
} }
// 第二次调用应该返回相同的 context
ctx2, err := initContext() ctx2, err := initContext()
if err != nil { if err != nil {
t.Fatalf("第二次 initContext 失败: %v", err) t.Fatalf("第二次 initContext 失败: %v", err)

View File

@@ -20,8 +20,15 @@
// defer cleanup() // defer cleanup()
// // ... 播放中 ... // // ... 播放中 ...
// //
// 采样率说明:
// - 统一采样率:固定使用 16000 HzTTS 原生采样率)
// - oto/v3 只支持一个全局 Context统一采样率可避免冲突
// - 其他采样率会自动重采样到 16000 Hz线性插值
// - 16000 Hz 音频TTS正常速度 ✅
// - 44100 Hz 音频BGM自动重采样正常速度 ✅
// - 其他采样率:自动重采样,正常速度 ✅
//
// 资源管理: // 资源管理:
// - 一次性播放: 函数内部自动管理所有资源 // - 一次性播放: 函数内部自动管理所有资源
// - 循环播放: 调用者必须调用 defer cleanup() 清理资源 // - 循环播放: 调用者必须调用 defer cleanup() 清理资源
//
package audio package audio

View File

@@ -9,17 +9,12 @@ import (
"github.com/ebitengine/oto/v3" "github.com/ebitengine/oto/v3"
"github.com/hajimehoshi/go-mp3" "github.com/hajimehoshi/go-mp3"
"go.uber.org/zap"
) )
// PlayMP3Loop 循环播放 MP3(非阻塞) // PlayMP3Loop 循环播放 MP3(非阻塞)
// 返回 player 和清理函数,调用者负责 defer cleanup() // 返回 player 和清理函数,调用者负责 defer cleanup()
func PlayMP3Loop(r io.ReadCloser) (*oto.Player, func() error, error) { func PlayMP3Loop(r io.ReadCloser) (*oto.Player, func() error, error) {
otoCtx, err := initContext()
if err != nil {
r.Close()
return nil, func() error { return nil }, err
}
// Read the entire MP3 into memory for seeking support // Read the entire MP3 into memory for seeking support
data, err := io.ReadAll(r) data, err := io.ReadAll(r)
if err != nil { if err != nil {
@@ -36,15 +31,17 @@ func PlayMP3Loop(r io.ReadCloser) (*oto.Player, func() error, error) {
// 获取采样率信息 // 获取采样率信息
sampleRate := int(dec.SampleRate()) sampleRate := int(dec.SampleRate())
// 需要重采样 // 需要重采样(使用 Sinc 高质量重采样)
var reader io.Reader = dec var reader io.Reader = dec
if needsResampling(sampleRate) { if needsResampling(sampleRate) {
resampleReader, err := newResamplingReader(dec, sampleRate, UniversalSampleRate, 2) zap.S().Infof("BGM Sinc 重采样: %d Hz → %d Hz", sampleRate, UniversalSampleRate)
reader = newSincResampler(dec, sampleRate, UniversalSampleRate, 2)
}
otoCtx, err := initContext()
if err != nil { if err != nil {
return nil, func() error { return nil }, err return nil, func() error { return nil }, err
} }
reader = resampleReader
}
player := otoCtx.NewPlayer(reader) player := otoCtx.NewPlayer(reader)

View File

@@ -7,18 +7,53 @@ import (
"io" "io"
"time" "time"
"github.com/youpy/go-wav"
"github.com/hajimehoshi/go-mp3" "github.com/hajimehoshi/go-mp3"
"github.com/youpy/go-wav"
"go.uber.org/zap" "go.uber.org/zap"
) )
// PlayWav 播放 WAV 文件(阻塞),直到完成或 context 取消 // monoToStereoReader 将单声道音频转换为立体声
func PlayWav(ctx context.Context, r io.ReadCloser) error { type monoToStereoReader struct {
otoCtx, err := initContext() src io.Reader
if err != nil { buf []byte
return fmt.Errorf("音频上下文初始化失败: %w", err)
} }
func (m *monoToStereoReader) Read(p []byte) (int, error) {
maxSamples := len(p) / 4
if maxSamples == 0 {
return 0, nil
}
// 按需分配缓冲区
if cap(m.buf) < maxSamples*2 {
m.buf = make([]byte, maxSamples*2)
}
// 读取单声道数据
n, err := m.src.Read(m.buf[:maxSamples*2])
if n == 0 {
return 0, err
}
// 单声道→立体声:复制每个样本到左右声道
samples := n / 2
for i := range samples {
base := i * 4
mono := i * 2
p[base] = m.buf[mono] // 左声道低字节
p[base+1] = m.buf[mono+1] // 左声道高字节
p[base+2] = m.buf[mono] // 右声道低字节
p[base+3] = m.buf[mono+1] // 右声道高字节
}
if err == io.EOF {
return samples * 4, io.EOF
}
return samples * 4, nil
}
// PlayWav 播放 WAV 文件(阻塞),直到完成或 context 取消
func PlayWav(ctx context.Context, r io.ReadCloser) error {
// Read the entire file into memory since wav.NewReader needs ReadAt // Read the entire file into memory since wav.NewReader needs ReadAt
data, err := io.ReadAll(r) data, err := io.ReadAll(r)
if err != nil { if err != nil {
@@ -40,18 +75,24 @@ func PlayWav(ctx context.Context, r io.ReadCloser) error {
sourceRate := int(format.SampleRate) sourceRate := int(format.SampleRate)
channels := int(format.NumChannels) channels := int(format.NumChannels)
zap.S().Infof("WAV 音频: %d ch, %d Hz, 时长: %v", zap.S().Infof("WAV 音频: %d ch, %d Hz, 时长: %v", channels, sourceRate, duration)
channels, sourceRate, duration)
// 需要重采样 // 构建处理管线:单声道转换 → 重采样
var reader io.Reader = dec reader := io.Reader(dec)
if needsResampling(sourceRate) { if channels == 1 {
zap.S().Infof("重采样: %d Hz → %d Hz", sourceRate, UniversalSampleRate) zap.S().Infof("单声道转立体声: 1 ch → 2 ch")
resampleReader, err := newResamplingReader(dec, sourceRate, UniversalSampleRate, channels) reader = &monoToStereoReader{src: dec}
if err != nil { channels = DefaultChannelCount
return fmt.Errorf("创建重采样器失败: %w", err)
} }
reader = resampleReader
if needsResampling(sourceRate) {
zap.S().Infof("Sinc 重采样: %d Hz → %d Hz, %d ch", sourceRate, UniversalSampleRate, channels)
reader = newSincResampler(reader, sourceRate, UniversalSampleRate, channels)
}
otoCtx, err := initContext()
if err != nil {
return fmt.Errorf("音频上下文初始化失败: %w", err)
} }
player := otoCtx.NewPlayer(reader) player := otoCtx.NewPlayer(reader)
@@ -82,11 +123,6 @@ func PlayWav(ctx context.Context, r io.ReadCloser) error {
// PlayMP3 播放 MP3 文件(阻塞),直到完成或 context 取消 // PlayMP3 播放 MP3 文件(阻塞),直到完成或 context 取消
func PlayMP3(ctx context.Context, r io.ReadCloser) error { func PlayMP3(ctx context.Context, r io.ReadCloser) error {
otoCtx, err := initContext()
if err != nil {
return fmt.Errorf("音频上下文初始化失败: %w", err)
}
dec, err := mp3.NewDecoder(r) dec, err := mp3.NewDecoder(r)
if err != nil { if err != nil {
r.Close() r.Close()
@@ -100,17 +136,19 @@ func PlayMP3(ctx context.Context, r io.ReadCloser) error {
channels := 2 // MP3 通常是立体声 channels := 2 // MP3 通常是立体声
duration := time.Duration(float64(sampleCount)/float64(sampleRate)*1000) * time.Millisecond duration := time.Duration(float64(sampleCount)/float64(sampleRate)*1000) * time.Millisecond
zap.S().Infof("MP3 音频: %d Hz, 时长约: %v", sampleRate, duration) zap.S().Infof("MP3 音频: %d Hz → %d Hz, 时长约: %v",
sampleRate, UniversalSampleRate, duration)
// 需要重采样 // 需要重采样(使用 Sinc 高质量重采样)
var reader io.Reader = dec var reader io.Reader = dec
if needsResampling(sampleRate) { if needsResampling(sampleRate) {
zap.S().Infof("重采样: %d Hz → %d Hz", sampleRate, UniversalSampleRate) zap.S().Infof("Sinc 重采样: %d Hz → %d Hz", sampleRate, UniversalSampleRate)
resampleReader, err := newResamplingReader(dec, sampleRate, UniversalSampleRate, channels) reader = newSincResampler(dec, sampleRate, UniversalSampleRate, channels)
if err != nil {
return fmt.Errorf("创建重采样器失败: %w", err)
} }
reader = resampleReader
otoCtx, err := initContext()
if err != nil {
return fmt.Errorf("音频上下文初始化失败: %w", err)
} }
player := otoCtx.NewPlayer(reader) player := otoCtx.NewPlayer(reader)

View File

@@ -1,7 +1,9 @@
package audio package audio
import ( import (
"bytes"
"context" "context"
"io"
"os" "os"
"testing" "testing"
"time" "time"
@@ -75,3 +77,108 @@ func TestPlayContextCancellation(t *testing.T) {
t.Errorf("期望 context.Canceled 错误,得到: %v", err) t.Errorf("期望 context.Canceled 错误,得到: %v", err)
} }
} }
// TestMonoToStereoReader 测试单声道转立体声
func TestMonoToStereoReader(t *testing.T) {
// 创建测试数据4个单声道样本8字节
monoData := []byte{
0x00, 0x10, // 样本1: 0x1000 = 4096
0x00, 0x20, // 样本2: 0x2000 = 8192
0x00, 0x30, // 样本3: 0x3000 = 12288
0x00, 0x40, // 样本4: 0x4000 = 16384
}
reader := &monoToStereoReader{src: bytes.NewReader(monoData)}
output := make([]byte, 16) // 应该产生8个样本16字节
n, err := reader.Read(output)
if err != nil {
t.Fatalf("读取失败: %v", err)
}
if n != 16 {
t.Fatalf("期望读取16字节实际读取%d字节", n)
}
// 验证立体声输出(每个单声道样本被复制到左右声道)
expected := []byte{
0x00, 0x10, 0x00, 0x10, // 样本1: 左=0x1000, 右=0x1000
0x00, 0x20, 0x00, 0x20, // 样本2: 左=0x2000, 右=0x2000
0x00, 0x30, 0x00, 0x30, // 样本3: 左=0x3000, 右=0x3000
0x00, 0x40, 0x00, 0x40, // 样本4: 左=0x4000, 右=0x4000
}
if !bytes.Equal(output, expected) {
t.Errorf("立体声转换不正确\n期望: %x\n实际: %x", expected, output)
}
}
// TestMonoToStereoReaderStreaming 测试流式读取
func TestMonoToStereoReaderStreaming(t *testing.T) {
// 创建较大的测试数据
monoData := make([]byte, 1000)
for i := range monoData {
monoData[i] = byte(i % 256)
}
reader := &monoToStereoReader{src: bytes.NewReader(monoData)}
totalRead := 0
buf := make([]byte, 32) // 小缓冲区
for {
n, err := reader.Read(buf)
totalRead += n
if err == io.EOF {
break
}
if err != nil {
t.Fatalf("流式读取失败: %v", err)
}
if n == 0 {
t.Fatal("读取返回0字节但未EOF")
}
}
// 1000字节单声道应该转换为2000字节立体声
expectedTotal := 2000
if totalRead != expectedTotal {
t.Fatalf("期望总共读取%d字节实际读取%d字节", expectedTotal, totalRead)
}
}
// TestMonoToStereoReaderPartialRead 测试部分读取
func TestMonoToStereoReaderPartialRead(t *testing.T) {
monoData := []byte{0x00, 0x10, 0x00, 0x20, 0x00, 0x30} // 3个单声道样本
reader := &monoToStereoReader{src: bytes.NewReader(monoData)}
// 第一次读取请求6字节输出只能读取1个单声道样本=4字节输出
buf1 := make([]byte, 6)
n1, err := reader.Read(buf1)
if err != nil {
t.Fatalf("第一次读取失败: %v", err)
}
if n1 != 4 {
t.Fatalf("第一次读取期望4字节实际%d字节", n1)
}
// 第二次读取请求10字节输出读取剩余2个单声道样本=8字节输出
buf2 := make([]byte, 10)
n2, err := reader.Read(buf2)
if err != nil {
t.Fatalf("第二次读取失败: %v", err)
}
// 剩余2个单声道样本转换为8字节立体声
if n2 != 8 {
t.Fatalf("第二次读取期望8字节实际%d字节", n2)
}
// 第三次读取应该返回EOF
buf3 := make([]byte, 10)
n3, err := reader.Read(buf3)
if err != io.EOF {
t.Fatalf("第三次读取期望EOF实际: %v", err)
}
if n3 != 0 {
t.Fatalf("第三次读取EOF时期望0字节实际%d字节", n3)
}
}

View File

@@ -1,142 +0,0 @@
package audio
import (
"io"
"sync"
"github.com/zeozeozeo/gomplerate"
)
const (
resampleBufferSize = 8192 // 重采样缓冲区大小int16 样本数)
)
var (
bufferPool = sync.Pool{
New: func() any {
return make([]byte, resampleBufferSize*2) // int16 = 2 bytes
},
}
)
// resamplingReader 包装 io.Reader 并提供音频重采样
// 使用 io.Reader 接口实现流式重采样
type resamplingReader struct {
source io.Reader
resampler *gomplerate.Resampler
inputBuf []byte // 原始数据缓冲区
outputBuf []byte // 重采样后的输出缓冲区
eof bool
}
// newResamplingReader 创建重采样 reader
// 参数:
// - src: 源数据 reader
// - sourceRate: 源采样率(如 16000
// - targetRate: 目标采样率(如 44100
// - channels: 声道数1=单声道, 2=立体声)
func newResamplingReader(src io.Reader, sourceRate, targetRate, channels int) (io.Reader, error) {
resampler, err := gomplerate.NewResampler(channels, sourceRate, targetRate)
if err != nil {
return nil, err
}
return &resamplingReader{
source: src,
resampler: resampler,
inputBuf: make([]byte, 0, resampleBufferSize*2),
outputBuf: make([]byte, 0, resampleBufferSize*2),
}, nil
}
func (r *resamplingReader) Read(p []byte) (n int, err error) {
// 循环读取直到填满 p 或遇到错误
for len(r.outputBuf) < len(p) {
if r.eof {
break
}
// 读取源数据到输入缓冲区
if err := r.readSource(); err != nil {
if err == io.EOF {
r.eof = true
} else {
return n, err
}
}
// 如果没有数据可处理,退出
if len(r.inputBuf) == 0 {
break
}
// 将字节转换为 int16 并重采样
int16Data := bytesToInt16(r.inputBuf)
resampled := r.resampler.ResampleInt16(int16Data)
// 将重采样后的数据转回字节并追加到输出缓冲区
r.outputBuf = append(r.outputBuf, int16ToBytes(resampled)...)
// 清空输入缓冲区(所有数据已处理)
r.inputBuf = r.inputBuf[:0]
}
// 从输出缓冲区复制数据到 p
n = copy(p, r.outputBuf)
// 移除已读取的数据
if n < len(r.outputBuf) {
r.outputBuf = r.outputBuf[n:]
} else {
r.outputBuf = r.outputBuf[:0]
}
// 如果没有更多数据,返回 EOF
if n == 0 && r.eof && len(r.outputBuf) == 0 {
return 0, io.EOF
}
return n, nil
}
// readSource 从源读取数据到输入缓冲区
func (r *resamplingReader) readSource() error {
const readSize = 4096
// 从池中借用临时缓冲区
tempBuf := bufferPool.Get().([]byte)
defer bufferPool.Put(tempBuf)
// 读取数据
rn, err := r.source.Read(tempBuf[:readSize])
if rn > 0 {
// 追加到输入缓冲区
r.inputBuf = append(r.inputBuf, tempBuf[:rn]...)
}
return err
}
// bytesToInt16 将字节切片转换为 int16 切片(小端序)
func bytesToInt16(b []byte) []int16 {
result := make([]int16, len(b)/2)
for i := range result {
result[i] = int16(b[i*2]) | int16(b[i*2+1])<<8
}
return result
}
// int16ToBytes 将 int16 切片转换为字节切片(小端序)
func int16ToBytes(i []int16) []byte {
result := make([]byte, len(i)*2)
for n, v := range i {
result[n*2] = byte(v)
result[n*2+1] = byte(v >> 8)
}
return result
}
// needsResampling 检查音频是否需要重采样到 UniversalSampleRate
func needsResampling(sourceRate int) bool {
return sourceRate != UniversalSampleRate
}

148
pkg/audio/sinc_resampler.go Normal file
View File

@@ -0,0 +1,148 @@
package audio
import (
"io"
resampling "github.com/tphakala/go-audio-resampler"
"go.uber.org/zap"
)
// minProcessSamples 是 FIR 滤波器产生可靠输出所需的最小输入样本数
const minProcessSamples = 64
// needsResampling 检查是否需要重采样
func needsResampling(sourceRate int) bool {
return sourceRate != UniversalSampleRate
}
// sincResampler 基于 go-audio-resampler 的高质量重采样器
// 使用 Windowed Sinc + Polyphase FIR 算法,专业级音质
type sincResampler struct {
decoder io.Reader
resampler resampling.Resampler
inputBuf []float64 // 输入缓冲区int16→float64 转换后暂存
outputBuf []float64 // 输出缓冲区Process/Flush 产出但未消费的样本
inputBytes []byte // 复用的字节读取缓冲区
flushed bool // 是否已完成 Flush
eof bool // 上游是否已返回 EOF
}
// newSincResampler 创建高质量 Sinc 重采样器
// 使用场景:大广场音效、高保真音乐
func newSincResampler(src io.Reader, inRate, outRate, channels int) io.Reader {
if inRate == outRate {
return src
}
config := &resampling.Config{
InputRate: float64(inRate),
OutputRate: float64(outRate),
Channels: channels,
Quality: resampling.QualitySpec{
Preset: resampling.QualityVeryHigh,
},
}
r, err := resampling.New(config)
if err != nil {
zap.S().Warnf("Sinc 重采样器创建失败,降级为透传: %v", err)
return src
}
return &sincResampler{
decoder: src,
resampler: r,
inputBuf: make([]float64, 0, 4096),
outputBuf: make([]float64, 0, 4096),
inputBytes: make([]byte, 1024),
}
}
func (r *sincResampler) Read(p []byte) (int, error) {
if len(p) < 2 {
return 0, io.ErrShortBuffer
}
maxSamples := len(p) / 2
// 主循环:直到有足够输出数据或 EOF
for len(r.outputBuf) < maxSamples {
// 阶段1从上游读取数据累积到 inputBuf
for len(r.inputBuf) < minProcessSamples && !r.eof {
nn, readErr := r.decoder.Read(r.inputBytes)
if readErr != nil && readErr != io.EOF {
return 0, readErr
}
if readErr == io.EOF || nn == 0 {
r.eof = true
break
}
sampleCount := nn / 2
for i := range sampleCount {
sample := int16(r.inputBytes[i*2]) | int16(r.inputBytes[i*2+1])<<8
r.inputBuf = append(r.inputBuf, float64(sample)/32768.0)
}
}
// 阶段2处理输入数据
if len(r.inputBuf) > 0 {
output, err := r.resampler.Process(r.inputBuf)
if err != nil {
return 0, err
}
r.inputBuf = r.inputBuf[:0]
if len(output) > 0 {
r.outputBuf = append(r.outputBuf, output...)
}
continue
}
// 阶段3EOF 且 inputBuf 为空,调用 Flush 获取尾部残留
if r.eof && !r.flushed {
r.flushed = true
flushed, err := r.resampler.Flush()
if err != nil {
return 0, err
}
if len(flushed) > 0 {
r.outputBuf = append(r.outputBuf, flushed...)
}
continue
}
// 无更多数据可获取
break
}
if len(r.outputBuf) == 0 {
return 0, io.EOF
}
// 写入输出
n := min(len(r.outputBuf), maxSamples)
writeFloat64ToLE16(p, r.outputBuf[:n])
if n < len(r.outputBuf) {
r.outputBuf = r.outputBuf[n:]
} else {
r.outputBuf = r.outputBuf[:0]
}
return n * 2, nil
}
// writeFloat64ToLE16 将 float64 样本转换为 int16 LE 写入 buf
func writeFloat64ToLE16(buf []byte, samples []float64) {
for i, s := range samples {
if s > 1.0 {
s = 1.0
} else if s < -1.0 {
s = -1.0
}
v := int32(s * 32768.0)
if v > 32767 {
v = 32767
}
buf[i*2] = byte(v)
buf[i*2+1] = byte(v >> 8)
}
}

View File

@@ -0,0 +1,216 @@
package audio
import (
"bytes"
"io"
"math"
"testing"
)
// TestSincResamplerUpsampling 测试上采样 16000Hz → 44100Hz
func TestSincResamplerUpsampling(t *testing.T) {
// VeryHigh 质量 FIR 延迟约 969 输入样本,数据量需远超延迟
inputSamples := make([]int16, 8000)
for i := range inputSamples {
inputSamples[i] = int16(math.Sin(2*math.Pi*440.0*float64(i)/16000.0) * 8000)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 16000, 44100, 2).(*sincResampler)
outputSamples := readAllSamples(t, r)
expectedSamples := int(float64(len(inputSamples)) * 44100.0 / 16000.0)
t.Logf("输入: %d 样本 @ 16000Hz", len(inputSamples))
t.Logf("输出: %d 样本 @ 44100Hz (期望 ~%d)", outputSamples, expectedSamples)
if outputSamples == 0 {
t.Fatal("没有输出数据")
}
// 上采样:输出应多于输入
if outputSamples <= len(inputSamples) {
t.Errorf("上采样失败:输出(%d) 应多于输入(%d)", outputSamples, len(inputSamples))
}
assertWithinTolerance(t, outputSamples, expectedSamples, 0.15)
}
// TestSincResamplerPassthrough 测试采样率相同时直接透传
func TestSincResamplerPassthrough(t *testing.T) {
inputSamples := []int16{100, 200, 300, 400, 500, 600}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 16000, 16000, 2)
if _, ok := r.(*bytes.Buffer); !ok {
t.Error("采样率相同时应该直接透传原始 reader")
}
}
// TestSincResamplerDownsampling 测试下采样 44100Hz → 16000Hz
func TestSincResamplerDownsampling(t *testing.T) {
inputSamples := make([]int16, 8000)
for i := range inputSamples {
inputSamples[i] = int16(math.Sin(2*math.Pi*440.0*float64(i)/44100.0) * 8000)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 44100, 16000, 2).(*sincResampler)
outputSamples := readAllSamples(t, r)
expectedSamples := int(float64(len(inputSamples)) * 16000.0 / 44100.0)
t.Logf("输入: %d 样本 @ 44100Hz", len(inputSamples))
t.Logf("输出: %d 样本 @ 16000Hz (期望 ~%d)", outputSamples, expectedSamples)
if outputSamples == 0 {
t.Fatal("没有输出数据")
}
// 下采样:输出应少于输入
if outputSamples >= len(inputSamples) {
t.Errorf("下采样失败:输出(%d) 应少于输入(%d)", outputSamples, len(inputSamples))
}
assertWithinTolerance(t, outputSamples, expectedSamples, 0.15)
}
// TestSincResamplerFlush 测试小数据量时 Flush 获取尾部残留
func TestSincResamplerFlush(t *testing.T) {
// 小数据集:输入少于 FIR 延迟,输出主要来自 Flush
inputSamples := make([]int16, 500)
for i := range inputSamples {
inputSamples[i] = int16(i * 100)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 16000, 44100, 2).(*sincResampler)
outputSamples := readAllSamples(t, r)
t.Logf("小数据输入: %d 样本, 输出: %d 样本 (来自 Flush)", len(inputSamples), outputSamples)
// 即使输入小于延迟Flush 也应产出数据
if outputSamples == 0 {
t.Fatal("Flush 未产生任何数据")
}
}
// TestSincResamplerShortBuffer 测试 io.Reader 边界行为
func TestSincResamplerShortBuffer(t *testing.T) {
inputSamples := make([]int16, 2000)
for i := range inputSamples {
inputSamples[i] = int16(i)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 16000, 44100, 2).(*sincResampler)
// 1 字节 buffer → ErrShortBuffer
_, err := r.Read(make([]byte, 1))
if err != io.ErrShortBuffer {
t.Errorf("期望 io.ErrShortBuffer得到: %v", err)
}
// 2 字节 buffer → 正常工作
buf := make([]byte, 2)
n, err := r.Read(buf)
if n != 2 || err != nil {
t.Errorf("2 字节 buffer 应正常读取: n=%d, err=%v", n, err)
}
}
// TestSincResamplerStreaming 测试流式多次 Read 的正确性
func TestSincResamplerStreaming(t *testing.T) {
inputSamples := make([]int16, 10000)
for i := range inputSamples {
inputSamples[i] = int16(math.Sin(2*math.Pi*440.0*float64(i)/16000.0) * 8000)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, 16000, 44100, 2).(*sincResampler)
// 小 buffer 模拟流式读取
buf := make([]byte, 128)
totalSamples := 0
readCount := 0
for {
n, err := r.Read(buf)
if n > 0 {
totalSamples += n / 2
readCount++
}
if err == io.EOF {
break
}
if err != nil {
t.Fatalf("读取失败: %v", err)
}
}
expectedSamples := int(float64(len(inputSamples)) * 44100.0 / 16000.0)
t.Logf("流式读取: %d 次, 共 %d 样本 (期望 ~%d)", readCount, totalSamples, expectedSamples)
if readCount < 50 {
t.Errorf("流式读取次数过少: %d", readCount)
}
assertWithinTolerance(t, totalSamples, expectedSamples, 0.15)
}
// TestSincResamplerSineWave 测试已知正弦波信号的重采样
func TestSincResamplerSineWave(t *testing.T) {
const freq = 440.0
const inRate = 16000
inputSamples := make([]int16, inRate/4) // 0.25 秒
for i := range inputSamples {
inputSamples[i] = int16(math.Sin(2*math.Pi*freq*float64(i)/float64(inRate)) * 16000)
}
inputData := encodeInt16LE(inputSamples)
r := newSincResampler(inputData, inRate, 44100, 2).(*sincResampler)
output := readAllSamples(t, r)
expected := int(float64(len(inputSamples)) * 44100.0 / float64(inRate))
t.Logf("440Hz 正弦波: %d → %d 样本 (期望 ~%d)", len(inputSamples), output, expected)
if output == 0 {
t.Fatal("正弦波重采样无输出")
}
assertWithinTolerance(t, output, expected, 0.15)
}
// --- 辅助函数 ---
func encodeInt16LE(samples []int16) *bytes.Buffer {
buf := bytes.NewBuffer(nil)
for _, s := range samples {
buf.Write([]byte{byte(s), byte(s >> 8)})
}
return buf
}
func readAllSamples(t *testing.T, r io.Reader) int {
t.Helper()
outputData := bytes.NewBuffer(nil)
buf := make([]byte, 4096)
for {
n, err := r.Read(buf)
if n > 0 {
outputData.Write(buf[:n])
}
if err == io.EOF {
break
}
if err != nil {
t.Fatalf("读取失败: %v", err)
}
}
return outputData.Len() / 2
}
func assertWithinTolerance(t *testing.T, actual, expected int, tolerance float64) {
t.Helper()
delta := math.Abs(float64(actual - expected))
maxDelta := float64(expected) * tolerance
if delta > maxDelta && delta > 10 {
t.Errorf("超出容忍度: 实际 %d, 期望 %d (差: %.0f, 上限: %.0f)",
actual, expected, delta, maxDelta)
}
}

View File

@@ -101,7 +101,7 @@ func (r *reader) GetCardInfo() *CardInfo {
} }
s := make([]string, dataLength) s := make([]string, dataLength)
for i := 0; i < int(dataLength); i++ { for i := range s {
s[i] = fmt.Sprintf("%02X", cardData[i]) s[i] = fmt.Sprintf("%02X", cardData[i])
} }