From b452b61e5805a79fbc34068f1cb0a0c3826fa900 Mon Sep 17 00:00:00 2001 From: kongfl888 K Date: Fri, 26 May 2023 09:58:17 +0800 Subject: [PATCH] audio_core/hle/{fdk, ffmpeg}_decoder:fix typos. (#4) --- src/audio_core/hle/fdk_decoder.cpp | 4 ++-- src/audio_core/hle/ffmpeg_decoder.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio_core/hle/fdk_decoder.cpp b/src/audio_core/hle/fdk_decoder.cpp index 175db9b05..f0ce089c2 100644 --- a/src/audio_core/hle/fdk_decoder.cpp +++ b/src/audio_core/hle/fdk_decoder.cpp @@ -130,13 +130,13 @@ std::optional FDKDecoder::Impl::Decode(const BinaryMessage& reque } if (request.decode_aac_request.src_addr < Memory::FCRAM_PADDR || - request.decode_aac_request.src_addr + request.size > + request.decode_aac_request.src_addr + request.decode_aac_request.size > Memory::FCRAM_PADDR + Memory::FCRAM_SIZE) { LOG_ERROR(Audio_DSP, "Got out of bounds src_addr {:08x}", request.decode_aac_request.src_addr); return {}; } - u8* data = memory.GetFCRAMPointer(request.src_addr - Memory::FCRAM_PADDR); + u8* data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR); std::array, 2> out_streams; diff --git a/src/audio_core/hle/ffmpeg_decoder.cpp b/src/audio_core/hle/ffmpeg_decoder.cpp index 8f9382c10..00524a8bc 100644 --- a/src/audio_core/hle/ffmpeg_decoder.cpp +++ b/src/audio_core/hle/ffmpeg_decoder.cpp @@ -66,16 +66,16 @@ FFMPEGDecoder::Impl::Impl(Memory::MemorySystem& memory) : memory(memory) { FFMPEGDecoder::Impl::~Impl() = default; std::optional FFMPEGDecoder::Impl::ProcessRequest(const BinaryMessage& request) { - if (request.codec != DecoderCodec::DecodeAAC) { + if (request.header.codec != DecoderCodec::DecodeAAC) { LOG_ERROR(Audio_DSP, "Got wrong codec {}", static_cast(request.header.codec)); return {}; } - switch (request.cmd) { + switch (request.header.cmd) { case DecoderCommand::Init: { return Initalize(request); } - case DecoderCommand::Decode: { + case DecoderCommand::EncodeDecode: { return Decode(request); } case DecoderCommand::Unknown: { @@ -163,7 +163,7 @@ std::optional FFMPEGDecoder::Impl::Decode(const BinaryMessage& re request.decode_aac_request.src_addr); return {}; } - u8* data = memory.GetFCRAMPointer(request.src_addr - Memory::FCRAM_PADDR); + u8* data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR); std::array, 2> out_streams;