diff --git a/audio/filter/filter_test.go b/audio/filter/filter_test.go index 9558e3b..23d615d 100644 --- a/audio/filter/filter_test.go +++ b/audio/filter/filter_test.go @@ -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 diff --git a/audio/filter/resample_filter_cgo_test.go b/audio/filter/resample_filter_cgo_test.go index d4d6b06..faa53d2 100644 --- a/audio/filter/resample_filter_cgo_test.go +++ b/audio/filter/resample_filter_cgo_test.go @@ -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 diff --git a/audio/filter/resample_filter_nocgo_test.go b/audio/filter/resample_filter_nocgo_test.go index 6f9c4c4..f87a213 100644 --- a/audio/filter/resample_filter_nocgo_test.go +++ b/audio/filter/resample_filter_nocgo_test.go @@ -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 diff --git a/audio/format/aac/libfdk-aac.go b/audio/format/aac/libfdk-aac.go index a9cabc2..9fc06b5 100644 --- a/audio/format/aac/libfdk-aac.go +++ b/audio/format/aac/libfdk-aac.go @@ -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" } diff --git a/audio/format/aac/libfdk-aac_test.go b/audio/format/aac/libfdk-aac_test.go index f86f226..8ae2845 100644 --- a/audio/format/aac/libfdk-aac_test.go +++ b/audio/format/aac/libfdk-aac_test.go @@ -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 diff --git a/audio/format/aac/vo-aacenc_test.go b/audio/format/aac/vo-aacenc_test.go index a4a3810..3ca248d 100644 --- a/audio/format/aac/vo-aacenc_test.go +++ b/audio/format/aac/vo-aacenc_test.go @@ -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 diff --git a/audio/format/alac/libalac.go b/audio/format/alac/libalac.go index 27b4a2f..5dbb224 100644 --- a/audio/format/alac/libalac.go +++ b/audio/format/alac/libalac.go @@ -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" } diff --git a/audio/format/alac/libalac_test.go b/audio/format/alac/libalac_test.go index 88bfbd4..9694989 100644 --- a/audio/format/alac/libalac_test.go +++ b/audio/format/alac/libalac_test.go @@ -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 diff --git a/audio/format/alac/mp4.go b/audio/format/alac/mp4.go index 45e5ace..4d0f736 100644 --- a/audio/format/alac/mp4.go +++ b/audio/format/alac/mp4.go @@ -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() diff --git a/audio/format/flac/goflac_test.go b/audio/format/flac/goflac_test.go index b924c0e..6c6273f 100644 --- a/audio/format/flac/goflac_test.go +++ b/audio/format/flac/goflac_test.go @@ -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 diff --git a/audio/format/flac/libflac_test.go b/audio/format/flac/libflac_test.go index c3e4b36..1e5b648 100644 --- a/audio/format/flac/libflac_test.go +++ b/audio/format/flac/libflac_test.go @@ -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 diff --git a/audio/format/guess/flac_decode_test.go b/audio/format/guess/flac_decode_test.go index ee8e0b3..753eb6e 100644 --- a/audio/format/guess/flac_decode_test.go +++ b/audio/format/guess/flac_decode_test.go @@ -8,5 +8,5 @@ import ( ) func TestFLACDecode(t *testing.T) { - DoTest(".flac", test.TestSampleLocations, t) + DoTest(".flac", test.SampleLocations, t) } diff --git a/audio/format/guess/mp3_decode_test.go b/audio/format/guess/mp3_decode_test.go index c4c5ced..b64567c 100644 --- a/audio/format/guess/mp3_decode_test.go +++ b/audio/format/guess/mp3_decode_test.go @@ -8,5 +8,5 @@ import ( ) func TestMP3Decode(t *testing.T) { - DoTest(".mp3", test.TestSampleLocations, t) + DoTest(".mp3", test.SampleLocations, t) } diff --git a/audio/format/guess/opus_decode_test.go b/audio/format/guess/opus_decode_test.go index fc2c1de..4003ef0 100644 --- a/audio/format/guess/opus_decode_test.go +++ b/audio/format/guess/opus_decode_test.go @@ -8,5 +8,5 @@ import ( ) func TestOpusDecode(t *testing.T) { - DoTest(".opus", test.TestSampleLocations, t) + DoTest(".opus", test.SampleLocations, t) } diff --git a/audio/format/guess/tta_decode_test.go b/audio/format/guess/tta_decode_test.go index 3257994..086167b 100644 --- a/audio/format/guess/tta_decode_test.go +++ b/audio/format/guess/tta_decode_test.go @@ -8,5 +8,5 @@ import ( ) func TestTTADecode(t *testing.T) { - DoTest(".tta", test.TestSampleLocations, t) + DoTest(".tta", test.SampleLocations, t) } diff --git a/audio/format/guess/vorbis_decode_test.go b/audio/format/guess/vorbis_decode_test.go index 61246d3..1529d70 100644 --- a/audio/format/guess/vorbis_decode_test.go +++ b/audio/format/guess/vorbis_decode_test.go @@ -8,5 +8,5 @@ import ( ) func TestVorbisDecode(t *testing.T) { - DoTest(".vorbis", test.TestSampleLocations, t) + DoTest(".vorbis", test.SampleLocations, t) } diff --git a/audio/format/mp3/mp3_lame_test.go b/audio/format/mp3/mp3_lame_test.go index f29351b..fd44ca6 100644 --- a/audio/format/mp3/mp3_lame_test.go +++ b/audio/format/mp3/mp3_lame_test.go @@ -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 diff --git a/audio/format/opus/opus_test.go b/audio/format/opus/opus_test.go index d046e30..f5ced47 100644 --- a/audio/format/opus/opus_test.go +++ b/audio/format/opus/opus_test.go @@ -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 diff --git a/audio/format/tta/tta.go b/audio/format/tta/tta.go index 9dc83de..87e33c2 100644 --- a/audio/format/tta/tta.go +++ b/audio/format/tta/tta.go @@ -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 { diff --git a/audio/format/tta/tta_test.go b/audio/format/tta/tta_test.go index 6833fe2..0502201 100644 --- a/audio/format/tta/tta_test.go +++ b/audio/format/tta/tta_test.go @@ -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 diff --git a/audio/format/vorbis/vorbis_test.go b/audio/format/vorbis/vorbis_test.go index 66f7697..128b177 100644 --- a/audio/format/vorbis/vorbis_test.go +++ b/audio/format/vorbis/vorbis_test.go @@ -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 diff --git a/audio/packetizer/adts.go b/audio/packetizer/adts.go index 64ab0b7..10a14e4 100644 --- a/audio/packetizer/adts.go +++ b/audio/packetizer/adts.go @@ -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 diff --git a/audio/packetizer/adts_hev2_test.go b/audio/packetizer/adts_hev2_test.go index 041f834..2229f36 100644 --- a/audio/packetizer/adts_hev2_test.go +++ b/audio/packetizer/adts_hev2_test.go @@ -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 diff --git a/audio/packetizer/adts_test.go b/audio/packetizer/adts_test.go index f6bc4b0..7e48104 100644 --- a/audio/packetizer/adts_test.go +++ b/audio/packetizer/adts_test.go @@ -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 diff --git a/audio/packetizer/flac.go b/audio/packetizer/flac.go index b2294d4..d1d7db3 100644 --- a/audio/packetizer/flac.go +++ b/audio/packetizer/flac.go @@ -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 diff --git a/audio/packetizer/flac_crc.go b/audio/packetizer/flac_crc.go index fc08f4d..907f7a9 100644 --- a/audio/packetizer/flac_crc.go +++ b/audio/packetizer/flac_crc.go @@ -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)))) } diff --git a/audio/packetizer/flac_test.go b/audio/packetizer/flac_test.go index 4bb8f47..a95d49e 100644 --- a/audio/packetizer/flac_test.go +++ b/audio/packetizer/flac_test.go @@ -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 diff --git a/audio/packetizer/mp3.go b/audio/packetizer/mp3.go index aebcbcb..4eef9fe 100644 --- a/audio/packetizer/mp3.go +++ b/audio/packetizer/mp3.go @@ -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() } diff --git a/audio/packetizer/mp3_test.go b/audio/packetizer/mp3_test.go index 2f2ad40..f942378 100644 --- a/audio/packetizer/mp3_test.go +++ b/audio/packetizer/mp3_test.go @@ -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 diff --git a/audio/packetizer/ogg.go b/audio/packetizer/ogg.go index e02a844..891c802 100644 --- a/audio/packetizer/ogg.go +++ b/audio/packetizer/ogg.go @@ -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) } } diff --git a/audio/packetizer/ogg_crc.go b/audio/packetizer/ogg_crc.go index ca68a65..82fa1de 100644 --- a/audio/packetizer/ogg_crc.go +++ b/audio/packetizer/ogg_crc.go @@ -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)))) } diff --git a/audio/packetizer/ogg_flac_test.go b/audio/packetizer/ogg_flac_test.go index d958441..1ec6259 100644 --- a/audio/packetizer/ogg_flac_test.go +++ b/audio/packetizer/ogg_flac_test.go @@ -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 diff --git a/audio/packetizer/ogg_opus_test.go b/audio/packetizer/ogg_opus_test.go index f94e0e1..e57bd28 100644 --- a/audio/packetizer/ogg_opus_test.go +++ b/audio/packetizer/ogg_opus_test.go @@ -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 diff --git a/audio/queue/queue_test.go b/audio/queue/queue_test.go index eb6dbb9..18927c8 100644 --- a/audio/queue/queue_test.go +++ b/audio/queue/queue_test.go @@ -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) diff --git a/audio/replaygain/normalization_test.go b/audio/replaygain/normalization_test.go index 5e5da59..331bbba 100644 --- a/audio/replaygain/normalization_test.go +++ b/audio/replaygain/normalization_test.go @@ -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) } } diff --git a/audio/source_float32.go b/audio/source_float32.go index 30b2e53..e811212 100644 --- a/audio/source_float32.go +++ b/audio/source_float32.go @@ -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) } diff --git a/hasher/hasher_test.go b/hasher/hasher_test.go index 8409d57..943f6b1 100644 --- a/hasher/hasher_test.go +++ b/hasher/hasher_test.go @@ -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 diff --git a/hasher/hasher_tta_test.go b/hasher/hasher_tta_test.go index 0c6f9cf..3ec734a 100644 --- a/hasher/hasher_tta_test.go +++ b/hasher/hasher_tta_test.go @@ -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 diff --git a/test/constants.go b/test/constants.go index f692a86..ecff954 100644 --- a/test/constants.go +++ b/test/constants.go @@ -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"