debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-07 20:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

2026-09-07 09:38:06

Browse Source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
2026-09-07 09:38:06 +00:00
parent 0243a737e7
commit 7d3d082f4e
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio_core/adsp/apps/opus/opus_decoder.cpp
+25 -20
View File
@@ -62,36 +62,43 @@ public:
// However, native opus can also work with swrescale: // However, native opus can also work with swrescale:
// it uses planarfloat, we can resample to s16 // it uses planarfloat, we can resample to s16
AVCodec const* codec = avcodec_find_decoder_by_name("libopus"); AVCodec const* codec = avcodec_find_decoder_by_name("libopus");
bool is_libopus = codec != nullptr;
if (!codec) { if (!codec) {
LOG_WARNING(Audio_DSP, "unable to find libopus decoder -- using builtin opus decoder"); LOG_WARNING(Audio_DSP, "using ffmpeg native opus decoder");
codec = avcodec_find_decoder(AV_CODEC_ID_OPUS); codec = avcodec_find_decoder(AV_CODEC_ID_OPUS);
} }
if (codec) { if (codec) {
if ((avc = avc ? avc : avcodec_alloc_context3(codec))) { if ((avc = avc ? avc : avcodec_alloc_context3(codec))) {
const std::array<u8, 2> mapping_arr{0, 1}; if (is_libopus) {
mappings = mappings ? mappings : mapping_arr.data(); const std::array<u8, 2> mapping_arr{0, 1};
mappings = mappings ? mappings : mapping_arr.data();
// freed by avcodec_context_free()
u8 *edata = reinterpret_cast<u8*>(av_mallocz(OPUS_HEAD_SIZE + 2 * OPUS_MAX_CHANNELS + AV_INPUT_BUFFER_PADDING_SIZE));
ASSERT(edata);
edata[9] = u8(channel_count); //channels
edata[10] = u8(0); //opus->pre_skip
edata[16] = u8(0); //gain_db
edata[18] = u8(0); //channel_map
edata[OPUS_HEAD_SIZE + 0] = u8(total_stream_count);
edata[OPUS_HEAD_SIZE + 1] = u8(stereo_stream_count);
if (channel_count >= 1) edata[OPUS_HEAD_SIZE + 2] = mappings[0];
if (channel_count >= 2) edata[OPUS_HEAD_SIZE + 3] = mappings[1];
avc->extradata = edata;
avc->extradata_size = OPUS_HEAD_SIZE + 2 * channel_count;
}
std::array<u8, OPUS_HEAD_SIZE + 2 * OPUS_MAX_CHANNELS> edata{};
edata[9] = u8(channel_count); //channels
edata[10] = u8(0); //opus->pre_skip
edata[16] = u8(0); //gain_db
edata[18] = u8(0); //channel_map
edata[OPUS_HEAD_SIZE + 0] = u8(total_stream_count);
edata[OPUS_HEAD_SIZE + 1] = u8(stereo_stream_count);
if (channel_count >= 1) edata[OPUS_HEAD_SIZE + 2] = mappings[0];
if (channel_count >= 2) edata[OPUS_HEAD_SIZE + 3] = mappings[1];
avc->extradata = edata.data();
avc->extradata_size = OPUS_HEAD_SIZE + 2 * channel_count;
// FFmpeg hardcodes sample rate // FFmpeg hardcodes sample rate
avc->sample_rate = sample_rate; avc->sample_rate = sample_rate;
avc->request_sample_fmt = AV_SAMPLE_FMT_S16; avc->request_sample_fmt = AV_SAMPLE_FMT_S16;
av_channel_layout_default(&avc->ch_layout, channel_count); av_channel_layout_default(&avc->ch_layout, channel_count);
if (avcodec_open2(avc, codec, nullptr) >= 0) { if (avcodec_open2(avc, codec, nullptr) >= 0) {
avpkt = av_packet_alloc(); avpkt = av_packet_alloc();
frame = av_frame_alloc(); frame = av_frame_alloc();
return ResultSuccess; return ResultSuccess;
} else {
avcodec_free_context(&avc);
} }
} }
} }
@@ -99,17 +106,15 @@ public:
} }
Result Shutdown() { Result Shutdown() {
if (avc) avcodec_free_context(&avc); avcodec_free_context(&avc);
if (frame) av_frame_free(&frame); av_frame_free(&frame);
if (avpkt) av_packet_free(&avpkt); av_packet_free(&avpkt);
return ResultSuccess; return ResultSuccess;
} }
Result ResetDecoder() { Result ResetDecoder() {
if (avc) { if (avc) {
if (avcodec_is_open(avc)) avcodec_flush_buffers(avc); if (avcodec_is_open(avc)) avcodec_flush_buffers(avc);
if (avpkt) av_packet_unref(avpkt);
if (frame) av_frame_unref(frame);
return ResultSuccess; return ResultSuccess;
} }
return Service::Audio::ResultLibOpusInvalidState; return Service::Audio::ResultLibOpusInvalidState;