debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-21 17:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

2026-09-13 06:00:35

Browse Source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
2026-09-13 06:00:36 +00:00
parent d5ad4406e7
commit ad0dbace1b
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio_core/adsp/apps/opus/opus_decoder.cpp
+24 -19
View File
@@ -93,7 +93,7 @@ public:
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(); pkt = av_packet_alloc();
frame = av_frame_alloc(); frame = av_frame_alloc();
return ResultSuccess; return ResultSuccess;
} }
@@ -105,7 +105,7 @@ public:
Result Shutdown() { Result Shutdown() {
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&avpkt); av_packet_free(&pkt);
avcodec_free_context(&avc); avcodec_free_context(&avc);
return ResultSuccess; return ResultSuccess;
} }
@@ -125,17 +125,23 @@ public:
while (rem_output_bytes > 0) { while (rem_output_bytes > 0) {
int r = avcodec_receive_frame(avc, frame); int r = avcodec_receive_frame(avc, frame);
if (r == AVERROR(EAGAIN)) { if (r == AVERROR(EAGAIN)) {
av_packet_unref(avpkt); av_frame_unref(frame);
av_new_packet(avpkt, int(input_data_size) + AV_INPUT_BUFFER_PADDING_SIZE); av_packet_unref(pkt);
std::memcpy(avpkt->data, reinterpret_cast<const u8*>(input_data), input_data_size); if ((r = av_new_packet(pkt, int(input_data_size))) >= 0) {
r = avcodec_send_packet(avc, avpkt); std::memcpy(pkt->data, reinterpret_cast<const u8*>(input_data), input_data_size);
r = avcodec_send_packet(avc, pkt);
ASSERT(r >= 0); ASSERT(r >= 0);
} else {
return Service::Audio::ResultLibOpusInvalidState;
}
} else if (r == AVERROR_EOF) { } else if (r == AVERROR_EOF) {
av_frame_unref(frame);
break; break;
} else if (r >= 0) { } else if (r >= 0) {
auto const bsize = av_samples_get_buffer_size(frame->linesize, frame->ch_layout.nb_channels, frame->nb_samples, AV_SAMPLE_FMT_S16, 1); auto const input_bsize = av_samples_get_buffer_size(frame->linesize, frame->ch_layout.nb_channels, frame->nb_samples, AV_SAMPLE_FMT_S16, 1);
if (frame->format == AV_SAMPLE_FMT_S16) { if (frame->format == AV_SAMPLE_FMT_S16) {
std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), frame->data[0], size_t(bsize)); ASSERT(size_t(int(output_data_size) - rem_output_bytes + input_bsize) <= size_t(output_data_size));
std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), frame->data[0], size_t(input_bsize));
} else { } else {
SwrContext *swr = nullptr; SwrContext *swr = nullptr;
if (swr_alloc_set_opts2( if (swr_alloc_set_opts2(
@@ -150,20 +156,19 @@ public:
nullptr nullptr
) >= 0) { ) >= 0) {
if (swr_init(swr) >= 0) { if (swr_init(swr) >= 0) {
AVFrame *s16_frame = av_frame_alloc(); 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));
s16_frame->format = AV_SAMPLE_FMT_S16; uint8_t *output = nullptr;
s16_frame->sample_rate = frame->sample_rate; av_samples_alloc(&output, frame->linesize, frame->ch_layout.nb_channels, out_samples, AV_SAMPLE_FMT_S16, 0);
av_channel_layout_copy(&s16_frame->ch_layout, &frame->ch_layout); out_samples = swr_convert(swr, &output, out_samples, (const uint8_t **)frame->data, frame->nb_samples);
s16_frame->nb_samples = frame->nb_samples; std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), output, size_t(input_bsize));
av_frame_get_buffer(s16_frame, 0); av_freep(&output);
swr_convert(swr, s16_frame->data, s16_frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples);
std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), s16_frame->data[0], size_t(bsize));
swr_free(&swr);
} }
swr_free(&swr);
} }
} }
out_sample_count += frame->nb_samples; out_sample_count += frame->nb_samples;
rem_output_bytes -= bsize; rem_output_bytes -= input_bsize;
av_frame_unref(frame);
} else { } else {
LOG_ERROR(Audio_DSP, "{}", r); LOG_ERROR(Audio_DSP, "{}", r);
break; break;
@@ -176,7 +181,7 @@ public:
} }
AVCodecContext* avc = nullptr; AVCodecContext* avc = nullptr;
AVPacket* avpkt = nullptr; AVPacket* pkt = nullptr;
AVFrame* frame = nullptr; AVFrame* frame = nullptr;
}; };
} // namespace } // namespace