NGnius/bliss-rs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4 from Polochon-street/vendor-aubio-2

Browse source 
Vendor aubio-rs pt.2
This commit is contained in:
Polochon-street 2021-05-16 19:43:17 +02:00
parent dcf5c37863 c50eee67e6
commit 91d8e40167
7 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "aubio-rs"]
path = aubio-rs
url = https://github.com/Polochon-street/aubio-rs

34
Cargo.lock generated
View file

@ -52,20 +52,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "aubio-rs"
version = "0.2.0"
dependencies = [
"aubio-sys",
]
[[package]]
name = "aubio-sys"
version = "0.2.0"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.0.1" version = "1.0.1"
@ -98,12 +84,30 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "bliss-audio-aubio-rs"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe01698d293ee91e334339d6436f17eac30d94bebaa668c5799c8206384dfeb1"
dependencies = [
"bliss-audio-aubio-sys",
]
[[package]]
name = "bliss-audio-aubio-sys"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ef9fab7b922bdd057bb06fa2a2fa79d2a93bec3dd576320511cb3dfe21e78a9"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "bliss-rs" name = "bliss-rs"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"aubio-rs", "bliss-audio-aubio-rs",
"clap", "clap",
"crossbeam", "crossbeam",
"dirs", "dirs",

7
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "bliss-rs" name = "bliss-rs"
version = "0.1.0" version = "0.1.1"
authors = ["Polochon-street <polochonstreet@gmx.fr>"] authors = ["Polochon-street <polochonstreet@gmx.fr>"]
edition = "2018" edition = "2018"
license = "GPL-3.0-only" license = "GPL-3.0-only"
@ -13,7 +13,7 @@ readme = "README.md"
# Building ffmpeg until either # Building ffmpeg until either
# https://github.com/zmwangx/rust-ffmpeg/pull/60 # https://github.com/zmwangx/rust-ffmpeg/pull/60
# or https://github.com/zmwangx/rust-ffmpeg/pull/62 is in # or https://github.com/zmwangx/rust-ffmpeg/pull/62 is in
default = ["aubio-rs/static", "build-ffmpeg"] default = ["bliss-audio-aubio-rs/static", "build-ffmpeg"]
build-ffmpeg = ["ffmpeg-next/build"] build-ffmpeg = ["ffmpeg-next/build"]
bench = [] bench = []
@ -33,7 +33,8 @@ log = "0.4.14"
env_logger = "0.8.3" env_logger = "0.8.3"
thiserror = "1.0.24" thiserror = "1.0.24"
# Until https://github.com/aubio/aubio/issues/336 is somehow solved # Until https://github.com/aubio/aubio/issues/336 is somehow solved
aubio-rs = {path = "./aubio-rs/aubio-rs"} # Hopefully we'll be able to use the official aubio-rs at some point.
bliss-audio-aubio-rs = "0.2.0"
[dev-dependencies] [dev-dependencies]
mpd = "0.0.12" mpd = "0.0.12"

1
aubio-rs

@ -1 +0,0 @@
Subproject commit 658ee6878737edd1a58ca6164a95bb4a068af2ab

2
src/misc.rs
View file

@ -3,7 +3,7 @@
//! Contains various descriptors that don't fit in one of the //! Contains various descriptors that don't fit in one of the
//! existing categories. //! existing categories.
use aubio_rs::level_lin; use bliss_audio_aubio_rs::level_lin;
use ndarray::{arr1, Axis}; use ndarray::{arr1, Axis};
use super::utils::{mean, Normalize}; use super::utils::{mean, Normalize};

2
src/temporal.rs
View file

@ -5,7 +5,7 @@
use crate::utils::Normalize; use crate::utils::Normalize;
use crate::BlissError; use crate::BlissError;
use aubio_rs::{OnsetMode, Tempo}; use bliss_audio_aubio_rs::{OnsetMode, Tempo};
use log::warn; use log::warn;
use ndarray::arr1; use ndarray::arr1;
use ndarray_stats::interpolate::Midpoint; use ndarray_stats::interpolate::Midpoint;

4
src/timbral.rs
View file

@ -4,8 +4,8 @@
//! spectral centroid, spectral flatness and spectral roll-off of //! spectral centroid, spectral flatness and spectral roll-off of
//! a given Song. //! a given Song.
use aubio_rs::vec::CVec; use bliss_audio_aubio_rs::vec::CVec;
use aubio_rs::{bin_to_freq, PVoc, SpecDesc, SpecShape}; use bliss_audio_aubio_rs::{bin_to_freq, PVoc, SpecDesc, SpecShape};
use ndarray::{arr1, Axis}; use ndarray::{arr1, Axis};
use super::utils::{geometric_mean, mean, number_crossings, Normalize}; use super::utils::{geometric_mean, mean, number_crossings, Normalize};