S.O.N.G/Kirika
S.O.N.G/Kirika
3
0
Fork 0
Code Issues Pull requests Releases Activity

General code inspection cleanup
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
DataHoarder 2022-10-03 11:34:56 +02:00
parent 3f6d1c1571
commit bd069cdf05
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
39 changed files with 102 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/filter/filter_test.go
View file

@ -10,7 +10,7 @@ import (
func TestFilterChainNoResample(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/filter/resample_filter_cgo_test.go
View file

@ -12,7 +12,7 @@ import (
func TestFilterChainResample(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/filter/resample_filter_nocgo_test.go
View file

@ -12,7 +12,7 @@ import (
func TestFilterChainResample(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

30
audio/format/aac/libfdk-aac.go
View file

@ -8,7 +8,7 @@ import (
"fmt"
"git.gammaspectra.live/S.O.N.G/Kirika/audio"
"git.gammaspectra.live/S.O.N.G/go-fdkaac/fdkaac"
aac_adts "github.com/edgeware/mp4ff/aac"
aacAdts "github.com/edgeware/mp4ff/aac"
"github.com/edgeware/mp4ff/mp4"
"golang.org/x/exp/slices"
"io"
@ -45,7 +45,7 @@ func decodeFrame(decoder *fdkaac.AacDecoder, r io.Reader) ([]int16, error) {
return pcm, err
}
header, _, err := aac_adts.DecodeADTSHeader(r)
header, _, err := aacAdts.DecodeADTSHeader(r)
if err != nil {
return nil, err
@ -117,7 +117,7 @@ func decodeFrameMP4(decoder *fdkaac.AacDecoder, demuxer *mp4Decoder) (result []i
func (f Format) Open(r io.ReadSeekCloser) (audio.Source, error) {
decoder := fdkaac.NewAacDecoder()
_, _, err := aac_adts.DecodeADTSHeader(r)
_, _, err := aacAdts.DecodeADTSHeader(r)
if err == nil { //try ADTS
_, err = r.Seek(0, io.SeekStart)
@ -132,7 +132,7 @@ func (f Format) Open(r io.ReadSeekCloser) (audio.Source, error) {
buf, err := decodeFrame(decoder, r)
if err != nil {
decoder.Close()
_ = decoder.Close()
return nil, err
}
@ -178,7 +178,7 @@ func (f Format) Open(r io.ReadSeekCloser) (audio.Source, error) {
buf, err := decodeFrameMP4(decoder, mp4Demuxer)
if err != nil {
decoder.Close()
_ = decoder.Close()
return nil, err
}
@ -404,16 +404,16 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
trackId := init.Moov.Mvhd.NextTrackID - 1
trak := init.Moov.Trak
objType := aac_adts.AAClc
objType := aacAdts.AAClc
if codecMode == 1 {
objType = aac_adts.HEAACv1
objType = aacAdts.HEAACv1
} else if codecMode == 2 {
objType = aac_adts.HEAACv2
objType = aacAdts.HEAACv2
}
{
stsd := trak.Mdia.Minf.Stbl.Stsd
asc := &aac_adts.AudioSpecificConfig{
asc := &aacAdts.AudioSpecificConfig{
ObjectType: byte(objType),
ChannelConfiguration: byte(source.GetChannels()),
SamplingFrequency: source.GetSampleRate(),
@ -422,10 +422,10 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
PSPresentFlag: false,
}
switch objType {
case aac_adts.HEAACv1:
case aacAdts.HEAACv1:
asc.ExtensionFrequency = 2 * source.GetSampleRate()
asc.SBRPresentFlag = true
case aac_adts.HEAACv2:
case aacAdts.HEAACv2:
asc.ExtensionFrequency = 2 * source.GetSampleRate()
asc.SBRPresentFlag = true
asc.ChannelConfiguration = 1
@ -445,7 +445,7 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
stsd.AddChild(mp4a)
}
init.Encode(writer)
_ = init.Encode(writer)
var seqNumber uint32
var packetsWritten uint64
@ -459,7 +459,7 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
seg.AddFragment(frag)
for _, b := range outputBuffer {
frag.AddFullSampleToTrack(mp4.FullSample{
_ = frag.AddFullSampleToTrack(mp4.FullSample{
Sample: mp4.Sample{
Dur: uint32(frameSize),
Size: uint32(len(b)),
@ -470,7 +470,7 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
packetsWritten++
}
seg.Encode(writer)
_ = seg.Encode(writer)
seqNumber++
outputBuffer = make([][]byte, 0, 32)
}
@ -503,7 +503,7 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
return nil
}
func (f Format) Identify(peek []byte, extension string) bool {
func (f Format) Identify(_ []byte, extension string) bool {
//TODO: add .m4a/mp4 detection
return extension == "aac" || extension == "adts"
}

10
audio/format/aac/libfdk-aac_test.go
View file

@ -14,7 +14,7 @@ import (
func TestEncodeAAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -50,7 +50,7 @@ func TestEncodeAAC(t *testing.T) {
func TestDecodeAAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -98,7 +98,7 @@ func TestDecodeAAC(t *testing.T) {
/*
func TestDecodeAACMP4(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -129,7 +129,7 @@ func TestDecodeAACMP4(t *testing.T) {
func TestEncodeAACMP4(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -169,7 +169,7 @@ func TestEncodeAACHEv2(t *testing.T) {
if !fdkaac.EncoderCapabilities().PS {
return
}
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/format/aac/vo-aacenc_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestEncodeAAC(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

8
audio/format/alac/libalac.go
View file

@ -7,7 +7,7 @@ import (
"git.gammaspectra.live/S.O.N.G/Kirika/audio"
"git.gammaspectra.live/S.O.N.G/Kirika/audio/format"
"git.gammaspectra.live/S.O.N.G/Kirika/vector"
go_alac "git.gammaspectra.live/S.O.N.G/go-alac"
goAlac "git.gammaspectra.live/S.O.N.G/go-alac"
"io"
"runtime"
"time"
@ -39,7 +39,7 @@ func (f Format) Open(r io.ReadSeekCloser) (audio.Source, error) {
return nil, err
}
decoder := go_alac.NewFrameDecoder(mp4Demuxer.cookie)
decoder := goAlac.NewFrameDecoder(mp4Demuxer.cookie)
if decoder == nil {
return nil, errors.New("could not decode")
}
@ -97,7 +97,7 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
}
}
encoder := go_alac.NewFormatEncoder(writer, source.GetSampleRate(), source.GetChannels(), bitsPerSample, fastMode, segmentDuration)
encoder := goAlac.NewFormatEncoder(writer, source.GetSampleRate(), source.GetChannels(), bitsPerSample, fastMode, segmentDuration)
if encoder == nil {
return errors.New("could not create encoder")
@ -136,6 +136,6 @@ func (f Format) Encode(source audio.Source, writer io.WriteCloser, options map[s
return nil
}
func (f Format) Identify(peek []byte, extension string) bool {
func (f Format) Identify(_ []byte, extension string) bool {
return extension == "alac" || extension == "mp4" || extension == "m4a"
}

6
audio/format/alac/libalac_test.go
View file

@ -12,7 +12,7 @@ import (
func TestEncodeALAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -47,7 +47,7 @@ func TestEncodeALAC(t *testing.T) {
}
func TestDecodeALAC(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -59,7 +59,7 @@ func TestDecodeALAC(t *testing.T) {
return
}
target, err := os.Open(test.TestSingleSampleALACMP4)
target, err := os.Open(test.SingleSampleALACMP4)
if err != nil {
t.Error(err)
return

2
audio/format/alac/mp4.go
View file

@ -35,7 +35,7 @@ func tryDecodeMP4(r io.ReadSeekCloser) (*mp4Decoder, error) {
trackId = trak.Tkhd.TrackID
buf := new(bytes.Buffer)
box.Encode(buf)
_ = box.Encode(buf)
boxBytes := buf.Bytes()

2
audio/format/flac/goflac_test.go
View file

@ -10,7 +10,7 @@ import (
func TestEncodeFLAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

4
audio/format/flac/libflac_test.go
View file

@ -10,7 +10,7 @@ import (
func TestEncodeFLAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -43,7 +43,7 @@ func TestEncodeFLAC(t *testing.T) {
func TestEncodeFLACOgg(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/format/guess/flac_decode_test.go
View file

@ -8,5 +8,5 @@ import (
)
func TestFLACDecode(t *testing.T) {
DoTest(".flac", test.TestSampleLocations, t)
DoTest(".flac", test.SampleLocations, t)
}

2
audio/format/guess/mp3_decode_test.go
View file

@ -8,5 +8,5 @@ import (
)
func TestMP3Decode(t *testing.T) {
DoTest(".mp3", test.TestSampleLocations, t)
DoTest(".mp3", test.SampleLocations, t)
}

2
audio/format/guess/opus_decode_test.go
View file

@ -8,5 +8,5 @@ import (
)
func TestOpusDecode(t *testing.T) {
DoTest(".opus", test.TestSampleLocations, t)
DoTest(".opus", test.SampleLocations, t)
}

2
audio/format/guess/tta_decode_test.go
View file

@ -8,5 +8,5 @@ import (
)
func TestTTADecode(t *testing.T) {
DoTest(".tta", test.TestSampleLocations, t)
DoTest(".tta", test.SampleLocations, t)
}

2
audio/format/guess/vorbis_decode_test.go
View file

@ -8,5 +8,5 @@ import (
)
func TestVorbisDecode(t *testing.T) {
DoTest(".vorbis", test.TestSampleLocations, t)
DoTest(".vorbis", test.SampleLocations, t)
}

2
audio/format/mp3/mp3_lame_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestEncodeMP3(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/format/opus/opus_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestEncodeOpus(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

6
audio/format/tta/tta.go
View file

@ -49,7 +49,7 @@ func (i fakeReadWriteSeeker) Seek(offset int64, whence int) (int64, error) {
func (i fakeReadWriteSeeker) Close() error {
return i.r.Close()
}
func (i fakeReadWriteSeeker) Write(p []byte) (n int, err error) {
func (i fakeReadWriteSeeker) Write(_ []byte) (n int, err error) {
return 0, io.ErrShortWrite
}
@ -57,10 +57,10 @@ type fakeReadWriteSeeker2 struct {
w io.WriteCloser
}
func (i fakeReadWriteSeeker2) Read(p []byte) (n int, err error) {
func (i fakeReadWriteSeeker2) Read(_ []byte) (n int, err error) {
return 0, io.ErrNoProgress
}
func (i fakeReadWriteSeeker2) Seek(offset int64, whence int) (int64, error) {
func (i fakeReadWriteSeeker2) Seek(_ int64, _ int) (int64, error) {
return 0, io.ErrNoProgress
}
func (i fakeReadWriteSeeker2) Close() error {

2
audio/format/tta/tta_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestEncodeTTA(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/format/vorbis/vorbis_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestEncodeVorbis(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

8
audio/packetizer/adts.go
View file

@ -2,7 +2,7 @@ package packetizer
import (
"bufio"
aac_adts "github.com/edgeware/mp4ff/aac"
aacAdts "github.com/edgeware/mp4ff/aac"
"io"
)
@ -16,7 +16,7 @@ type AdtsPacketizer struct {
type AdtsPacket struct {
sampleNumber int64
header *aac_adts.ADTSHeader
header *aacAdts.ADTSHeader
data []byte
}
@ -42,7 +42,7 @@ func (p *AdtsPacket) GetData() (result []byte) {
return
}
func (p *AdtsPacket) GetDataOffset(offset int64) []byte {
func (p *AdtsPacket) GetDataOffset(_ int64) []byte {
return p.GetData()
}
@ -53,7 +53,7 @@ func NewAdtsPacketizer(reader io.Reader) *AdtsPacketizer {
func (o *AdtsPacketizer) GetPacket() Packet {
packet := &AdtsPacket{}
header, offset, err := aac_adts.DecodeADTSHeader(o.reader)
header, offset, err := aacAdts.DecodeADTSHeader(o.reader)
if err != nil || offset != 0 {
return nil

2
audio/packetizer/adts_hev2_test.go
View file

@ -17,7 +17,7 @@ func TestPacketizeADTSHEv2(t *testing.T) {
if !fdkaac.EncoderCapabilities().PS {
return
}
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/packetizer/adts_test.go
View file

@ -13,7 +13,7 @@ import (
func TestPacketizeADTS(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

16
audio/packetizer/flac.go
View file

@ -562,22 +562,6 @@ func readUnary(br *bitio.Reader) (x uint64, err error) {
return x, nil
}
// WriteUnary encodes x as an unary coded integer, whose value is represented by
// the number of leading zeros before a one.
//
// Examples of unary coded binary on the left and decoded decimal on the right:
//
// 0 => 1
// 1 => 01
// 2 => 001
// 3 => 0001
// 4 => 00001
// 5 => 000001
// 6 => 0000001
func writeUnary(bw *bitio.Writer, x uint64) error {
return bw.WriteBitsUnsafe(1, uint8(x+1))
}
type FLACPacket struct {
mode KeepMode
hdr *FLACHeaderPacket

3
audio/packetizer/flac_crc.go
View file

@ -7,11 +7,14 @@ package packetizer
#include "flac_crc.h"
*/
import "C"
import "runtime"
func flacCrc8(data []byte) uint8 {
defer runtime.KeepAlive(data)
return uint8(C.flac_crc8((*C.uint8_t)(&data[0]), C.size_t(len(data))))
}
func flacCrc16(data []byte) uint16 {
defer runtime.KeepAlive(data)
return uint16(C.flac_crc16((*C.uint8_t)(&data[0]), C.size_t(len(data))))
}

4
audio/packetizer/flac_test.go
View file

@ -14,7 +14,7 @@ import (
func TestPacketizeFLAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -67,7 +67,7 @@ func TestPacketizeFLAC(t *testing.T) {
func TestPacketizeFLACOffset(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/packetizer/mp3.go
View file

@ -36,7 +36,7 @@ func (p *Mp3Packet) GetData() []byte {
return p.frame.Bytes()
}
func (p *Mp3Packet) GetDataOffset(offset int64) []byte {
func (p *Mp3Packet) GetDataOffset(_ int64) []byte {
return p.GetData()
}

2
audio/packetizer/mp3_test.go
View file

@ -13,7 +13,7 @@ import (
func TestPacketizeMP3(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

12
audio/packetizer/ogg.go
View file

@ -51,11 +51,11 @@ func (p *OggPacket) Category() int64 {
func (p *OggPacket) GetData() []byte {
buf := bytes.NewBuffer(make([]byte, 0, 4+1+1+8+4+4+4+1+int(p.header.PageSegments)*(255+1)))
binary.Write(buf, binary.LittleEndian, p.header)
binary.Write(buf, binary.LittleEndian, p.pageSegmentTable)
_ = binary.Write(buf, binary.LittleEndian, p.header)
_ = binary.Write(buf, binary.LittleEndian, p.pageSegmentTable)
for _, segment := range p.segments {
if len(segment) > 0 {
binary.Write(buf, binary.LittleEndian, segment)
_ = binary.Write(buf, binary.LittleEndian, segment)
}
}
@ -69,11 +69,11 @@ func (p *OggPacket) GetDataOffset(offset int64) []byte {
headerClone := p.header
headerClone.AbsoluteGranulePosition -= offset
headerClone.PageChecksum = 0
binary.Write(buf, binary.LittleEndian, headerClone)
binary.Write(buf, binary.LittleEndian, p.pageSegmentTable)
_ = binary.Write(buf, binary.LittleEndian, headerClone)
_ = binary.Write(buf, binary.LittleEndian, p.pageSegmentTable)
for _, segment := range p.segments {
if len(segment) > 0 {
binary.Write(buf, binary.LittleEndian, segment)
_ = binary.Write(buf, binary.LittleEndian, segment)
}
}

2
audio/packetizer/ogg_crc.go
View file

@ -7,7 +7,9 @@ package packetizer
#include "ogg_crc.h"
*/
import "C"
import "runtime"
func oggCrc32(p []byte) uint32 {
defer runtime.KeepAlive(p)
return uint32(C.ogg_crc32((*C.uint8_t)(&p[0]), C.size_t(len(p))))
}

4
audio/packetizer/ogg_flac_test.go
View file

@ -12,7 +12,7 @@ import (
func TestPacketizeOggFLAC(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -58,7 +58,7 @@ func TestPacketizeOggFLAC(t *testing.T) {
func TestPacketizeOggFLACOffset(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

4
audio/packetizer/ogg_opus_test.go
View file

@ -13,7 +13,7 @@ import (
func TestPacketizeOpusOgg(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -57,7 +57,7 @@ func TestPacketizeOpusOgg(t *testing.T) {
func TestPacketizeOggOpusOffset(t *testing.T) {
t.Parallel()
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return

2
audio/queue/queue_test.go
View file

@ -17,7 +17,7 @@ func TestQueue(t *testing.T) {
q := NewQueue(audio.SourceInt16, 16, sampleRate, 2)
flacFormat := guess.GetDecoder("flac")
for _, location := range test.TestSampleLocations {
for _, location := range test.SampleLocations {
entries, err := os.ReadDir(location)
if err != nil {
t.Error(err)

35
audio/replaygain/normalization_test.go
View file

@ -14,7 +14,7 @@ import (
func TestReplayGainNormalization24(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -43,7 +43,7 @@ func TestReplayGainNormalization24(t *testing.T) {
func TestReplayGain24(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -70,7 +70,7 @@ func TestReplayGain24(t *testing.T) {
func TestReplayGain16(t *testing.T) {
fp, err := os.Open(test.TestSingleSample16)
fp, err := os.Open(test.SingleSample16)
if err != nil {
t.Error(err)
return
@ -97,7 +97,7 @@ func TestReplayGain16(t *testing.T) {
func TestAlbumReplayGain(t *testing.T) {
location := test.TestSampleLocations[1]
location := test.SampleLocations[1]
entries, err := os.ReadDir(location)
if err != nil {
t.Error(err)
@ -114,19 +114,22 @@ func TestAlbumReplayGain(t *testing.T) {
t.Error(err)
return
}
defer fp.Close()
decoders, err := guess.GetDecoders(fp, fullPath)
if err != nil {
t.Error(err)
return
}
source, err := guess.Open(fp, decoders)
if err != nil {
t.Error(err)
return
}
func() {
defer fp.Close()
decoders, err := guess.GetDecoders(fp, fullPath)
if err != nil {
t.Error(err)
return
}
source, err := guess.Open(fp, decoders)
if err != nil {
t.Error(err)
return
}
sources = append(sources, source)
}()
sources = append(sources, source)
}
}

2
audio/source_float32.go
View file

@ -130,6 +130,6 @@ func (s *float32Source) IngestInt32(buf []int32, bitDepth int) {
s.Blocks <- vector.Int32ToFloat32(buf, bitDepth)
}
func (s *float32Source) IngestNative(buf []float32, bitDepth int) {
func (s *float32Source) IngestNative(buf []float32, _ int) {
s.IngestFloat32(buf)
}

4
hasher/hasher_test.go
View file

@ -12,7 +12,7 @@ import (
func TestHasher24(t *testing.T) {
fp, err := os.Open(test.TestSingleSample24)
fp, err := os.Open(test.SingleSample24)
if err != nil {
t.Error(err)
return
@ -47,7 +47,7 @@ func TestHasher24(t *testing.T) {
func TestHasher16(t *testing.T) {
fp, err := os.Open(test.TestSingleSample16)
fp, err := os.Open(test.SingleSample16)
if err != nil {
t.Error(err)
return

2
hasher/hasher_tta_test.go
View file

@ -14,7 +14,7 @@ import (
func TestHasher16TTA(t *testing.T) {
fp, err := os.Open(test.TestSingleSample16TTA)
fp, err := os.Open(test.SingleSample16TTA)
if err != nil {
t.Error(err)
return

12
test/constants.go
View file

@ -6,7 +6,7 @@ import (
"runtime"
)
var TestSampleLocations = []string{
var SampleLocations = []string{
"resources/samples/cYsmix - Haunted House/",
"resources/samples/Babbe Music - RADIANT DANCEFLOOR/",
}
@ -21,9 +21,9 @@ func init() {
}
}
const TestSingleSample24 = "resources/samples/cYsmix - Haunted House/11. The Great Rigid Desert.flac"
const SingleSample24 = "resources/samples/cYsmix - Haunted House/11. The Great Rigid Desert.flac"
const TestSingleSample16 = "resources/samples/Babbe Music - RADIANT DANCEFLOOR/01. ENTER.flac"
const TestSingleSample16TTA = "resources/samples/Babbe Music - RADIANT DANCEFLOOR/01. ENTER.tta"
const TestSingleSampleAACMP4 = "resources/aac.m4a"
const TestSingleSampleALACMP4 = "resources/alac.m4a"
const SingleSample16 = "resources/samples/Babbe Music - RADIANT DANCEFLOOR/01. ENTER.flac"
const SingleSample16TTA = "resources/samples/Babbe Music - RADIANT DANCEFLOOR/01. ENTER.tta"
const SingleSampleAACMP4 = "resources/aac.m4a"
const SingleSampleALACMP4 = "resources/alac.m4a"