fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[APU] Fixed incorrect frame count + removed hopefully useless check from now

Browse Source
This commit is contained in:
Gliniak
2022-12-13 21:47:35 +01:00
parent 16580f5fae
commit e00feb7b0f
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenia/apu/xma_context.cc
View File

@@ -509,17 +509,6 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
// split_frame_len_ - split_frame_len_partial_); // split_frame_len_ - split_frame_len_partial_);
} }
if (split_frame_len_partial_ > split_frame_len_) {
XELOGAPU(
"XmaContext {}: Error - Invalid split frame lengths! "
"frame_length: {} "
"partial_length: {}",
id(), split_frame_len_, split_frame_len_partial_);
split_frame_len_ = 0;
split_frame_len_partial_ = 0;
SwapInputBuffer(data);
return;
}
auto offset = stream.Copy( auto offset = stream.Copy(
xma_frame_.data() + 1 + xma_frame_.data() + 1 +
((split_frame_len_partial_ + split_frame_padding_start_) / 8), ((split_frame_len_partial_ + split_frame_padding_start_) / 8),
@@ -894,11 +883,11 @@ std::tuple<int, bool> XmaContext::GetPacketFrameCount(uint8_t* packet) {
int frame_count = 0; int frame_count = 0;
while (true) { while (true) {
frame_count++;
if (stream.BitsRemaining() < 15) { if (stream.BitsRemaining() < 15) {
return {frame_count, true}; return {frame_count, false};
} }
frame_count++;
uint64_t size = stream.Read(15); uint64_t size = stream.Read(15);
if ((size - 15) > stream.BitsRemaining()) { if ((size - 15) > stream.BitsRemaining()) {
return {frame_count, true}; return {frame_count, true};