ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[APU] Force buffer swap at the end of stream 

Plus some debugging messages and lint fixes
This commit is contained in:
Gliniak 2022-10-25 17:20:45 +02:00
parent 6b11787c93
commit 55877f4c61
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,8 +62,8 @@ int XmaContext::Setup(uint32_t id, Memory* memory, uint32_t guest_ptr) {
// Allocate ffmpeg stuff: // Allocate ffmpeg stuff:
av_packet_ = av_packet_alloc(); av_packet_ = av_packet_alloc();
assert_not_null(av_packet_); assert_not_null(av_packet_);
//chrispy: preallocate this buffer so that ffmpeg isn't reallocating it for every packet, // chrispy: preallocate this buffer so that ffmpeg isn't reallocating it for
//these allocations were causing RtlSubsegmentInitialize // every packet, these allocations were causing RtlSubsegmentInitialize
av_packet_->buf = av_buffer_alloc(128 * 1024); av_packet_->buf = av_buffer_alloc(128 * 1024);
// find the XMA2 audio decoder // find the XMA2 audio decoder
av_codec_ = avcodec_find_decoder(AV_CODEC_ID_XMAFRAMES); av_codec_ = avcodec_find_decoder(AV_CODEC_ID_XMAFRAMES);
@ -93,7 +93,6 @@ int XmaContext::Setup(uint32_t id, Memory* memory, uint32_t guest_ptr) {
} }
bool XmaContext::Work() { bool XmaContext::Work() {
if (!is_enabled() || !is_allocated()) { if (!is_enabled() || !is_allocated()) {
return false; return false;
} }
@ -235,6 +234,7 @@ bool XmaContext::ValidFrameOffset(uint8_t* block, size_t size_bytes,
GetFramePacketNumber(block, size_bytes, frame_offset_bits); GetFramePacketNumber(block, size_bytes, frame_offset_bits);
if (packet_num == -1) { if (packet_num == -1) {
// Invalid packet number // Invalid packet number
XELOGAPU("ValidFrameOffset: Invalid packet number");
return false; return false;
} }
@ -243,6 +243,7 @@ bool XmaContext::ValidFrameOffset(uint8_t* block, size_t size_bytes,
uint32_t first_frame_offset = xma::GetPacketFrameOffset(packet); uint32_t first_frame_offset = xma::GetPacketFrameOffset(packet);
if (first_frame_offset == -1 || first_frame_offset > kBitsPerPacket) { if (first_frame_offset == -1 || first_frame_offset > kBitsPerPacket) {
XELOGAPU("ValidFrameOffset: Invalid frame offset {}", first_frame_offset);
// Packet only contains a partial frame, so no frames can start here. // Packet only contains a partial frame, so no frames can start here.
return false; return false;
} }
@ -255,12 +256,16 @@ bool XmaContext::ValidFrameOffset(uint8_t* block, size_t size_bytes,
} }
if (stream.BitsRemaining() < 15) { if (stream.BitsRemaining() < 15) {
XELOGAPU("ValidFrameOffset: No room for next frame header {}",
first_frame_offset);
// Not enough room for another frame header. // Not enough room for another frame header.
return false; return false;
} }
uint64_t size = stream.Read(15); uint64_t size = stream.Read(15);
if ((size - 15) > stream.BitsRemaining()) { if ((size - 15) > stream.BitsRemaining()) {
XELOGAPU("ValidFrameOffset: Last frame {} - {}", first_frame_offset,
size);
// Last frame. // Last frame.
return false; return false;
} else if (size == 0x7FFF) { } else if (size == 0x7FFF) {
@ -413,6 +418,10 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
BitStream stream(current_input_buffer, current_input_size * 8); BitStream stream(current_input_buffer, current_input_size * 8);
stream.SetOffset(data->input_buffer_read_offset); stream.SetOffset(data->input_buffer_read_offset);
if (data->input_buffer_read_offset == current_input_size * 8) {
SwapInputBuffer(data);
return;
}
// if we had a buffer swap try to skip packets first // if we had a buffer swap try to skip packets first
if (packets_skip_ > 0) { if (packets_skip_ > 0) {
packet_idx = packet_idx =
@ -624,8 +633,8 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
// assert_true(frame_is_split == (frame_idx == -1)); // assert_true(frame_is_split == (frame_idx == -1));
// dump_raw(av_frame_, id()); // dump_raw(av_frame_, id());
ConvertFrame((const uint8_t**)av_frame_->data, bool(av_frame_->channels > 1), ConvertFrame((const uint8_t**)av_frame_->data,
raw_frame_.data()); bool(av_frame_->channels > 1), raw_frame_.data());
// decoded_consumed_samples_ += kSamplesPerFrame; // decoded_consumed_samples_ += kSamplesPerFrame;
auto byte_count = kBytesPerFrameChannel << data->is_stereo; auto byte_count = kBytesPerFrameChannel << data->is_stereo;
@ -636,7 +645,8 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
total_samples += id_ == 0 ? kSamplesPerFrame : 0; total_samples += id_ == 0 ? kSamplesPerFrame : 0;
uint32_t offset = std::max(kBitsPerHeader, data->input_buffer_read_offset); uint32_t offset =
std::max(kBitsPerHeader, data->input_buffer_read_offset);
offset = static_cast<uint32_t>( offset = static_cast<uint32_t>(
GetNextFrame(current_input_buffer, current_input_size, offset)); GetNextFrame(current_input_buffer, current_input_size, offset));
@ -682,6 +692,9 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
xma::GetPacketFrameOffset(packet) + packet_idx * kBitsPerPacket; xma::GetPacketFrameOffset(packet) + packet_idx * kBitsPerPacket;
} }
// TODO buffer bounds check // TODO buffer bounds check
if (offset >= (current_input_size << 3)) {
offset = uint32_t(current_input_size << 3);
}
assert_true(data->input_buffer_read_offset < offset); assert_true(data->input_buffer_read_offset < offset);
data->input_buffer_read_offset = offset; data->input_buffer_read_offset = offset;
} }