summaryrefslogtreecommitdiff
path: root/src/audio
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-08-08 22:16:31 +1000
committerjacqueline <me@jacqueline.id.au>2023-08-08 22:16:31 +1000
commit6c3501dbcbd1095293d8a4d4b83311e94a7df9a8 (patch)
tree25bfee94dd427a2110cab3e0ac1da6b5d05dadf2 /src/audio
parente1181fbe59a835ea9c93d6e067e9757e8c522d3c (diff)
downloadtangara-fw-6c3501dbcbd1095293d8a4d4b83311e94a7df9a8.tar.gz
Flesh out opus decoder. it doesn't work! i hate opus.
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/audio_task.cpp2
-rw-r--r--src/audio/fatfs_audio_input.cpp4
-rw-r--r--src/audio/i2s_audio_output.cpp3
3 files changed, 4 insertions, 5 deletions
diff --git a/src/audio/audio_task.cpp b/src/audio/audio_task.cpp
index 75b44594..046df378 100644
--- a/src/audio/audio_task.cpp
+++ b/src/audio/audio_task.cpp
@@ -125,7 +125,7 @@ AudioTask::AudioTask(IAudioSource* source, IAudioSink* sink)
has_begun_decoding_(false),
current_input_format_(),
current_output_format_(),
- codec_buffer_(new RawStream(kSampleBufferSize)) {}
+ codec_buffer_(new RawStream(kSampleBufferSize, MALLOC_CAP_8BIT)) {}
void AudioTask::Main() {
for (;;) {
diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp
index 73586f09..9ca41da1 100644
--- a/src/audio/fatfs_audio_input.cpp
+++ b/src/audio/fatfs_audio_input.cpp
@@ -313,8 +313,8 @@ auto FatfsAudioInput::ContainerToStreamType(database::Encoding enc)
return codecs::StreamType::kPcm;
case database::Encoding::kFlac:
return codecs::StreamType::kFlac;
- case database::Encoding::kOgg: // Misnamed; this is Ogg Vorbis.
- return codecs::StreamType::kVorbis;
+ case database::Encoding::kOpus:
+ return codecs::StreamType::kOpus;
case database::Encoding::kUnsupported:
default:
return {};
diff --git a/src/audio/i2s_audio_output.cpp b/src/audio/i2s_audio_output.cpp
index d60ddfa4..e53dbe2a 100644
--- a/src/audio/i2s_audio_output.cpp
+++ b/src/audio/i2s_audio_output.cpp
@@ -120,8 +120,7 @@ auto I2SAudioOutput::PrepareFormat(const StreamInfo::Pcm& orig)
return StreamInfo::Pcm{
.channels = std::min<uint8_t>(orig.channels, 2),
.bits_per_sample = std::clamp<uint8_t>(orig.bits_per_sample, 16, 32),
- .sample_rate = 44100,
- //.sample_rate = std::clamp<uint32_t>(orig.sample_rate, 8000, 96000),
+ .sample_rate = std::clamp<uint32_t>(orig.sample_rate, 8000, 96000),
};
}