diff --git a/Cargo.lock b/Cargo.lock index 7b0f9bc..72e732c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,75 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + +[[package]] +name = "aead" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf01b9b56e767bb57b94ebf91a58b338002963785cdd7013e21c0d4679471e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" +dependencies = [ + "aes-soft", + "aesni", + "block-cipher-trait", +] + +[[package]] +name = "aes-gcm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834a6bda386024dbb7c8fc51322856c10ffe69559f972261c868485f5759c638" +dependencies = [ + "aead", + "aes", + "block-cipher-trait", + "ghash", + "subtle 2.2.3", + "zeroize", +] + +[[package]] +name = "aes-soft" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" +dependencies = [ + "block-cipher-trait", + "byteorder", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" +dependencies = [ + "block-cipher-trait", + "opaque-debug", +] + [[package]] name = "aho-corasick" version = "0.7.10" @@ -18,6 +88,82 @@ dependencies = [ "winapi", ] +[[package]] +name = "anyhow" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "async-attributes" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "async-h1" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad1494db96c4a94ca8a31a9aa56f15f3419c98bd4d3575f1ba682a06f5c1ac7" +dependencies = [ + "async-std", + "byte-pool", + "futures-core", + "http-types", + "httparse", + "lazy_static", + "log", + "pin-project-lite", +] + +[[package]] +name = "async-sse" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff0a3074c2c3cfd76417f6e03d5c99822d3ef37387af891e4a8bf46447ca870" +dependencies = [ + "async-std", + "http-types", + "log", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "async-std" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d" +dependencies = [ + "async-attributes", + "async-task", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-timer", + "kv-log-macro", + "log", + "memchr", + "num_cpus", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "smol", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3" + [[package]] name = "atty" version = "0.2.14" @@ -35,6 +181,32 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +[[package]] +name = "backtrace" +version = "0.3.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" + +[[package]] +name = "base64" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + [[package]] name = "bindgen" version = "0.54.0" @@ -65,12 +237,83 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array", +] + +[[package]] +name = "block-cipher-trait" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "blocking" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d17efb70ce4421e351d61aafd90c16a20fb5bfe339fcdc32a86816280e62ce0" +dependencies = [ + "futures-channel", + "futures-util", + "once_cell", + "parking", + "waker-fn", +] + +[[package]] +name = "bumpalo" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" + +[[package]] +name = "byte-pool" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9342e102eac8b1879fbedf9a7e0572c40b0cc5805b663c4d4ca791cae0bae221" +dependencies = [ + "crossbeam-queue", + "stable_deref_trait", +] + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + [[package]] name = "byteorder" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" + [[package]] name = "cc" version = "1.0.54" @@ -119,197 +362,720 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.7.1" +name = "concurrent-queue" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f83c06aff61f2d899eb87c379df3cbf7876f14471dcab474e0b6dc90ab96c080" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "cache-padded", ] [[package]] -name = "ffmpeg-sys-next" -version = "4.3.0" +name = "cookie" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01bba495d04757f7a3e471b3e411759a8968571c4618235bc1c9e1099b4a84d1" +checksum = "ca761767cf3fa9068cc893ec8c247a22d0fd0535848e65640c0548bd1f8bbb36" dependencies = [ - "bindgen", - "cc", - "libc", - "num_cpus", - "pkg-config", - "regex", + "aes-gcm", + "base64", + "hkdf", + "hmac", + "percent-encoding", + "rand 0.7.3", + "sha2", + "time", ] [[package]] -name = "glob" -version = "0.3.0" +name = "crossbeam-queue" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "maybe-uninit", +] [[package]] -name = "hermit-abi" -version = "0.1.14" +name = "crossbeam-utils" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "libc", + "autocfg", + "cfg-if", + "lazy_static", ] [[package]] -name = "humantime" -version = "1.3.0" +name = "crypto-mac" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "quick-error", + "generic-array", + "subtle 1.0.0", ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "data-encoding" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69" [[package]] -name = "lazycell" -version = "1.2.1" +name = "digest" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array", +] [[package]] -name = "libc" -version = "0.2.71" +name = "discard" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] -name = "libloading" -version = "0.5.2" +name = "dtoa" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ - "cc", - "winapi", + "atty", + "humantime", + "log", + "regex", + "termcolor", ] [[package]] -name = "log" -version = "0.4.8" +name = "error-chain" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" dependencies = [ - "cfg-if", + "backtrace", + "version_check", ] [[package]] -name = "memchr" -version = "2.3.3" +name = "fake-simd" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] -name = "nom" -version = "5.1.2" +name = "fastrand" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] +checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed" [[package]] -name = "num-bigint" -version = "0.3.0" +name = "femme" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0" +checksum = "7b6b21baebbed15551f2170010ca4101b9ed3fdc05822791c8bd4631840eab81" dependencies = [ - "autocfg", - "num-integer", - "num-traits", + "cfg-if", + "js-sys", + "log", + "serde 1.0.114", + "serde_derive", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "num-integer" -version = "0.1.43" +name = "ffmpeg-sys-next" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "01bba495d04757f7a3e471b3e411759a8968571c4618235bc1c9e1099b4a84d1" dependencies = [ - "autocfg", - "num-traits", + "bindgen", + "cc", + "libc", + "num_cpus", + "pkg-config", + "regex", ] [[package]] -name = "num-rational" -version = "0.3.0" +name = "fuchsia-cprng" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "num-traits" -version = "0.2.12" +name = "futures-channel" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" dependencies = [ - "autocfg", + "futures-core", + "futures-sink", ] [[package]] -name = "num_cpus" -version = "1.13.0" +name = "futures-core" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" [[package]] -name = "peeking_take_while" -version = "0.1.2" +name = "futures-io" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" [[package]] -name = "pkg-config" -version = "0.3.17" +name = "futures-sink" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" [[package]] -name = "proc-macro2" -version = "1.0.18" +name = "futures-task" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" dependencies = [ - "unicode-xid", + "once_cell", ] [[package]] -name = "quick-error" -version = "1.2.3" +name = "futures-timer" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +dependencies = [ + "gloo-timers", + "send_wrapper", +] [[package]] -name = "quote" -version = "1.0.7" +name = "futures-util" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghash" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f0930ed19a7184089ea46d2fedead2f6dc2b674c5db4276b7da336c7cd83252" +dependencies = [ + "polyval", +] + +[[package]] +name = "gimli" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "hermit-abi" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +dependencies = [ + "libc", +] + +[[package]] +name = "hkdf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa08a006102488bd9cd5b8013aabe84955cf5ae22e304c2caf655b633aefae3" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "hmac" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" +dependencies = [ + "crypto-mac", + "digest", +] + +[[package]] +name = "http-types" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca4221cd1c7cedf275cd0ad3c9dfe58b5acc93cdd5511c7e020a102e1995fe99" +dependencies = [ + "anyhow", + "async-std", + "cookie", + "infer", + "pin-project-lite", + "rand 0.7.3", + "serde 1.0.114", + "serde_json", + "serde_qs", + "serde_urlencoded", + "url", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "idna" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "infer" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6854dd77ddc4f9ba1a448f487e27843583d407648150426a30c2ea3a2c39490a" + +[[package]] +name = "itoa" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" + +[[package]] +name = "js-sys" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" + +[[package]] +name = "libc" +version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +dependencies = [ + "cc", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "miniz_oxide" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" +dependencies = [ + "adler", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "num-bigint" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" + +[[package]] +name = "once_cell" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "parking" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efcee3c6d23b94012e240525f131c6abaa9e5eeb8f211002d93beec3b7be350" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + +[[package]] +name = "polyval" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ec3341498978de3bfd12d1b22f1af1de22818f5473a11e8a6ef997989e3a212" +dependencies = [ + "cfg-if", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "proc-macro-hack" +version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" + +[[package]] +name = "proc-macro2" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" +dependencies = [ + "libc", + "rand 0.4.6", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + [[package]] name = "regex" version = "1.3.9" @@ -328,24 +1094,283 @@ version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +[[package]] +name = "route-recognizer" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea509065eb0b3c446acdd0102f0d46567dc30902dc0be91d6552035d92b0f4f8" + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + [[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + +[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" + +[[package]] +name = "serde" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +dependencies = [ + "itoa", + "ryu", + "serde 1.0.114", +] + +[[package]] +name = "serde_qs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6f3acf84e23ab27c01cb5917551765c01c50b2000089db8fa47fe018a3260cf" +dependencies = [ + "data-encoding", + "error-chain", + "percent-encoding", + "serde 1.0.114", +] + +[[package]] +name = "serde_urlencoded" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", + "itoa", + "serde 1.0.114", + "url", +] + +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + +[[package]] +name = "sha2" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +dependencies = [ + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", +] + [[package]] name = "shlex" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +[[package]] +name = "slab" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] +name = "smol" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5" +dependencies = [ + "async-task", + "blocking", + "concurrent-queue", + "fastrand", + "futures-io", + "futures-util", + "libc", + "once_cell", + "scoped-tls", + "slab", + "socket2", + "wepoll-sys-stjepang", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi", +] + +[[package]] +name = "stable_deref_trait" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" + +[[package]] +name = "standback" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde 1.0.114", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde 1.0.114", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "subtle" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" + +[[package]] +name = "syn" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "termcolor" version = "1.1.0" @@ -373,13 +1398,103 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tide" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151b07f369a9152c2f93715ea0db8a7f7e2533bd2e52fbff1ea5bad7a88db541" +dependencies = [ + "async-h1", + "async-sse", + "async-std", + "femme", + "http-types", + "kv-log-macro", + "route-recognizer", + "serde 1.0.114", + "serde_json", +] + +[[package]] +name = "time" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" +dependencies = [ + "cfg-if", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" + [[package]] name = "transotf" version = "0.1.0" dependencies = [ + "async-std", "byteorder", "ffmpeg-sys-next", + "http-types", + "lazy_static", "num-rational", + "tide", + "uuid", +] + +[[package]] +name = "typenum" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ + "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +dependencies = [ + "tinyvec", ] [[package]] @@ -394,6 +1509,37 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +[[package]] +name = "universal-hash" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0c900f2f9b4116803415878ff48b63da9edb268668e08cf9292d7503114a01" +dependencies = [ + "generic-array", + "subtle 2.2.3", +] + +[[package]] +name = "url" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +dependencies = [ + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cfec50b0842181ba6e713151b72f4ec84a6a7e2c9c8a8a3ffc37bb1cd16b231" +dependencies = [ + "rand 0.3.23", + "serde 0.9.15", +] + [[package]] name = "vec_map" version = "0.8.2" @@ -406,6 +1552,105 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +[[package]] +name = "waker-fn" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasm-bindgen" +version = "0.2.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2" +dependencies = [ + "cfg-if", + "serde 1.0.114", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dba48d66049d2a6cc8488702e7259ab7afc9043ad0dc5448444f46f2a453b362" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae" + +[[package]] +name = "web-sys" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wepoll-sys-stjepang" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694" +dependencies = [ + "cc", +] + [[package]] name = "which" version = "3.1.1" @@ -445,3 +1690,9 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zeroize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" diff --git a/Cargo.toml b/Cargo.toml index 12d66f5..080ea41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,11 @@ edition = "2018" [dependencies] num-rational = "0.3.0" byteorder = "1.3.4" +tide = "0.11.0" +lazy_static = "1.4.0" +async-std = { version = "1.6.2", features = ["attributes"] } +uuid = { version = "0.4", features = ["serde", "v4"] } +http-types = "2.2.1" [dependencies.ffmpeg-sys-next] version = "4.3.0" diff --git a/src/av/avio.rs b/src/av/avio.rs index 79b939b..3673201 100644 --- a/src/av/avio.rs +++ b/src/av/avio.rs @@ -1,10 +1,11 @@ use crate::av::as_ptr::{AsMutPtr, AsPtr}; -use ffmpeg_sys_next::{av_malloc, avio_alloc_context, avio_flush, AVIOContext}; +use ffmpeg_sys_next::{ + av_free, av_malloc, avio_alloc_context, avio_context_free, avio_flush, AVIOContext, +}; use std::cmp::min; use std::os::raw::c_void; use std::vec::Vec; -#[derive(Clone)] pub struct AVIO { ctx: *mut AVIOContext, inner: Box>, @@ -50,7 +51,6 @@ unsafe extern "C" fn write_packet_with_inner(ctx: *mut c_void, buffer: *mut u8, } unsafe extern "C" fn seek_with_inner(ctx: *mut c_void, offset: i64, whence: i32) -> i64 { - println!("ok"); let mut avio: Box>> = Box::from_raw(ctx.cast()); avio.data.seek(offset, whence); std::mem::forget(avio); @@ -110,6 +110,15 @@ impl AVIO { } } +impl Drop for AVIO { + fn drop(&mut self) { + unsafe { + av_free((*self.ctx).buffer.cast()); + avio_context_free(&mut self.ctx); + } + } +} + impl AsMutPtr for AVIO { fn as_mut_ptr(&self) -> *mut AVIOContext { self.ctx @@ -124,37 +133,43 @@ impl AsPtr for AVIO { impl AVIO { pub fn duplex_with_seek(item: T) -> AVIO { - AVIO::new(4096, item, Some(T::read), Some(T::write), Some(T::seek)) + AVIO::new( + 4096 * 4096, + item, + Some(T::read), + Some(T::write), + Some(T::seek), + ) } } impl AVIO { pub fn duplex(item: T) -> AVIO { - AVIO::new(4096, item, Some(T::read), Some(T::write), None) + AVIO::new(4096 * 4096, item, Some(T::read), Some(T::write), None) } } impl AVIO { pub fn reader_with_seek(item: T) -> AVIO { - AVIO::new(4096, item, Some(T::read), None, Some(T::seek)) + AVIO::new(4096 * 4096, item, Some(T::read), None, Some(T::seek)) } } impl AVIO { pub fn reader(item: T) -> AVIO { - AVIO::new(4096, item, Some(T::read), None, None) + AVIO::new(4096 * 4096, item, Some(T::read), None, None) } } impl AVIO { pub fn writer_with_seek(item: T) -> AVIO { - AVIO::new(4096, item, None, Some(T::write), Some(T::seek)) + AVIO::new(4096 * 4096, item, None, Some(T::write), Some(T::seek)) } } impl AVIO { pub fn writer(item: T) -> AVIO { - AVIO::new(4096, item, None, Some(T::write), None) + AVIO::new(4096 * 4096, item, None, Some(T::write), None) } } diff --git a/src/av/decoder.rs b/src/av/decoder.rs index cb55c7b..4e09932 100644 --- a/src/av/decoder.rs +++ b/src/av/decoder.rs @@ -6,10 +6,10 @@ use crate::av::xcoder::{process_return, XCoder}; use crate::av::{decoder_from_name, verify_response}; use crate::av_err2str; use ffmpeg_sys_next::{ - avcodec_parameters_to_context, avcodec_receive_frame, avcodec_send_packet, AVCodecContext, + avcodec_free_context, avcodec_parameters_to_context, avcodec_receive_frame, + avcodec_send_packet, AVCodecContext, }; -#[derive(Copy, Clone)] pub struct Decoder(pub *mut AVCodecContext); impl Decoder { @@ -56,3 +56,9 @@ impl XCoder for Decoder { Ok(()) } } + +impl Drop for Decoder { + fn drop(&mut self) { + unsafe { avcodec_free_context(&mut self.as_mut_ptr()) } + } +} diff --git a/src/av/encoder.rs b/src/av/encoder.rs index b232768..9d9dd73 100644 --- a/src/av/encoder.rs +++ b/src/av/encoder.rs @@ -1,14 +1,13 @@ use crate::av::as_ptr::AsMutPtr; use crate::av::frame::Frame; use crate::av::packet::Packet; -use crate::av::scaler::Scaler; use crate::av::stream::Stream; use crate::av::xcoder::{process_return, XCoder}; use crate::av::{encoder_from_name, verify_response}; use crate::av_err2str; use ffmpeg_sys_next::{ - avcodec_parameters_from_context, avcodec_receive_packet, avcodec_send_frame, sws_freeContext, - AVCodecContext, + avcodec_free_context, avcodec_parameters_from_context, avcodec_receive_packet, + avcodec_send_frame, AVCodecContext, }; pub struct Encoder(pub *mut AVCodecContext); @@ -88,8 +87,8 @@ impl XCoder for Encoder { } } -impl Drop for Scaler { +impl Drop for Encoder { fn drop(&mut self) { - unsafe { sws_freeContext(self.as_mut_ptr()) } + unsafe { avcodec_free_context(&mut self.as_mut_ptr()) } } } diff --git a/src/av/format.rs b/src/av/format.rs index 6cd169f..788c735 100644 --- a/src/av/format.rs +++ b/src/av/format.rs @@ -4,19 +4,19 @@ use crate::av::dictionary::Dictionary; use crate::av::options::Options; use crate::av::packet::Packet; use crate::av::stream::Stream; -use crate::av::{decoder_codec_from_name, verify_response}; +use crate::av::{decoder_codec_from_name, verify_response, Rational}; use ffmpeg_sys_next::{ - av_interleaved_write_frame, av_read_frame, av_write_frame, av_write_trailer, - avformat_alloc_context, avformat_alloc_output_context2, avformat_find_stream_info, - avformat_init_output, avformat_new_stream, avformat_open_input, avformat_write_header, - avio_open2, AVFormatContext, AVMediaType, AVIO_FLAG_WRITE, + av_find_best_stream, av_interleaved_write_frame, av_read_frame, av_seek_frame, av_write_frame, + av_write_trailer, avformat_alloc_context, avformat_alloc_output_context2, + avformat_find_stream_info, avformat_free_context, avformat_init_output, avformat_new_stream, + avformat_open_input, avformat_write_header, avio_context_free, avio_open2, AVFormatContext, + AVMediaType, AVIO_FLAG_WRITE, AVSEEK_FLAG_BACKWARD, AV_TIME_BASE, }; use std::ffi::CString; use std::fmt::{Debug, Error, Formatter}; use std::os::raw::{c_int, c_void}; use std::ptr::{null, null_mut}; -#[derive(Clone)] pub struct Format { pub ctx: *mut AVFormatContext, pub avio: Option>, @@ -39,16 +39,45 @@ impl Format { } impl Format { - pub fn stream(&self, stream_type: AVMediaType, index: Option) -> Option { + pub fn seek(&self, seconds: u32, stream: Option<&Stream>) -> Result<(), String> { + let seconds: i32 = seconds as i32; + let time_base = stream.map(|s| s.time_base().den()).unwrap_or(AV_TIME_BASE); + verify_response("Failed to seek", unsafe { + av_seek_frame( + self.ctx, + stream.map(|s| s.index()).unwrap_or(-1), + (seconds * time_base) as i64, + AVSEEK_FLAG_BACKWARD, + ) + })?; + + Ok(()) + } + + pub fn stream( + &self, + stream_type: AVMediaType, + index: Option, + related: Option, + ) -> Result, String> { unsafe { let ctx = self.ctx; let mut stream = (*ctx).streams; + let index = if let Some(index) = index { + index + } else { + verify_response( + "Failed finding best stream", + av_find_best_stream(ctx, stream_type, -1, related.unwrap_or(-1), null_mut(), 0), + )? + }; + for _ in 0..(*ctx).nb_streams { let curr_stream = *stream; if (*(*curr_stream).codecpar).codec_type == stream_type { - if index.is_none() || Some((*curr_stream).index) == index { - return Some(Stream(curr_stream)); + if (*curr_stream).index == index { + return Ok(Some(Stream(curr_stream))); } } @@ -56,7 +85,7 @@ impl Format { } } - None + Ok(None) } pub fn as_mut_ptr(&self) -> *mut AVFormatContext { @@ -72,6 +101,10 @@ impl Format { }; } + pub fn duration(&self) -> i64 { + unsafe { (*self.ctx).duration } + } + pub fn write_header(&self, options: Option) -> Result<(), String> { verify_response("failed to write header to output", unsafe { avformat_write_header( @@ -280,3 +313,16 @@ impl AsMutVoidPtr for Format { } impl Options for Format {} + +impl Drop for Format { + fn drop(&mut self) { + unsafe { + let mut pb = (*self.ctx).pb; + + avformat_free_context(self.ctx); + if self.avio.is_none() { + avio_context_free(&mut pb); + } + } + } +} diff --git a/src/av/frame.rs b/src/av/frame.rs index 479aef1..a559ec2 100644 --- a/src/av/frame.rs +++ b/src/av/frame.rs @@ -1,7 +1,7 @@ use crate::av::as_ptr::{AsMutPtr, AsPtr}; use crate::av::verify_response; use ffmpeg_sys_next::{ - av_frame_alloc, av_frame_get_buffer, av_frame_unref, AVFrame, AVPictureType, AVPixelFormat, + av_frame_alloc, av_frame_free, av_frame_get_buffer, AVFrame, AVPictureType, AVPixelFormat, AVSampleFormat, }; @@ -25,12 +25,12 @@ impl Frame { } #[inline] - fn own(&mut self) { + pub fn own(&mut self) { self.owned = true } #[inline] - fn disown(&mut self) { + pub fn disown(&mut self) { self.owned = false } @@ -177,6 +177,6 @@ impl Drop for Frame { if !self.owned { return; } - unsafe { av_frame_unref(self.ptr) } + unsafe { av_frame_free(&mut self.ptr) } } } diff --git a/src/av/mod.rs b/src/av/mod.rs index d607395..5e74151 100644 --- a/src/av/mod.rs +++ b/src/av/mod.rs @@ -1,9 +1,10 @@ use crate::av_err2str; use ffmpeg_sys_next::AVCodecID::AV_CODEC_ID_HEVC; use ffmpeg_sys_next::{ - av_codec_is_decoder, av_codec_is_encoder, av_codec_next, av_inv_q, av_register_all, - avcodec_alloc_context3, avcodec_find_decoder_by_name, avcodec_find_encoder_by_name, AVCodec, - AVCodecContext, AVCodecID, AVRational, AV_CODEC_CAP_HARDWARE, + av_codec_is_decoder, av_codec_is_encoder, av_codec_next, av_inv_q, av_log_set_level, + av_register_all, avcodec_alloc_context3, avcodec_find_decoder_by_name, + avcodec_find_encoder_by_name, AVCodec, AVCodecContext, AVCodecID, AVRational, + AV_CODEC_CAP_HARDWARE, }; use num_rational::Ratio; use std::any::type_name; @@ -213,6 +214,7 @@ fn remove_if_exists(list: &mut Vec, needle: &str, to_remove: Vec<&s pub fn init() { unsafe { av_register_all(); + av_log_set_level(-8); } } diff --git a/src/av/packet.rs b/src/av/packet.rs index f6ec793..3f78611 100644 --- a/src/av/packet.rs +++ b/src/av/packet.rs @@ -1,7 +1,7 @@ use crate::av::Rational; use ffmpeg_sys_next::AVPacketSideDataType::AV_PKT_DATA_NEW_EXTRADATA; use ffmpeg_sys_next::{ - av_packet_alloc, av_packet_get_side_data, av_packet_rescale_ts, av_packet_unref, AVPacket, + av_packet_alloc, av_packet_free, av_packet_get_side_data, av_packet_rescale_ts, AVPacket, }; pub struct Packet(pub *mut AVPacket); @@ -98,7 +98,7 @@ impl Packet { impl Drop for Packet { fn drop(&mut self) { unsafe { - av_packet_unref(self.0); + av_packet_free(&mut self.0); } } } diff --git a/src/av/resampler.rs b/src/av/resampler.rs index 8d2385e..3f17e5c 100644 --- a/src/av/resampler.rs +++ b/src/av/resampler.rs @@ -5,8 +5,8 @@ use crate::av::frame::Frame; use crate::av::verify_response; use crate::av::xcoder::XCoder; use ffmpeg_sys_next::{ - swr_alloc, swr_alloc_set_opts, swr_convert_frame, swr_get_delay, AVFrame, AVSampleFormat, - SwrContext, + swr_alloc, swr_alloc_set_opts, swr_convert_frame, swr_drop_output, swr_free, swr_get_delay, + AVSampleFormat, SwrContext, }; use std::ptr::{null, null_mut}; @@ -96,3 +96,12 @@ impl Resampler { } } } + +impl Drop for Resampler { + fn drop(&mut self) { + unsafe { + swr_drop_output(self.ptr, i32::MAX); + swr_free(&mut self.ptr) + } + } +} diff --git a/src/av/scaler.rs b/src/av/scaler.rs index 1a8ea93..c242f1c 100644 --- a/src/av/scaler.rs +++ b/src/av/scaler.rs @@ -4,7 +4,7 @@ use crate::av::encoder::Encoder; use crate::av::frame::Frame; use crate::av::verify_response; use crate::av::xcoder::XCoder; -use ffmpeg_sys_next::{sws_getContext, sws_scale, AVPixelFormat, SwsContext}; +use ffmpeg_sys_next::{sws_freeContext, sws_getContext, sws_scale, AVPixelFormat, SwsContext}; use std::os::raw::c_int; use std::ptr::null_mut; @@ -150,3 +150,9 @@ impl AsMutPtr for Scaler { self.ctx } } + +impl Drop for Scaler { + fn drop(&mut self) { + unsafe { sws_freeContext(self.as_mut_ptr()) } + } +} diff --git a/src/main.rs b/src/main.rs index 086ab61..ae742b8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,13 +1,23 @@ #![allow(dead_code)] use crate::av::init; -use crate::transcoder::Transcoder; +use crate::transcoder_manager::{TranscoderInstance, TranscoderManager}; +use async_std::fs::File; +use async_std::sync::{Arc, RwLock}; use ffmpeg_sys_next::{av_make_error_string, av_malloc, av_version_info}; +use http_types::Error as HttpError; +use lazy_static::lazy_static; +use std::collections::HashMap; use std::ffi::{CStr, CString}; +use std::option::Option::Some; use std::os::raw::{c_char, c_int}; +use std::str::FromStr; +use tide::{Request, StatusCode}; +use uuid::Uuid; pub mod av; pub mod transcoder; +pub mod transcoder_manager; pub mod utils; // const INPUT_PATH: &str = "/tank/ephemeral/anime/series/Witch Hunter Robin - 2ndfire/[2ndfire]Witch_Hunter_Robin_-_01[91DCE49A].mkv"; @@ -22,14 +32,114 @@ fn av_err2str(error_code: c_int) -> String { } } -fn main() { - println!("> transotf: ffmpeg {}", unsafe { - CStr::from_ptr(av_version_info()).to_str().unwrap() - }); +lazy_static! { + static ref HOME_PAGE: String = { + format!( + "{}: {}\nffmpeg: {}", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION"), + unsafe { CStr::from_ptr(av_version_info()).to_str().unwrap_or("n/a") }, + ) + }; +} + +#[derive(Default)] +struct State { + manager: RwLock, +} + +async fn create_transcode(req: Request) -> Result { + let params = req.query::>()?; + let target = params.get(&"target".to_string()); + let target = if let Some(target) = target { + target + } else { + return Err(HttpError::from_str( + StatusCode::BadRequest, + "no target given", + )); + }; + + { + File::open(target).await.map_err(|err| { + HttpError::from_str( + StatusCode::BadRequest, + format!("Failed to open file: {}", err), + ) + })?; + } + + let id = req + .state() + .manager + .write() + .await + .start(target.clone(), None, None) + .map_err(|err| { + HttpError::from_str( + StatusCode::InternalServerError, + format!("Failed to start transcoder: {}", err), + ) + })?; + + Ok(format!("{}", id)) +} + +async fn get_init(req: Request) -> Result { + let _manager = req.state().manager.read().await; + // manager.get() + + Err(HttpError::from_str(StatusCode::NotFound, ":3")) +} + +async fn get_instance(req: &Request) -> Result, HttpError> { + let id = req.param::("id")?; + let id = Uuid::from_str(&id)?; + let manager = req.state().manager.read().await; + if let Some(instance) = manager.get(id) { + Ok(instance) + } else { + Err(HttpError::from_str( + StatusCode::NotFound, + format!("Can't find transcoder with id {}", id), + )) + } +} + +async fn get_manifest(req: Request) -> Result { + let transcoder_instance = get_instance(&req).await?; + let (duration, segments, init_written) = transcoder_instance + .state(|item| { + ( + item.duration(), + item.segments().clone(), + item.init_written(), + ) + .clone() + }) + .await; + + Ok(format!("{} {:?} {}", duration, segments, init_written)) +} + +// async fn get_status(req: Request) -> Result { +// let id = req.param::("id")?; +// let id = Uuid::from_str(&id)?; +// let manager = req.state().manager.read().await; +// } + +#[async_std::main] +async fn main() -> std::io::Result<()> { + println!("{}", HOME_PAGE.clone()); init(); - let mut transcoder = Transcoder::create(INPUT_PATH, OUTPUT_PATH, None, None) - .expect("Failed to create transcoder"); - transcoder.transcode().expect("Failed to transcode"); + let mut app = tide::with_state(State::default()); + app.at("/").get(|_| async { Ok(HOME_PAGE.clone()) }); + app.at("/transcode").get(create_transcode); + // app.at("/session/:id").get(get_status); + app.at("/session/:id/manifest").get(get_manifest); + // app.at("/session/:id/{type}/init.mp4"); + // app.at("/session/:id/{type}/{nr}.m4s"); + app.listen("0:8000").await } diff --git a/src/transcoder.rs b/src/transcoder.rs index cf41038..633f278 100644 --- a/src/transcoder.rs +++ b/src/transcoder.rs @@ -14,30 +14,14 @@ use crate::utils::SortedFrameBuffer; use ffmpeg_sys_next::AVMediaType::{AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_VIDEO}; use ffmpeg_sys_next::AVPictureType::AV_PICTURE_TYPE_I; use ffmpeg_sys_next::AVPixelFormat::AV_PIX_FMT_YUV420P; -use ffmpeg_sys_next::{avio_wb32, AVIOContext, AVPixelFormat, SWS_BILINEAR}; +use ffmpeg_sys_next::{avio_wb32, AVIOContext, AVPixelFormat, AV_TIME_BASE, SWS_BILINEAR}; use num_rational::Ratio; +use std::cmp::min; use std::fs::{DirBuilder, File}; use std::io::Write; +use std::ops::Mul; use std::option::Option::Some; -pub struct Transcoder { - input: Format<()>, - input_video: Stream, - input_frame_rate: Ratio, - video_output: Format, - output_path: String, - output_video: Stream, - video_frame_buffer: SortedFrameBuffer, - video_encoder: Encoder, - video_decoder: Decoder, - frame_scaler: Scaler, - last_pts: i64, - current_pts: i64, - video_segment: u32, - extra_data: Option>, - audio: Option, -} - pub struct AudioTranscoder { encoder: Encoder, decoder: Decoder, @@ -50,8 +34,11 @@ pub struct AudioTranscoder { segment: u32, last_pts: i64, current_pts: i64, + seconds_per_segment: u32, } +const SECONDS_PER_SEGMENT: u32 = 5; + impl AudioTranscoder { fn process_packet(&mut self, packet: Packet) -> Result<(), String> { self.decoder @@ -75,6 +62,11 @@ impl AudioTranscoder { Ok(()) } + #[inline] + fn input_stream(&self) -> &Stream { + &self.input_stream + } + fn start_segment(&self, force: bool) { if self.segment == 0 && !force { return; @@ -122,6 +114,7 @@ impl AudioTranscoder { .unwrap() .write_all(&mut segment) .map_err(|_| format!("Failed to write audio segment {}", self.segment))?; + self.start_segment(false); Ok(()) @@ -134,12 +127,10 @@ impl AudioTranscoder { println!("WARN: new frame out of order"); } - if (pts_passed + self.current_pts) > (5 * self.input_stream.time_base().den()) as i64 { + if (pts_passed + self.current_pts) + > (self.seconds_per_segment as i32 * self.input_stream.time_base().den()) as i64 + { self.format.write_packet_null()?; - println!( - "Next audio segment (current: {}, pts: {}/{})!", - self.segment, self.last_pts, self.current_pts, - ); self.write_segment()?; self.segment += 1; self.current_pts = @@ -168,6 +159,28 @@ impl AudioTranscoder { } } +pub struct Transcoder { + input: Format<()>, + input_video: Stream, + input_frame_rate: Ratio, + video_output: Format, + output_path: String, + output_video: Stream, + video_frame_buffer: SortedFrameBuffer, + video_encoder: Encoder, + video_decoder: Decoder, + frame_scaler: Scaler, + last_pts: i64, + current_pts: i64, + video_segment: u32, + extra_data: Option>, + audio: Option, + segment_target: Option, + input_video_index: Option, + input_audio_index: Option, + seconds_per_segment: u32, +} + impl Transcoder { pub fn create( input_path: &str, @@ -179,10 +192,13 @@ impl Transcoder { let output_path = output_path.to_string(); let input_video = input - .stream(AVMEDIA_TYPE_VIDEO, video_index) + .stream(AVMEDIA_TYPE_VIDEO, video_index, None) + .map_err(|err| format!("Failed to find video stream: {}", err))? .ok_or("Failed to find video stream".to_string())?; - let input_audio = input.stream(AVMEDIA_TYPE_AUDIO, audio_index); + let input_audio = input + .stream(AVMEDIA_TYPE_AUDIO, audio_index, Some(input_video.index())) + .map_err(|err| format!("Failed to find audio stream: {}", err))?; if audio_index.is_some() && input_audio.is_none() { return Err("Failed to find audio stream".to_string()); } @@ -233,30 +249,11 @@ impl Transcoder { encoder.set_frame_size(decoder.frame_size() * 4); encoder.open()?; encoder.configure(&output_stream)?; - println!( - "audio input stream: {}/{}", - input_stream.time_base().num(), - input_stream.time_base().den() - ); - - println!( - "audio decoder[{}] ({:?} {}hz | {}/{}) -> audio encoder[{}] ({:?} {}hz | {}/{})", - decoder.name(), - decoder.codec(), - decoder.sample_rate(), - decoder.time_base().num(), - decoder.time_base().den(), - encoder.name(), - encoder.codec(), - encoder.sample_rate(), - encoder.time_base().num(), - encoder.time_base().den(), - ); let resampler = Resampler::from_coder(&decoder, &encoder); let mut audio_options = Dictionary::new(); - audio_options.copy_from(&mut options); - format.init_output(audio_options); + audio_options.copy_from(&mut options)?; + format.init_output(audio_options)?; Some(AudioTranscoder { frame_buffer: SortedFrameBuffer::new(), @@ -270,6 +267,7 @@ impl Transcoder { last_pts: 0, segment: 0, resampler, + seconds_per_segment: SECONDS_PER_SEGMENT, }) } else { None @@ -297,12 +295,6 @@ impl Transcoder { Ok(()) })?; - println!( - "video decoder[{}] -> video encoder[{}]", - video_decoder.name(), - video_encoder.name() - ); - let param = output_video.params(); param.set_height(video_decoder.height()); param.set_width(video_decoder.width()); @@ -319,6 +311,8 @@ impl Transcoder { video_output, output_video, audio, + segment_target: None, + input_video_index: None, output_path, video_encoder, video_decoder, @@ -328,30 +322,75 @@ impl Transcoder { current_pts: 0, video_segment: 0, extra_data: None, + input_audio_index: None, + seconds_per_segment: SECONDS_PER_SEGMENT, }) } - pub fn transcode(&mut self) -> Result<(), String> { + pub fn seek(&self, segment: u32, stream: Option<&Stream>) -> Result<(), String> { + self.input.seek(segment * self.seconds_per_segment, stream) + } + + pub fn open(&mut self) -> Result<(), String> { DirBuilder::new() .recursive(true) .create(self.output_path.to_string()) .map_err(|_| "Failed to create target directory".to_string())?; self.video_output.write_header(None).unwrap(); - let input_video_index = self.input_video.index(); - let input_audio_index = self.audio.as_ref().map(|ia| ia.input_stream.index()); + self.input_video_index = Some(self.input_video.index()); + self.input_audio_index = self.audio.as_ref().map(|ia| ia.input_stream.index()); - while let Some(packet) = self.input.next_packet() { - if input_video_index == packet.stream() { + Ok(()) + } + + pub fn duration(&self) -> i64 { + self.input.duration() + } + + pub fn duration_secs(&self) -> f64 { + self.input.duration() as f64 / AV_TIME_BASE as f64 + } + + pub fn transcode(&mut self) -> Result { + Ok(if let Some(packet) = self.input.next_packet() { + if self.input_video_index == Some(packet.stream()) { self.video_process_packet(packet)?; - } else if input_audio_index == Some(packet.stream()) { + } else if self.input_audio_index == Some(packet.stream()) { // Safe assumption if let Some(ref mut audio) = &mut self.audio { audio.process_packet(packet)?; } } + + true + } else { + false + }) + } + + #[inline] + pub fn video_stream(&self) -> &Stream { + &self.input_video + } + + #[inline] + pub fn audio_stream(&self) -> Option<&Stream> { + if let Some(ref audio) = self.audio { + Some(audio.input_stream()) + } else { + None } + } + + pub fn segment(&self) -> u32 { + min( + self.video_segment, + self.audio.as_ref().map_or(u32::MAX, |audio| audio.segment), + ) + } + pub fn finish(&mut self) -> Result<(), String> { self.encode_video()?; self.video_output.write_trailer()?; self.video_write_segment()?; @@ -362,7 +401,21 @@ impl Transcoder { fn video_process_packet(&mut self, packet: Packet) -> Result<(), String> { self.video_decoder.send_packet(&packet)?; while let Some(frame) = self.video_decoder.read_frame()? { + let segment: u32 = (self + .input_video + .time_base() + .to_num() + .mul(packet.pts() as i32) + .to_integer() + / self.seconds_per_segment as i32) as u32; + if let Some(target) = self.segment_target { + if target - 1 < segment { + continue; + } + } + let pts = frame.pts(); + let frame = self .frame_scaler .scale(frame) @@ -407,21 +460,17 @@ impl Transcoder { .write_all(&mut segment) .map_err(|_| format!("Failed to write video segment {}", self.video_segment))?; self.start_segment(false); - self.video_encoder.flush(); - Ok(()) } fn encode_video(&mut self) -> Result<(), String> { while let Some(frame) = self.video_frame_buffer.pop_first() { let pts_passed = frame.pts() - self.last_pts; - if (pts_passed + self.current_pts) > (5 * self.input_frame_rate.den()) as i64 { + if (pts_passed + self.current_pts) + > (self.seconds_per_segment * self.input_frame_rate.den() as u32) as i64 + { self.video_output.write_packet_null()?; - println!( - "Next video segment (current: {}, pts: {}/{})!", - self.video_segment, self.last_pts, self.current_pts, - ); self.video_write_segment()?; self.video_segment += 1; self.current_pts = @@ -492,9 +541,11 @@ impl Transcoder { ffio_wfourcc(pb, b"msix"); } } + + pub fn stop(self) {} } -#[derive(Clone, Default, Debug)] +#[derive(Default, Debug)] struct Buffer { buffer: Vec, } diff --git a/src/transcoder_manager.rs b/src/transcoder_manager.rs new file mode 100644 index 0000000..f0905b6 --- /dev/null +++ b/src/transcoder_manager.rs @@ -0,0 +1,256 @@ +use crate::transcoder::Transcoder; +use async_std::sync::{Arc, Receiver, RecvError, RwLock, RwLockReadGuard, Sender, TryRecvError}; +use async_std::task; +use std::collections::{HashMap, HashSet}; +use std::option::Option::Some; +use std::thread::Builder; +use std::thread::JoinHandle; +use uuid::Uuid; + +#[derive(Debug)] +pub struct TranscoderInstance { + id: Uuid, + channel: Channel, + state: RwLock, + command: TranscoderCommand, +} + +impl TranscoderInstance { + pub async fn state(&self, block: fn(RwLockReadGuard) -> T) -> T { + block(self.state.read().await) + } +} + +#[derive(Debug, Default)] +pub struct TranscoderInstanceState { + thread: Option>, + duration_secs: f64, + segments: HashSet, + init_written: bool, +} + +impl TranscoderInstanceState { + #[inline] + pub fn duration(&self) -> f64 { + self.duration_secs + } + + #[inline] + pub fn segments(&self) -> &HashSet { + &self.segments + } + + #[inline] + pub fn init_written(&self) -> bool { + self.init_written + } +} + +#[derive(Debug, Default)] +pub struct TranscoderManager { + instances: HashMap>, +} + +#[derive(Debug, Clone)] +pub struct Channel { + receiver: Receiver, + sender: Sender, +} + +impl Channel { + async fn send(&self, msg: T) { + self.sender.send(msg).await + } + + fn send_blocking(&self, msg: T) { + task::block_on(self.sender.send(msg)) + } + + async fn recv(&self) -> Result { + self.receiver.recv().await + } + + fn recv_blocking(&self) -> Result { + task::block_on(self.receiver.recv()) + } + + fn try_recv(&self) -> Result { + self.receiver.try_recv() + } +} + +fn new_channel() -> (Channel, Channel) { + let (sender_a, receiver_a) = async_std::sync::channel(25); + let (sender_b, receiver_b) = async_std::sync::channel(25); + + ( + Channel { + sender: sender_a, + receiver: receiver_b, + }, + Channel { + sender: sender_b, + receiver: receiver_a, + }, + ) +} + +#[derive(Debug, Clone)] +pub struct TranscoderCommand { + input: String, + output: String, + audio: Option, + video: Option, +} + +#[derive(Debug)] +pub enum Message { + Info { duration_secs: f64 }, + SegmentReady(u32), + Seek(u32), + Failure(String), + Stop, + Finished, +} + +fn transcoder_thread_main(command: TranscoderCommand, channel: Channel) { + if let Err(err) = transcoder_thread(command, &channel) { + channel.send_blocking(Message::Failure(err)); + return; + } +} + +fn transcoder_thread(command: TranscoderCommand, channel: &Channel) -> Result<(), String> { + let transcoder = Transcoder::create( + &command.input, + &command.output, + command.video, + command.audio, + ); + + let mut transcoder = match transcoder { + Ok(t) => t, + Err(e) => { + channel.send_blocking(Message::Failure(e)); + return Ok(()); + } + }; + + transcoder.open()?; + + channel.send_blocking(Message::Info { + duration_secs: transcoder.duration_secs(), + }); + + let mut last_segment = transcoder.segment(); + while transcoder.transcode()? { + while let Ok(msg) = channel.try_recv() { + match msg { + Message::Seek(segment) => { + transcoder.seek(segment, Some(transcoder.video_stream()))?; + } + Message::Stop => { + transcoder.stop(); + return Ok(()); + } + + _ => {} + }; + } + + if last_segment < transcoder.segment() { + channel.send_blocking(Message::SegmentReady(last_segment)); + last_segment = transcoder.segment(); + } + } + + transcoder.finish()?; + channel.send_blocking(Message::SegmentReady(transcoder.segment())); + transcoder.stop(); + channel.send_blocking(Message::Finished); + + Ok(()) +} + +impl TranscoderManager { + pub fn start( + &mut self, + input: String, + audio: Option, + video: Option, + ) -> Result { + let uuid = Uuid::new_v4(); + let command = TranscoderCommand { + input: input.clone(), + output: format!("/tmp/transotf/{}/", uuid), + audio, + video, + }; + let (thread_channel, own_channel) = new_channel(); + let thread = { + let command = command.clone(); + Builder::new() + .name(format!("t#{}", uuid)) + .spawn(|| transcoder_thread_main(command, thread_channel))? + }; + + let instance = TranscoderInstance { + id: uuid, + command, + state: RwLock::new(TranscoderInstanceState { + thread: Some(thread), + init_written: false, + segments: HashSet::new(), + duration_secs: 0.0, + }), + channel: own_channel, + }; + + let instance = Arc::new(instance); + self.instances.insert(uuid, instance.clone()); + + task::spawn(async move { + loop { + let fut = instance.channel.recv(); + if let Ok(x) = fut.await { + match x { + Message::Finished => { + let mut state = instance.state.write().await; + if let Some(join_handle) = std::mem::replace(&mut state.thread, None) { + join_handle.join().unwrap(); + } + + break; + } + + Message::Info { duration_secs } => { + let mut state = instance.state.write().await; + state.duration_secs = duration_secs + } + + Message::SegmentReady(segment) => { + let mut state = instance.state.write().await; + if segment == 0 { + state.init_written = true + } + + state.segments.insert(segment); + } + + _ => {} + } + + println!("> {:?}", x); + } else { + return; + } + } + }); + + Ok(uuid) + } + + pub fn get(&self, id: Uuid) -> Option> { + self.instances.get(&id).cloned() + } +} diff --git a/test/test.mpd b/test/test.mpd index 2cad6cd..0eb90d2 100644 --- a/test/test.mpd +++ b/test/test.mpd @@ -7,14 +7,14 @@ data/ - + - +