mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

device: audio package name changed to alsa 

yobert/alsa imports changed to yalsa
directory and file names changed to reflect package name change
This commit is contained in:
Trek H 2019-11-12 13:28:53 +10:30
parent cbbf3deef8
commit b6dd737034
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
device/audio/audio.go → device/alsa/alsa.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
audio.go alsa.go
AUTHOR AUTHOR
Alan Noble <alan@ausocean.org> Alan Noble <alan@ausocean.org>
@ -23,8 +23,8 @@ LICENSE
If not, see [GNU licenses](http://www.gnu.org/licenses). If not, see [GNU licenses](http://www.gnu.org/licenses).
*/ */
// Package audio provides access to input from audio devices. // Package alsa provides access to input from ALSA audio devices.
package audio package alsa
import ( import (
"bytes" "bytes"
@ -33,7 +33,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/yobert/alsa" yalsa "github.com/yobert/alsa"
"bitbucket.org/ausocean/av/codec/adpcm" "bitbucket.org/ausocean/av/codec/adpcm"
"bitbucket.org/ausocean/av/codec/codecutil" "bitbucket.org/ausocean/av/codec/codecutil"
@ -45,7 +45,7 @@ import (
) )
const ( const (
pkg = "audio: " pkg = "alsa: "
rbTimeout = 100 * time.Millisecond rbTimeout = 100 * time.Millisecond
rbNextTimeout = 100 * time.Millisecond rbNextTimeout = 100 * time.Millisecond
rbLen = 200 rbLen = 200
@ -63,15 +63,15 @@ const (
// An ALSA device holds everything we need to know about the audio input stream and implements io.Reader and device.AVDevice. // An ALSA device holds everything we need to know about the audio input stream and implements io.Reader and device.AVDevice.
type ALSA struct { type ALSA struct {
l Logger // Logger for device's routines to log to. l Logger // Logger for device's routines to log to.
mode uint8 // Operating mode, either running, paused, or stopped. mode uint8 // Operating mode, either running, paused, or stopped.
mu sync.Mutex // Provides synchronisation when changing modes concurrently. mu sync.Mutex // Provides synchronisation when changing modes concurrently.
title string // Name of audio title, or empty for the default title. title string // Name of audio title, or empty for the default title.
dev *alsa.Device // ALSA device's Audio input device. dev *yalsa.Device // ALSA device's Audio input device.
ab alsa.Buffer // ALSA device's buffer. ab yalsa.Buffer // ALSA device's buffer.
rb *ring.Buffer // Our buffer. rb *ring.Buffer // Our buffer.
chunkSize int // This is the number of bytes that will be stored in rb at a time. chunkSize int // This is the number of bytes that will be stored in rb at a time.
Config // Configuration parameters for this device. Config // Configuration parameters for this device.
} }
// Config provides parameters used by the ALSA device. // Config provides parameters used by the ALSA device.
@ -228,11 +228,11 @@ func (d *ALSA) open() error {
// Open sound card and open recording device. // Open sound card and open recording device.
d.l.Log(logger.Debug, pkg+"opening sound card") d.l.Log(logger.Debug, pkg+"opening sound card")
cards, err := alsa.OpenCards() cards, err := yalsa.OpenCards()
if err != nil { if err != nil {
return OpenError(err) return OpenError(err)
} }
defer alsa.CloseCards(cards) defer yalsa.CloseCards(cards)
d.l.Log(logger.Debug, pkg+"finding audio device") d.l.Log(logger.Debug, pkg+"finding audio device")
for _, card := range cards { for _, card := range cards {
@ -241,7 +241,7 @@ func (d *ALSA) open() error {
continue continue
} }
for _, dev := range devices { for _, dev := range devices {
if dev.Type != alsa.PCM || !dev.Record { if dev.Type != yalsa.PCM || !dev.Record {
continue continue
} }
if dev.Title == d.title || d.title == "" { if dev.Title == d.title || d.title == "" {
@ -251,10 +251,10 @@ func (d *ALSA) open() error {
} }
} }
if d.dev == nil { if d.dev == nil {
return OpenError(errors.New("no audio device found")) return OpenError(errors.New("no ALSA device found"))
} }
d.l.Log(logger.Debug, pkg+"opening audio device", "title", d.dev.Title) d.l.Log(logger.Debug, pkg+"opening ALSA device", "title", d.dev.Title)
err = d.dev.Open() err = d.dev.Open()
if err != nil { if err != nil {
return OpenError(err) return OpenError(err)
@ -302,12 +302,12 @@ func (d *ALSA) open() error {
d.l.Log(logger.Debug, pkg+"alsa device sample rate set", "rate", rate) d.l.Log(logger.Debug, pkg+"alsa device sample rate set", "rate", rate)
} }
var aFmt alsa.FormatType var aFmt yalsa.FormatType
switch d.BitDepth { switch d.BitDepth {
case 16: case 16:
aFmt = alsa.S16_LE aFmt = yalsa.S16_LE
case 32: case 32:
aFmt = alsa.S32_LE aFmt = yalsa.S32_LE
default: default:
return OpenError(fmt.Errorf("unsupported sample bits %v", d.BitDepth)) return OpenError(fmt.Errorf("unsupported sample bits %v", d.BitDepth))
} }
@ -317,9 +317,9 @@ func (d *ALSA) open() error {
} }
var bitdepth int var bitdepth int
switch devFmt { switch devFmt {
case alsa.S16_LE: case yalsa.S16_LE:
bitdepth = 16 bitdepth = 16
case alsa.S32_LE: case yalsa.S32_LE:
bitdepth = 32 bitdepth = 32
default: default:
return OpenError(fmt.Errorf("unsupported sample bits %v", d.BitDepth)) return OpenError(fmt.Errorf("unsupported sample bits %v", d.BitDepth))
@ -363,7 +363,7 @@ func (d *ALSA) input() {
continue continue
case stopped: case stopped:
if d.dev != nil { if d.dev != nil {
d.l.Log(logger.Debug, pkg+"closing audio device", "title", d.title) d.l.Log(logger.Debug, pkg+"closing ALSA device", "title", d.title)
d.dev.Close() d.dev.Close()
d.dev = nil d.dev = nil
} }
@ -414,14 +414,14 @@ func (d *ALSA) Read(p []byte) (int, error) {
} }
// formatBuffer returns audio that has been converted to the desired format. // formatBuffer returns audio that has been converted to the desired format.
func (d *ALSA) formatBuffer() alsa.Buffer { func (d *ALSA) formatBuffer() yalsa.Buffer {
var err error var err error
// If nothing needs to be changed, return the original. // If nothing needs to be changed, return the original.
if d.ab.Format.Channels == d.Channels && d.ab.Format.Rate == d.SampleRate { if d.ab.Format.Channels == d.Channels && d.ab.Format.Rate == d.SampleRate {
return d.ab return d.ab
} }
var formatted alsa.Buffer var formatted yalsa.Buffer
if d.ab.Format.Channels != d.Channels { if d.ab.Format.Channels != d.Channels {
// Convert channels. // Convert channels.
// TODO(Trek): Make this work for conversions other than stereo to mono. // TODO(Trek): Make this work for conversions other than stereo to mono.

4
device/audio/audio_test.go → device/alsa/alsa_test.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
audio_test.go alsa_test.go
AUTHOR AUTHOR
Trek Hopton <trek@ausocean.org> Trek Hopton <trek@ausocean.org>
@ -22,7 +22,7 @@ LICENSE
If not, see [GNU licenses](http://www.gnu.org/licenses). If not, see [GNU licenses](http://www.gnu.org/licenses).
*/ */
package audio package alsa
import ( import (
"io/ioutil" "io/ioutil"

14
revid/audio_linux.go
View File

@ -21,28 +21,28 @@ package revid
import ( import (
"time" "time"
"bitbucket.org/ausocean/av/device/audio" "bitbucket.org/ausocean/av/device/alsa"
"bitbucket.org/ausocean/utils/logger" "bitbucket.org/ausocean/utils/logger"
) )
// startAudioDevice is used to start capturing audio from an audio device and processing it. // startAudioDevice is used to start capturing audio from an ALSA audio device and processing it.
// It returns a function that can be used to stop the device and any errors that occur. // It returns a function that can be used to stop the device and any errors that occur.
func (r *Revid) startAudioDevice() (func() error, error) { func (r *Revid) startAudioDevice() (func() error, error) {
// Create audio device. // Create audio device.
ai := audio.NewALSA(r.cfg.Logger) ai := alsa.NewALSA(r.cfg.Logger)
err := ai.Set(r.cfg) err := ai.Set(r.cfg)
if err != nil { if err != nil {
r.cfg.Logger.Log(logger.Fatal, pkg+"failed to setup audio device", "error", err.Error()) r.cfg.Logger.Log(logger.Fatal, pkg+"failed to setup ALSA device", "error", err.Error())
} }
// Start audio device // Start ALSA audio device
err = ai.Start() err = ai.Start()
if err != nil { if err != nil {
r.cfg.Logger.Log(logger.Fatal, pkg+"failed to start audio device", "error", err.Error()) r.cfg.Logger.Log(logger.Fatal, pkg+"failed to start ALSA device", "error", err.Error())
} }
// Process output from audio device. // Process output from ALSA audio device.
r.cfg.ChunkSize = ai.ChunkSize() r.cfg.ChunkSize = ai.ChunkSize()
r.wg.Add(1) r.wg.Add(1)
go r.processFrom(ai, time.Duration(float64(time.Second)/r.cfg.WriteRate)) go r.processFrom(ai, time.Duration(float64(time.Second)/r.cfg.WriteRate))