audio: Add AAC decoding #16526
Open
audio: Add AAC decoding #16526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
torokati44
force-pushed
the
aac-decoding
branch
7 times, most recently
from
d7ad389
to
eb83b74
Compare
torokati44
force-pushed
the
aac-decoding
branch
3 times, most recently
from
a5d0e04
to
d82f98d
Compare
torokati44
force-pushed
the
aac-decoding
branch
2 times, most recently
from
05e536a
to
b3db352
Compare
|
I marked this as ready for review. The only thing I'm unsure about is whether the test needs more explanation. |
torokati44
added
the
waiting-on-review
kjarosh
reviewed
Jun 27, 2024
Comment on lines
+1
to
+7
|
|
||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=44100" -af "volume=5" -ac 2 -c:a aac tone_stereo_44100hz.flv | ||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=48000" -af "volume=5" -ac 2 -c:a aac tone_stereo_48000hz.flv | ||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=22050" -af "volume=5" -ac 2 -c:a aac tone_stereo_22050hz.flv | ||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=44100" -af "volume=5" -ac 1 -c:a aac tone_mono_44100hz.flv | ||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=48000" -af "volume=5" -ac 1 -c:a aac tone_mono_48000hz.flv | ||
| ffmpeg -f lavfi -i "sine=frequency=444:duration=1:sample_rate=22050" -af "volume=5" -ac 1 -c:a aac tone_mono_22050hz.flv |
There was a problem hiding this comment.
Maybe put it in generate_test_sounds.sh?
Comment on lines
+39
to
+41
| for (var j:uint=0; j<256; j++) { | ||
| var sp = ba.readFloat(); | ||
| var arg = j * coeff; |
There was a problem hiding this comment.
There are some mixed spaces and tabs in this file
kjarosh
reviewed
Jun 27, 2024
Comment on lines
+700
to
+707
| if self.sample_buf.capacity() < decoded.capacity() { | ||
| // Ensure our buffer has enough space for the decoded samples. | ||
| self.sample_buf = audio::SampleBuffer::new( | ||
| decoded.capacity() as core::units::Duration, | ||
| *decoded.spec(), | ||
| ); | ||
| } | ||
| self.sample_buf.copy_interleaved_ref(decoded); |
There was a problem hiding this comment.
There's some code duplication with mp3, maybe we should add some utility method or SampleBuffer wrapper?
kjarosh
reviewed
Jun 27, 2024
Comment on lines
+608
to
+609
| #[cfg(feature = "aac")] | ||
| mod aac { |
There was a problem hiding this comment.
Other decoders have their own files, maybe we should also move it to aac.rs for consistency?
kjarosh
approved these changes
Jun 27, 2024
torokati44
removed
the
waiting-on-review
torokati44
added
the
waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP, mostly pushing for visibility.Will fix the audio part of #8891.
TODO:
Parse "sequence headers", and configure the decoder accordingly.M4AInfoSplit into reasonable, smaller commits.Make sure no build errors whether the newaacfeature is enabled or not...Add some kind of test with different channel counts and sample rates.