diff --git a/README.md b/README.md index 79ebc8d..af20013 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Only output from Kirika's own encoders is supported. | **TTA** | ❌ | - | - | - | | | **MP3** | ✅ | ✅ | ✅ | ✅ | Uses [sssgun/mp3](https://github.com/sssgun/mp3) as a frame parser. | | **Ogg** | ✅ | ✅ | ✅* | ✅ | Uses custom Kirika packetizer.
*Sample numbers (absolute granule position in Ogg) depend on underlying codec implementing it.
Has been tested as working for Opus, FLAC | -| **ADTS** | ✅ | ✅ | ✅ | ✅ | Uses [edgeware/mp4ff](https://github.com/edgeware/mp4ff) for its ADTS frame parser. | +| **ADTS** | ✅ | ✅ | ✅ | ✅ | Uses [Eyevinn/mp4ff](https://github.com/Eyevinn/mp4ff) for its ADTS frame parser. | | **MP4** | ❌ | - | - | - | | | **ADIF** | ❌ | - | - | - | | @@ -239,7 +239,7 @@ Subdependencies that are not cgo-based are denoted in cursive. | [xiph/flac](https://gitlab.xiph.org/xiph/flac) | C | [BSD 3-Clause](https://gitlab.xiph.org/xiph/flac/-/blob/master/COPYING.Xiph) | Read extra license details on the [official site](https://xiph.org/flac/license.html).
Can be linked by cgo as a shared library. | | [dh1tw/gosamplerate](https://github.com/dh1tw/gosamplerate) | Go | [BSD 2-Clause](https://github.com/dh1tw/gosamplerate/blob/master/LICENSE) | | | [libsndfile/libsamplerate](https://github.com/libsndfile/libsamplerate) | C | [BSD 2-Clause](https://github.com/libsndfile/libsamplerate/blob/master/COPYING) | Can be linked by cgo as a shared library. | -| [edgeware/mp4ff](https://github.com/edgeware/mp4ff) | Go | [MIT](https://github.com/edgeware/mp4ff/blob/master/LICENSE.md) | | +| [Eyevinn/mp4ff](https://github.com/Eyevinn/mp4ff) | Go | [MIT](https://github.com/Eyevinn/mp4ff/blob/master/LICENSE.md) | | | [S.O.N.G/voaac-go](https://git.gammaspectra.live/S.O.N.G/voaac-go) | Go | [Apache 2.0](https://git.gammaspectra.live/S.O.N.G/voaac-go/src/branch/master/COPYING) | | | [mstorsjo/vo-aacenc](https://github.com/mstorsjo/vo-aacenc) | C | [Apache 2.0](https://github.com/mstorsjo/vo-aacenc/blob/master/COPYING) | Subdependency and included as part of _S.O.N.G/voaac-go_. | | [S.O.N.G/go-mp3](https://git.gammaspectra.live/S.O.N.G/go-mp3) | Go | [Apache 2.0](https://git.gammaspectra.live/S.O.N.G/go-mp3/src/branch/main/LICENSE) | | diff --git a/audio/format/aac/libfdk-aac.go b/audio/format/aac/libfdk-aac.go index 9fc06b5..9285999 100644 --- a/audio/format/aac/libfdk-aac.go +++ b/audio/format/aac/libfdk-aac.go @@ -8,8 +8,8 @@ import ( "fmt" "git.gammaspectra.live/S.O.N.G/Kirika/audio" "git.gammaspectra.live/S.O.N.G/go-fdkaac/fdkaac" - aacAdts "github.com/edgeware/mp4ff/aac" - "github.com/edgeware/mp4ff/mp4" + aacAdts "github.com/Eyevinn/mp4ff/aac" + "github.com/Eyevinn/mp4ff/mp4" "golang.org/x/exp/slices" "io" "runtime" diff --git a/audio/format/aac/mp4.go b/audio/format/aac/mp4.go index 603cfdc..5d79de7 100644 --- a/audio/format/aac/mp4.go +++ b/audio/format/aac/mp4.go @@ -4,7 +4,7 @@ package aac import ( "bytes" - "github.com/edgeware/mp4ff/mp4" + "github.com/Eyevinn/mp4ff/mp4" "io" ) diff --git a/audio/format/alac/mp4.go b/audio/format/alac/mp4.go index 7b118f4..7260ba3 100644 --- a/audio/format/alac/mp4.go +++ b/audio/format/alac/mp4.go @@ -5,7 +5,7 @@ package alac import ( "bytes" "errors" - "github.com/edgeware/mp4ff/mp4" + "github.com/Eyevinn/mp4ff/mp4" "io" ) diff --git a/audio/packetizer/adts.go b/audio/packetizer/adts.go index 5c79918..69bc25e 100644 --- a/audio/packetizer/adts.go +++ b/audio/packetizer/adts.go @@ -2,7 +2,7 @@ package packetizer import ( "bufio" - aacAdts "github.com/edgeware/mp4ff/aac" + aacAdts "github.com/Eyevinn/mp4ff/aac" "io" ) diff --git a/go.mod b/go.mod index 2370a74..a27e8fe 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( git.gammaspectra.live/S.O.N.G/flacgo v0.0.0-20221130070259-2ac188033aab - git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20220421115623-d0b3bfe57e0f + git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20230128024257-7bab2d4f9384 git.gammaspectra.live/S.O.N.G/go-ebur128 v0.0.0-20220720163421-db0c1911921d git.gammaspectra.live/S.O.N.G/go-fdkaac v0.0.0-20220910135048-823922bd661a git.gammaspectra.live/S.O.N.G/go-mp3 v0.0.0-20221206093437-a465b24607a2 @@ -14,13 +14,13 @@ require ( git.gammaspectra.live/S.O.N.G/goflac v0.0.0-20220515172202-6e490998d2a0 git.gammaspectra.live/S.O.N.G/minimp3 v0.0.0-20221201085504-9103da68c320 git.gammaspectra.live/S.O.N.G/voaac-go v0.0.0-20221206094054-e088a49a96bc + github.com/Eyevinn/mp4ff v0.33.2 github.com/dh1tw/gosamplerate v0.1.2 - github.com/edgeware/mp4ff v0.30.1 github.com/icza/bitio v1.1.0 github.com/jfreymuth/oggvorbis v1.0.4 github.com/sssgun/mp3 v0.0.0-20170810093403-85f2ec632081 github.com/viert/go-lame v0.0.0-20201108052322-bb552596b11d - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db + golang.org/x/exp v0.0.0-20230127193734-31bee513bff7 ) require ( diff --git a/go.sum b/go.sum index 040104c..8a363bb 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ git.gammaspectra.live/S.O.N.G/flacgo v0.0.0-20221130070259-2ac188033aab h1:1jKDhlDQK6hzR6KulALSYZTPgiCthL8UqufYXCRSuRo= git.gammaspectra.live/S.O.N.G/flacgo v0.0.0-20221130070259-2ac188033aab/go.mod h1:sYjxqsHurCJUzQQiSUNZbjW8st2fiD3kLxO08gBqmW8= -git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20220421115623-d0b3bfe57e0f h1:CxN7zlk5FdAieyRKQSbwBGBsvQ2cDF8JVCODZpzcRkA= -git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20220421115623-d0b3bfe57e0f/go.mod h1:f1+h7KOnuM9zcEQp7ri4UaVvgX4m1NFFIXgReIyjGMA= +git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20230128024257-7bab2d4f9384 h1:zKrLQZVLM5RoOywaxINIoeVOWRnMjrRKuf6R07G5h1I= +git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20230128024257-7bab2d4f9384/go.mod h1:DL2pznFXuNVoBk+VOSKA3Udl3xOQLkfprw5n19N9BsY= git.gammaspectra.live/S.O.N.G/go-ebur128 v0.0.0-20220720163421-db0c1911921d h1:3M0GZgm2H1tBkDxCwvQdRvnYhF0/velekO9uhVZsbP0= git.gammaspectra.live/S.O.N.G/go-ebur128 v0.0.0-20220720163421-db0c1911921d/go.mod h1:5H4eVW9uknpn8REFr+C3ejhvXdncgm/pbGqKGC43gFY= git.gammaspectra.live/S.O.N.G/go-fdkaac v0.0.0-20220910135048-823922bd661a h1:JQaryqLtNZn1jydhVc7CzcAvO8ZNB4jeZ1B5gJbHWUU= @@ -20,12 +20,12 @@ git.gammaspectra.live/S.O.N.G/minimp3 v0.0.0-20221201085504-9103da68c320 h1:rsu7 git.gammaspectra.live/S.O.N.G/minimp3 v0.0.0-20221201085504-9103da68c320/go.mod h1:B34pwapfc0f6be6rJYg37xDeFPPB0bSyH0+DYM1lyEE= git.gammaspectra.live/S.O.N.G/voaac-go v0.0.0-20221206094054-e088a49a96bc h1:57tqeyhK5ypviBHumVxdhiphsAX3nJXli6Ni/1+6Jn4= git.gammaspectra.live/S.O.N.G/voaac-go v0.0.0-20221206094054-e088a49a96bc/go.mod h1:y8tX6ZPpGKVO2uso29/q5XW4r8/lTc5QRjPOwDRVMNk= +github.com/Eyevinn/mp4ff v0.33.2 h1:6b4OCWyBQim+VrL3bNYkqxumnqGdJEGnls2JBMWvKLs= +github.com/Eyevinn/mp4ff v0.33.2/go.mod h1:w/6GSa5ghZ1VavzJK6McQ2/flx8mKtcrKDr11SsEweA= github.com/cocoonlife/testify v0.0.0-20160218172820-792cc1faeb64 h1:LjPYdzoFSAJ5Tr/ElL8kzTJghXgpnOjJVbgd1UvZB1o= github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/dh1tw/gosamplerate v0.1.2 h1:oyqtZk67xB9B4l+vIZCZ3F0RYV/z66W58VOah11/ktI= github.com/dh1tw/gosamplerate v0.1.2/go.mod h1:zooTyHpoR7hE+FLfdE3yjLHb2QA2NpMusNfuaZqEACM= -github.com/edgeware/mp4ff v0.30.1 h1:OV88fQrw8sFPjTCFThsBwubjYPHTdHgb28pSd1y9ozk= -github.com/edgeware/mp4ff v0.30.1/go.mod h1:GNUeA6tEFksH2CrjJF2FSGdJolba8yPGmo16qZTXsm8= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0= @@ -46,8 +46,8 @@ github.com/sssgun/mp3 v0.0.0-20170810093403-85f2ec632081 h1:Qo/HswJzVywl0podyXMD github.com/sssgun/mp3 v0.0.0-20170810093403-85f2ec632081/go.mod h1:ExwZtltybPz8zLO8c2lKRfpPk1HAxhrkp038QIBs+yg= github.com/viert/go-lame v0.0.0-20201108052322-bb552596b11d h1:LptdD7GTUZeklomtW5vZ1AHwBvDBUCZ2Ftpaz7uEI7g= github.com/viert/go-lame v0.0.0-20201108052322-bb552596b11d/go.mod h1:EqTcYM7y4JlSfeTI47pmNu3EZQuCuLQefsQyg1Imlz8= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230127193734-31bee513bff7 h1:pXR8mGh4q8ooBT7HXruL4Xa2IxoL8XZ6lOgXY/0Ryg8= +golang.org/x/exp v0.0.0-20230127193734-31bee513bff7/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190220214146-31aff87c08e9/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=