Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix frame size calculation for configurable sample rates 

Calculate frame size dynamically based on sample rate (20ms frames):
- 48kHz: 960 samples
- 24kHz: 480 samples
- 16kHz: 320 samples
- 12kHz: 240 samples
- 8kHz: 160 samples

Previously hardcoded to 960, causing decoder init failures at non-48kHz rates
This commit is contained in:
Alex P 2025-11-21 01:44:03 +02:00
parent 1dfb4ab77f
commit 57baa14ee6
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/audio/cgo_source.go
View File

@ -83,6 +83,8 @@ func (c *CgoSource) Connect() error {
func (c *CgoSource) connectOutput() error { func (c *CgoSource) connectOutput() error {
os.Setenv("ALSA_CAPTURE_DEVICE", c.alsaDevice) os.Setenv("ALSA_CAPTURE_DEVICE", c.alsaDevice)
frameSize := uint16(c.config.SampleRate * 20 / 1000)
c.logger.Debug(). c.logger.Debug().
Uint16("bitrate_kbps", c.config.Bitrate). Uint16("bitrate_kbps", c.config.Bitrate).
Uint8("complexity", c.config.Complexity). Uint8("complexity", c.config.Complexity).
@ -90,6 +92,7 @@ func (c *CgoSource) connectOutput() error {
Bool("fec", c.config.FECEnabled). Bool("fec", c.config.FECEnabled).
Uint8("buffer_periods", c.config.BufferPeriods). Uint8("buffer_periods", c.config.BufferPeriods).
Uint32("sample_rate", c.config.SampleRate). Uint32("sample_rate", c.config.SampleRate).
Uint16("frame_size", frameSize).
Uint8("packet_loss_perc", c.config.PacketLossPerc). Uint8("packet_loss_perc", c.config.PacketLossPerc).
Msg("Initializing audio capture") Msg("Initializing audio capture")
@ -97,12 +100,12 @@ func (c *CgoSource) connectOutput() error {
C.uint(uint32(c.config.Bitrate)*1000), C.uint(uint32(c.config.Bitrate)*1000),
C.uchar(c.config.Complexity), C.uchar(c.config.Complexity),
C.uint(c.config.SampleRate), C.uint(c.config.SampleRate),
C.uchar(2), // capture_channels C.uchar(2),
C.ushort(960), // frame_size C.ushort(frameSize),
C.ushort(1500), // max_packet_size C.ushort(1500),
C.uint(1000), // sleep_us C.uint(1000),
C.uchar(5), // max_attempts C.uchar(5),
C.uint(500000), // max_backoff C.uint(500000),
boolToUchar(c.config.DTXEnabled), boolToUchar(c.config.DTXEnabled),
boolToUchar(c.config.FECEnabled), boolToUchar(c.config.FECEnabled),
C.uchar(c.config.BufferPeriods), C.uchar(c.config.BufferPeriods),
@ -122,14 +125,16 @@ func (c *CgoSource) connectOutput() error {
func (c *CgoSource) connectInput() error { func (c *CgoSource) connectInput() error {
os.Setenv("ALSA_PLAYBACK_DEVICE", c.alsaDevice) os.Setenv("ALSA_PLAYBACK_DEVICE", c.alsaDevice)
frameSize := uint16(c.config.SampleRate * 20 / 1000)
C.update_audio_decoder_constants( C.update_audio_decoder_constants(
C.uint(c.config.SampleRate), C.uint(c.config.SampleRate),
C.uchar(1), // playback_channels C.uchar(1),
C.ushort(960), // frame_size C.ushort(frameSize),
C.ushort(1500), // max_packet_size C.ushort(1500),
C.uint(1000), // sleep_us C.uint(1000),
C.uchar(5), // max_attempts C.uchar(5),
C.uint(500000), // max_backoff C.uint(500000),
C.uchar(c.config.BufferPeriods), C.uchar(c.config.BufferPeriods),
) )