From 7bf43241e510df7e44a97f290e5ad329ed100ff6 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Fri, 29 May 2020 00:55:25 +0200 Subject: [PATCH] audio/transcribe: remove and merge with rusoto Part-of: --- Cargo.toml | 1 - audio/transcribe/Cargo.toml | 36 ---------------- audio/transcribe/build.rs | 3 -- audio/transcribe/src/lib.rs | 41 ------------------- net/rusoto/Cargo.toml | 17 +++++++- .../rusoto}/src/aws_transcribe_parse.rs | 0 net/rusoto/src/lib.rs | 3 ++ .../packet.rs => net/rusoto/src/packet/mod.rs | 0 8 files changed, 18 insertions(+), 83 deletions(-) delete mode 100644 audio/transcribe/Cargo.toml delete mode 100644 audio/transcribe/build.rs delete mode 100644 audio/transcribe/src/lib.rs rename {audio/transcribe => net/rusoto}/src/aws_transcribe_parse.rs (100%) rename audio/transcribe/src/packet.rs => net/rusoto/src/packet/mod.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index aa695f07..4f296fe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ members = [ "audio/claxon", "audio/csound", "audio/lewton", - "audio/transcribe", "generic/file", "generic/sodium", "generic/threadshare", diff --git a/audio/transcribe/Cargo.toml b/audio/transcribe/Cargo.toml deleted file mode 100644 index d14b1aa0..00000000 --- a/audio/transcribe/Cargo.toml +++ /dev/null @@ -1,36 +0,0 @@ -[package] -name = "gst-plugin-transcribe" -version = "0.6.0" -authors = ["Jordan Petridis ", "Mathieu Duponchelle "] -edition = "2018" -description = "AWS Transcribe plugin" -repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "LGPL-2.1-or-later" - -[dependencies] -glib = { git = "https://github.com/gtk-rs/glib" } -gstreamer = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } -gstreamer-base = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } -rusoto_core = "0.43.0" -rusoto_credential = "0.43.0" -rusoto_transcribe = "0.43.0" -rusoto_signature = "0.43.0" -reqwest = { version = "0.10", features = ["cookies", "gzip"] } -futures = "0.3" -tokio = { version = "0.2", features = ["time", "rt-threaded"] } -async-tungstenite = { version = "0.5", features = ["tokio", "tokio-runtime", "tokio-tls"] } -nom = "5.1.1" -crc = "1.8.1" -byteorder = "1.3.4" -once_cell = "1.0" -serde = "1" -serde_derive = "1" -serde_json = "1" - -[lib] -name = "gsttranscribe" -crate-type = ["cdylib", "rlib"] -path = "src/lib.rs" - -[build-dependencies] -gst-plugin-version-helper = { path="../../version-helper" } diff --git a/audio/transcribe/build.rs b/audio/transcribe/build.rs deleted file mode 100644 index 17be1215..00000000 --- a/audio/transcribe/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - gst_plugin_version_helper::get_info() -} diff --git a/audio/transcribe/src/lib.rs b/audio/transcribe/src/lib.rs deleted file mode 100644 index a295459e..00000000 --- a/audio/transcribe/src/lib.rs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2020 Mathieu Duponchelle -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. - -#[macro_use] -extern crate glib; -#[macro_use] -extern crate gstreamer as gst; - -pub mod packet; - -pub mod aws_transcribe_parse; - -fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { - aws_transcribe_parse::register(plugin) -} - -gst::gst_plugin_define!( - transcribe, - env!("CARGO_PKG_DESCRIPTION"), - plugin_init, - concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "LGPL", - env!("CARGO_PKG_NAME"), - env!("CARGO_PKG_NAME"), - env!("CARGO_PKG_REPOSITORY"), - env!("BUILD_REL_DATE") -); diff --git a/net/rusoto/Cargo.toml b/net/rusoto/Cargo.toml index 2b7b54c3..95343a68 100644 --- a/net/rusoto/Cargo.toml +++ b/net/rusoto/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "gst-plugin-rusoto" version = "0.6.0" -authors = ["Arun Raghavan "] +authors = ["Arun Raghavan ", + "Jordan Petridis ", + "Mathieu Duponchelle "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" license = "MIT/Apache-2.0" -description = "Amazon S3 Plugin" +description = "Amazon Web Services plugin" edition = "2018" [dependencies] @@ -15,10 +17,21 @@ gstreamer = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", fea gstreamer-base = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } rusoto_core = "0.43" rusoto_s3 = "0.43" +rusoto_credential = "0.43" +rusoto_transcribe = "0.43" +rusoto_signature = "0.43" url = "2" percent-encoding = "2" tokio = { version = "0.2", features = [ "rt-threaded" ] } lazy_static = "1.0" +async-tungstenite = { version = "0.5", features = ["tokio", "tokio-runtime", "tokio-tls"] } +nom = "5.1.1" +crc = "1.8.1" +byteorder = "1.3.4" +once_cell = "1.0" +serde = "1" +serde_derive = "1" +serde_json = "1" [lib] name = "gstrusoto" diff --git a/audio/transcribe/src/aws_transcribe_parse.rs b/net/rusoto/src/aws_transcribe_parse.rs similarity index 100% rename from audio/transcribe/src/aws_transcribe_parse.rs rename to net/rusoto/src/aws_transcribe_parse.rs diff --git a/net/rusoto/src/lib.rs b/net/rusoto/src/lib.rs index aaeabc9e..c0b45bd2 100644 --- a/net/rusoto/src/lib.rs +++ b/net/rusoto/src/lib.rs @@ -14,6 +14,8 @@ extern crate gstreamer_base as gst_base; #[macro_use] extern crate lazy_static; +mod aws_transcribe_parse; +mod packet; mod s3sink; mod s3src; mod s3url; @@ -22,6 +24,7 @@ mod s3utils; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { s3sink::register(plugin)?; s3src::register(plugin)?; + aws_transcribe_parse::register(plugin)?; Ok(()) } diff --git a/audio/transcribe/src/packet.rs b/net/rusoto/src/packet/mod.rs similarity index 100% rename from audio/transcribe/src/packet.rs rename to net/rusoto/src/packet/mod.rs