Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rust-native audio transcoding #317

Merged
merged 13 commits into from
Apr 19, 2023
Merged

Rust-native audio transcoding #317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d9b13d4
fix: replace SOUND_GRAPH_EXTENSION string with constant value for aud…
marceline-cramer Mar 30, 2023
7771c6b
Add symphonia and vorbis_rs to workspace and crates/build deps
marceline-cramer Apr 15, 2023
aecd641
feat: WIP replace ffmpeg with symphonia + vorbis_rs
marceline-cramer Apr 16, 2023
18580bc
feat: hint symphonia format probe with audio file extension
marceline-cramer Apr 17, 2023
2145b17
feat: randomly generate ogg stream serial
marceline-cramer Apr 17, 2023
a12066e
fix: better audio transcoding error handling
marceline-cramer Apr 17, 2023
7baf823
fix: skip duplicating of audio buffers
marceline-cramer Apr 17, 2023
a43f980
Comment audio transcoding code
marceline-cramer Apr 17, 2023
d1a8973
Remove old ffmpeg audio conversion code
marceline-cramer Apr 17, 2023
c6477aa
Merge branch 'main' into rust-native-audio-transcoding
marceline-cramer Apr 17, 2023
5f4bcbf
fix: Cargo.lock
marceline-cramer Apr 17, 2023
ea24fb5
fix: enable pcm feature on symphonia (fixes wav decoding)
marceline-cramer Apr 17, 2023
c887f50
fix: properly count decoded audio channels
marceline-cramer Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: randomly generate ogg stream serial
  • Loading branch information
@marceline-cramer
marceline-cramer committed Apr 17, 2023
commit 2145b176104723e190ae1f44c0a7cbb765874159
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ dyn-clonable = { workspace = true }
cargo_toml = { workspace = true }
symphonia = { workspace = true }
vorbis_rs = { workspace = true }
rand = { workspace = true }
3 changes: 2 additions & 1 deletion crates/build/src/pipelines/audio/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,13 @@ where
let dec_opts = DecoderOptions::default();
let mut decoder = symphonia::default::get_codecs().make(&track.codec_params, &dec_opts).expect("unsupported codec");

let stream_serial: i32 = rand::random();
let sampling_rate = decoder.codec_params().sample_rate.unwrap();
let channels: u8 = decoder.codec_params().channels.unwrap().bits().try_into().unwrap();
let bitrate = VorbisBitrateManagementStrategy::QualityVbr { target_quality: 0.9 };

let mut encoder = VorbisEncoder::new(
0, // TODO randomly generate this
stream_serial,
[("", ""); 0], // no tags,
NonZeroU32::new(sampling_rate).unwrap(),
NonZeroU8::new(channels).unwrap(),
Expand Down