diff options
| -rw-r--r-- | Cargo.lock | 3 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | opus_test.c | 17 | ||||
| -rw-r--r-- | src/audio/play_queue.rs | 26 | ||||
| -rw-r--r-- | src/commands/meme.rs | 57 | ||||
| -rw-r--r-- | src/main.rs | 3 |
6 files changed, 90 insertions, 19 deletions
@@ -1717,6 +1717,7 @@ dependencies = [ name = "thulani" version = "0.1.6" dependencies = [ + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1726,11 +1727,11 @@ dependencies = [ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "opus 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -28,7 +28,8 @@ regex = "1.1.0" clap = "2.32.0" itertools = "0.8.0" serde_json = "~1.0" -flate2 = "^1.0" +opus = "^0.2" +byteorder = "^1.3" [dependencies.serenity] default-features = false diff --git a/opus_test.c b/opus_test.c new file mode 100644 index 0000000..96744cb --- /dev/null +++ b/opus_test.c @@ -0,0 +1,17 @@ +#include <opus.h> +#include <stdio.h> +#include <stdlib.h> + +int main(void) { + int err; + OpusEncoder* enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_AUDIO, &err); + + if (err != NULL) { + puts("initializing opus"); + return EXIT_FAILURE; + } + + + + return EXIT_SUCCESS; +}
\ No newline at end of file diff --git a/src/audio/play_queue.rs b/src/audio/play_queue.rs index 119b8c5..0ddcb93 100644 --- a/src/audio/play_queue.rs +++ b/src/audio/play_queue.rs @@ -7,7 +7,10 @@ use std::{ }; use either::{Left, Right}; -use flate2::bufread::DeflateDecoder; +use opus::{ + Channels, + Decoder as OpusDecoder, +}; use serenity::{ prelude::*, voice, @@ -59,6 +62,7 @@ impl PlayQueue { thread::spawn(move || { let queue_lck = Arc::clone(&queue); let voice_manager = voice_manager; + let mut opus_dec = OpusDecoder::new(48000, Channels::Stereo).unwrap(); loop { thread::sleep(Duration::from_millis(250)); @@ -107,8 +111,24 @@ impl PlayQueue { } } }, - Right(ref vec) => { - voice::pcm(true, DeflateDecoder::new(Cursor::new(vec.clone()))) + Right(ref v) => { + let mut out = Vec::new(); + + let mut acc: usize = 0; + while acc < v.len() { + dbg!(acc); + let mut wr = vec![0i16; 960]; + match opus_dec.decode(&v[acc..], &mut wr, true) { + Ok(len) => acc += len, + + Err(e) => { + info!("decoding opus packet: {}", e); + break; + }, + } + } + + voice::pcm(true, Cursor::new(out)) } }; diff --git a/src/commands/meme.rs b/src/commands/meme.rs index 160a652..e4fbde8 100644 --- a/src/commands/meme.rs +++ b/src/commands/meme.rs @@ -3,13 +3,19 @@ use std::{ sync::RwLock, }; +use byteorder::{ + ByteOrder, + NativeEndian, +}; use diesel::PgConnection; use failure::Error; -use flate2::{ - bufread::DeflateEncoder, - Compression, -}; use lazy_static::lazy_static; +use opus::{ + Application, + Bitrate, + Channels, + Encoder as OpusEncoder, +}; use rand::{Rng, thread_rng}; use serenity::{ builder::CreateMessage, @@ -26,7 +32,6 @@ use crate::{ audio::{ CtxExt, ffmpeg_dl, - Opus, parse_times, Pcm, PlayArgs, @@ -155,10 +160,7 @@ pub fn addaudiomeme(_: &mut Context, msg: &Message, mut args: Args) -> Result<() let (start, end) = parse_times(opts); let youtube_url = ytdl_url(audio_link.as_str())?; - let mut audio_reader = DeflateEncoder::new( - BufReader::new(ffmpeg_dl::<Pcm>(&youtube_url, start, end, None)?), - Compression::best(), - ); + let mut audio_reader = BufReader::new(ffmpeg_dl::<Pcm>(&youtube_url, start, end, None)?); let text = match args.multiple_quoted::<String>() { Ok(text) => text.join(" "), @@ -177,15 +179,44 @@ pub fn addaudiomeme(_: &mut Context, msg: &Message, mut args: Args) -> Result<() }) .ok(); - let mut audio_data = Vec::new(); - let bytes = audio_reader.read_to_end(&mut audio_data)?; + let i16_data: Vec<i16> = { + let mut audio_data = Vec::new(); + let bytes = audio_reader.read_to_end(&mut audio_data)?; + + let mut i16_data = Vec::with_capacity(bytes / 2); + i16_data.resize(bytes / 2, 0); + + NativeEndian::read_i16_into(&audio_data, &mut i16_data); + + i16_data + }; + + let mut enc = OpusEncoder::new(48000, Channels::Stereo, Application::Audio)?; + enc.set_vbr(false)?; + enc.set_bitrate(Bitrate::Bits(96 * 1024))?; + + let mut out = Vec::new(); + for elem in i16_data.chunks(960) { + let elem = if elem.len() == 960 { + elem + } else if elem.len() > 480 { + &elem[..480] + } else if elem.len() > 240 { + &elem[..240] + } else { + continue + }; + + let mut encoded = enc.encode_vec(elem, 1200)?; + out.append(&mut encoded); + } - if bytes == 0 { + if out.len() == 0 { debug!("read 0 bytes from audio reader"); return send(msg.channel_id, "🔇🔇🔇🔕🔕🔕🔕🔕🔇🔕🔕🔇🔕🔕📣📢📣📢📣", msg.tts); } - let audio_id = Audio::create(&conn, audio_data, msg.author.id.0)?; + let audio_id = Audio::create(&conn, out, msg.author.id.0)?; NewMeme { title, diff --git a/src/main.rs b/src/main.rs index 5162015..3a5aeac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ #![feature(impl_trait_in_bindings)] +extern crate byteorder; extern crate chrono; #[cfg(feature = "diesel")] #[macro_use] extern crate diesel; @@ -8,10 +9,10 @@ extern crate dotenv; extern crate either; #[macro_use] extern crate failure; extern crate fern; -extern crate flate2; #[cfg_attr(test, macro_use)] extern crate itertools; #[macro_use] extern crate lazy_static; #[macro_use] extern crate log; +extern crate opus; extern crate rand; extern crate regex; extern crate serde_json; |