From a6f81d1bddda1717470f5bb8de9d29a82f215511 Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Sun, 13 Sep 2026 20:32:25 +0000
Subject: [PATCH] 2026-09-13 20:32:25

Signed-off-by: lizzie <lizzie@eden-emu.dev>
---
 .../adsp/apps/opus/opus_decoder.cpp           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/audio_core/adsp/apps/opus/opus_decoder.cpp b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
index c163cd4077..207e5dd158 100644
--- a/src/audio_core/adsp/apps/opus/opus_decoder.cpp
+++ b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
@@ -92,6 +92,7 @@ public:
             // FFmpeg hardcodes sample rate
             avc->sample_rate = sample_rate;
             avc->request_sample_fmt = AV_SAMPLE_FMT_S16;
+            avc->max_samples = 0x10000; //64K
             av_channel_layout_default(&avc->ch_layout, channel_count);
             if (avcodec_open2(avc, codec, nullptr) >= 0) {
                 ASSERT(avc->request_sample_fmt == AV_SAMPLE_FMT_S16);
@@ -101,13 +102,16 @@ public:
                 if (swr_alloc_set_opts2(
                     &swr,
                     &avc->ch_layout, AV_SAMPLE_FMT_S16, 48000,
-                    &avc->ch_layout, AV_SAMPLE_FMT_FLTP, 48000,
+                    &avc->ch_layout, (enum AVSampleFormat)avc->sample_fmt, 48000,
                     0, nullptr) >= 0) {
                     if (swr_init(swr) >= 0) {
-                        return ResultSuccess;
+                        if (av_samples_alloc(stg_arr, nullptr, avc->ch_layout.nb_channels, (int)avc->max_samples, AV_SAMPLE_FMT_S16, 0) >= 0) {
+                            return ResultSuccess;
+                        }
                     }
                 }
             }
+            av_freep(stg_arr);
             swr_free(&swr);
             av_frame_free(&frame);
             av_packet_free(&pkt);
@@ -117,6 +121,7 @@ public:
     }
 
     Result Shutdown() {
+        av_freep(stg_arr);
         swr_free(&swr);
         av_frame_free(&frame);
         av_packet_free(&pkt);
@@ -135,13 +140,12 @@ public:
     Result Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data, u64 input_data_size) {
         out_sample_count = 0;
         if (input_data_size == 0 || output_data_size == 0)
-            return ResultSuccess;
+            return Service::Audio::ResultLibOpusInvalidPacket;
         if (avc) {
             int r;
             if ((r = av_new_packet(pkt, int(input_data_size))) >= 0) {
                 std::memcpy(pkt->data, reinterpret_cast<const u8*>(input_data), input_data_size);
                 if ((r = avcodec_send_packet(avc, pkt)) >= 0) {
-                    av_frame_unref(frame);
                     while ((r = avcodec_receive_frame(avc, frame)) >= 0) {
                         u8 *dst_arr[8] = {reinterpret_cast<u8*>(output_data), 0};
                         if (frame->format == avc->request_sample_fmt) {
@@ -150,18 +154,12 @@ public:
                             out_sample_count += frame->nb_samples;
                         } else {
                             int out_samples = int(av_rescale_rnd(swr_get_delay(swr, frame->sample_rate) + frame->nb_samples, frame->sample_rate, frame->sample_rate, AV_ROUND_UP));
-                            u8 *src_arr[8] = {0};
-                            if ((r = av_samples_alloc(src_arr, frame->linesize, frame->ch_layout.nb_channels, out_samples, avc->request_sample_fmt, 0)) >= 0) {
-                                out_samples = swr_convert(swr, src_arr, out_samples, (const u8 **)frame->data, frame->nb_samples);
-                                av_samples_copy(dst_arr, src_arr, out_sample_count, 0, out_samples, frame->ch_layout.nb_channels, avc->request_sample_fmt);
-                                av_freep(src_arr);
-                                out_sample_count += out_samples;
-                            } else {
-                                LOG_ERROR(Audio_DSP, "skipped");
-                            }
+                            out_samples = swr_convert(swr, stg_arr, out_samples, (const u8 **)frame->data, frame->nb_samples);
+                            av_samples_copy(dst_arr, stg_arr, out_sample_count, 0, out_samples, frame->ch_layout.nb_channels, avc->request_sample_fmt);
+                            out_sample_count += out_samples;
                         }
-                        av_frame_unref(frame);
                     }
+                    av_frame_unref(frame);
                     if (r == AVERROR(EAGAIN) || r == AVERROR_EOF) {
                         // non-errors
                         LOG_DEBUG(Audio_DSP, "{}", r);
@@ -186,6 +184,8 @@ public:
     AVPacket* pkt = nullptr;
     AVFrame* frame = nullptr;
     SwrContext* swr = nullptr;
+    // Array of staging buffers
+    u8* stg_arr[8] = {nullptr};
 };
 } // namespace