diff --git a/Cargo.lock b/Cargo.lock index b38676b..a87d55e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,11 +19,11 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "assert_cmd" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472" +checksum = "ba45b8163c49ab5f972e59a8a5a03b6d2972619d486e19ec9fe744f7c2753d3c" dependencies = [ - "bstr", + "bstr 1.0.1", "doc-comment", "predicates", "predicates-core", @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf09bb72e00da477c2596865e8873227e2196d263cca35414048875dbbeea1be" +checksum = "1429b32ede0cb31afd9f6cb1e8f06f1e32a4c75ed9290f9f4d3cda0c5981e061" dependencies = [ "doc-comment", "globwalk", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "bitvec_helpers" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d30d85fdea170380dd5e9d00ed18374e6677b9a99b8fbed9b9d8c9ebfe3e" +checksum = "2f3737c8719330551a609e76c47c15d4521161d252f73085ffac23ae9f6aa72e" dependencies = [ "anyhow", "bitvec", @@ -92,32 +92,31 @@ dependencies = [ ] [[package]] -name = "bitvec_helpers" -version = "2.0.0" +name = "bstr" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3737c8719330551a609e76c47c15d4521161d252f73085ffac23ae9f6aa72e" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "anyhow", - "bitvec", - "funty", + "memchr", ] [[package]] name = "bstr" -version = "0.2.17" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd" dependencies = [ - "lazy_static", "memchr", + "once_cell", "regex-automata", + "serde", ] [[package]] name = "cc" -version = "1.0.74" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" [[package]] name = "cfg-if" @@ -127,9 +126,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.18" +version = "4.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" +checksum = "0eb41c13df48950b20eb4cd0eefa618819469df1bffc49d11e8487c4ba0037e5" dependencies = [ "atty", "bitflags", @@ -138,14 +137,14 @@ dependencies = [ "once_cell", "strsim", "termcolor", - "terminal_size 0.2.1", + "terminal_size 0.2.2", ] [[package]] name = "clap_derive" -version = "4.0.18" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", @@ -268,7 +267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", - "bstr", + "bstr 0.2.17", "fnv", "log", "regex", @@ -296,23 +295,23 @@ name = "hdr10plus" version = "1.1.2" dependencies = [ "anyhow", - "bitvec_helpers 2.0.0", - "hevc_parser 0.4.7", + "bitvec_helpers", + "hevc_parser", "serde", "serde_json", ] [[package]] name = "hdr10plus_tool" -version = "1.4.0" +version = "1.5.0" dependencies = [ "anyhow", "assert_cmd", "assert_fs", - "bitvec_helpers 2.0.0", + "bitvec_helpers", "clap", "hdr10plus", - "hevc_parser 0.5.2", + "hevc_parser", "indicatif", "predicates", "serde_json", @@ -334,17 +333,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hevc_parser" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217deffc374976a191a28859e4ae9bec0bafeada18745fedb68986f61e9d9d26" -dependencies = [ - "anyhow", - "bitvec_helpers 1.0.2", - "nom", -] - [[package]] name = "hevc_parser" version = "0.5.2" @@ -352,7 +340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab34f209a181c88c436af84050c1ca2c8d16c9909b5201c939ace9551d1d8d15" dependencies = [ "anyhow", - "bitvec_helpers 2.0.0", + "bitvec_helpers", "nom", "regex", ] @@ -387,12 +375,13 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" dependencies = [ "console", "number_prefix", + "portable-atomic", "unicode-width", ] @@ -504,15 +493,21 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" + +[[package]] +name = "portable-atomic" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" [[package]] name = "predicates" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" +checksum = "ab68289ded120dcbf9d571afcf70163233229052aec9b08ab09532f698d0e1e6" dependencies = [ "difflib", "float-cmp", @@ -524,15 +519,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "a6e7125585d872860e9955ca571650b27a4979c5823084168c5ed5bbfb016b56" [[package]] name = "predicates-tree" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "ad3f7fa8d61e139cbc7c3edfebf3b6678883a53f5ffac65d1259329a93ee43a5" dependencies = [ "predicates-core", "termtree", @@ -597,9 +592,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -614,9 +609,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -638,7 +633,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -746,19 +741,19 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1" +checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" dependencies = [ "rustix", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "termtree" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" @@ -858,19 +853,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -878,12 +860,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", ] [[package]] @@ -892,48 +874,24 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.0" @@ -946,12 +904,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index 5b7c8a1..e999219 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hdr10plus_tool" -version = "1.4.0" +version = "1.5.0" authors = ["quietvoid"] edition = "2021" rust-version = "1.57.0" @@ -11,16 +11,16 @@ bitvec_helpers = "2.0.0" hdr10plus = { path = "./hdr10plus", features = ["hevc", "json"] } hevc_parser = { version = "0.5.2", features = ["hevc_io"] } -clap = { version = "4.0.18", features = ["derive", "wrap_help", "deprecated"] } +clap = { version = "4.0.23", features = ["derive", "wrap_help", "deprecated"] } serde_json = { version = "1.0.87", features = ["preserve_order"] } -indicatif = "0.17.1" +indicatif = "0.17.2" anyhow = "1.0.66" thiserror = "1.0.37" [dev-dependencies] -assert_cmd = "2.0.5" -assert_fs = "1.0.7" -predicates = "2.1.1" +assert_cmd = "2.0.6" +assert_fs = "1.0.9" +predicates = "2.1.2" [[bin]] name = "hdr10plus_tool" diff --git a/assets/hevc_tests/metadata-dhdr10-opt.json b/assets/hevc_tests/metadata-dhdr10-opt.json index 35d4efa..b6768d9 100644 --- a/assets/hevc_tests/metadata-dhdr10-opt.json +++ b/assets/hevc_tests/metadata-dhdr10-opt.json @@ -1195,6 +1195,6 @@ }, "ToolInfo": { "Tool": "hdr10plus_tool", - "Version": "1.4.0" + "Version": "1.5.0" } } diff --git a/assets/hevc_tests/regular_metadata.json b/assets/hevc_tests/regular_metadata.json index 3d1c408..36a1eac 100644 --- a/assets/hevc_tests/regular_metadata.json +++ b/assets/hevc_tests/regular_metadata.json @@ -10120,6 +10120,6 @@ }, "ToolInfo": { "Tool": "hdr10plus_tool", - "Version": "1.4.0" + "Version": "1.5.0" } } diff --git a/assets/hevc_tests/single-frame-metadata.json b/assets/hevc_tests/single-frame-metadata.json index eeab530..70486cd 100644 --- a/assets/hevc_tests/single-frame-metadata.json +++ b/assets/hevc_tests/single-frame-metadata.json @@ -69,6 +69,6 @@ }, "ToolInfo": { "Tool": "hdr10plus_tool", - "Version": "1.4.0" + "Version": "1.5.0" } } diff --git a/hdr10plus/Cargo.toml b/hdr10plus/Cargo.toml index f340106..a81cc89 100644 --- a/hdr10plus/Cargo.toml +++ b/hdr10plus/Cargo.toml @@ -12,10 +12,10 @@ repository = "https://github.com/quietvoid/hdr10plus_tool/tree/master/hdr10plus" [dependencies] bitvec_helpers = "2.0.0" -anyhow = "1.0.56" -serde = { version = "1.0.136", features = ["derive"], optional = true } -serde_json = { version = "1.0.79", features = ["preserve_order"], optional = true } -hevc_parser = { version = "0.4.7", optional = true } +anyhow = "1.0.66" +serde = { version = "1.0.147", features = ["derive"], optional = true } +serde_json = { version = "1.0.87", features = ["preserve_order"], optional = true } +hevc_parser = { version = "0.5.2", optional = true } [features] hevc = ["hevc_parser"]