diff --git a/Cargo.lock b/Cargo.lock index b27203367b..3d37edc67d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6714,15 +6714,15 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "symphonia" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17033fe05e4f7f10a6ad602c272bafd2520b2e5cdd9feb61494d9cdce08e002f" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "lazy_static", "symphonia-bundle-flac", "symphonia-bundle-mp3", "symphonia-codec-aac", "symphonia-codec-alac", + "symphonia-codec-opus", "symphonia-codec-pcm", "symphonia-codec-vorbis", "symphonia-core", @@ -6735,9 +6735,8 @@ dependencies = [ [[package]] name = "symphonia-bundle-flac" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044f655337892b217d6df1d8336ee119414c3886c89c72e0156989cd2ad7934a" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6747,9 +6746,8 @@ dependencies = [ [[package]] name = "symphonia-bundle-mp3" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5d3d53535ae2b7d0e39e82f683cac5398a6c8baca25ff1183e107d13959d3e" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "bitflags", "lazy_static", @@ -6760,9 +6758,8 @@ dependencies = [ [[package]] name = "symphonia-codec-aac" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9431b89428c31b01428563df18e52b1aff7c49e71fb80b2fa8e85632094776" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "lazy_static", "log", @@ -6771,9 +6768,17 @@ dependencies = [ [[package]] name = "symphonia-codec-alac" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452438d6f32bf07f2f55f35371c3c8e9cce4a028a08b47fb301001f85a950f02" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-opus" +version = "0.0.1" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6781,9 +6786,8 @@ dependencies = [ [[package]] name = "symphonia-codec-pcm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cca412c954abda6ab62b5e51223568eb604ed8266ec777d99e1d63c608443c" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6791,9 +6795,8 @@ dependencies = [ [[package]] name = "symphonia-codec-vorbis" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323b94435a1a807e1001e29490aeaef2660fb72b145d47497e8429a6cb1d67c3" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6802,9 +6805,8 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199a6417cd4115bac79289b64b859358ea050b7add0ceb364dc991f628c5b347" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "arrayvec 0.7.2", "bitflags", @@ -6815,9 +6817,8 @@ dependencies = [ [[package]] name = "symphonia-format-isomp4" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dce84cea63247dfcc43e12edf2d19406fbb62ebc24bac1b8e6c49f1ba67b890" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "encoding_rs", "log", @@ -6828,9 +6829,8 @@ dependencies = [ [[package]] name = "symphonia-format-mkv" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f405400330b2cc0c70e19515198628ae9a6a99a59c77800541127d4cff113b96" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "lazy_static", "log", @@ -6841,9 +6841,8 @@ dependencies = [ [[package]] name = "symphonia-format-ogg" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2f741469a0f103607ed1f2605f7f00b13ba044ea9ddc616764558c6d3d9b7d" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6853,9 +6852,8 @@ dependencies = [ [[package]] name = "symphonia-format-wav" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9d771aa6889f05b771e629110f6a60b5e1c0ad580fc41da574bc490fbe2822" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", "symphonia-core", @@ -6864,9 +6862,8 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed71acf6b5e6e8bee1509597b86365a06b78c1d73218df47357620a6fe5997b" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "encoding_rs", "lazy_static", @@ -6876,9 +6873,8 @@ dependencies = [ [[package]] name = "symphonia-utils-xiph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbb0766ce77a8aef535f9438db645e7b6f1b2c4cf3be9bf246b4e11a7d5531" +version = "0.5.0" +source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "symphonia-core", "symphonia-metadata", diff --git a/crates/lib/files/media/Cargo.toml b/crates/lib/files/media/Cargo.toml index f6992d239b..bfca0c2b6c 100644 --- a/crates/lib/files/media/Cargo.toml +++ b/crates/lib/files/media/Cargo.toml @@ -21,7 +21,10 @@ errors = { path = "../../errors" } log = "0.4.14" # Powerful audio decoder and demuxer -symphonia = { version = "0.5.1", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "vorbis", "wav"] } +#symphonia = { version = "0.5.2", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "vorbis", "wav"] } +# Opus support still hasn't landed in Symphonia, so we have to use an older version (~0.5) off-master. +# Opus is the browser's default (only) recording codec: https://blog.addpipe.com/audio-constraints-getusermedia/ +symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", rev = "e1a70095c4409478c1ded499fb8dd4afa540fb90", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] } [dev-dependencies] # None yet diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 1972157a49..5bfbec6a02 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -65,7 +65,10 @@ log = "0.4.14" once_cell = "1.9.0" rand = "0.8.3" regex = "1.5.4" -symphonia = { version = "0.5.1", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "vorbis", "wav"] } +#symphonia = { version = "0.5.2", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] } +# Opus support still hasn't landed in Symphonia, so we have to use an older version (~0.5) off-master. +# Opus is the browser's default (only) recording codec: https://blog.addpipe.com/audio-constraints-getusermedia/ +symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", rev = "e1a70095c4409478c1ded499fb8dd4afa540fb90", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] } time = "0.2.26" uuid = { version = "0.8.2", features = ["v4"] }