From 7531e50d27789bb00be2bbcefa04373692c5b647 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 14 Jun 2013 23:24:37 -0700 Subject: [PATCH] Ignore/fail on bad seeks for atrac3 audio. This was happening in Disgaea, and causing it to crash. --- Core/HLE/sceAtrac.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index b217e8394e..96c36aa9ad 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -913,7 +913,9 @@ u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFirstBuf, #ifdef USE_FFMPEG int _AtracReadbuffer(void *opaque, uint8_t *buf, int buf_size) { - Atrac *atrac = (Atrac*)opaque; + Atrac *atrac = (Atrac *)opaque; + if (atrac->decodePos > atrac->first.filesize) + return -1; int size = std::min((int)atrac->atracBufSize, buf_size); size = std::max(std::min(((int)atrac->first.size - (int)atrac->decodePos), size), 0); if (size > 0) @@ -925,6 +927,9 @@ int _AtracReadbuffer(void *opaque, uint8_t *buf, int buf_size) int64_t _AtracSeekbuffer(void *opaque, int64_t offset, int whence) { Atrac *atrac = (Atrac*)opaque; + if (offset > atrac->first.filesize) + return -1; + switch (whence) { case SEEK_SET: atrac->decodePos = (u32)offset; @@ -935,8 +940,12 @@ int64_t _AtracSeekbuffer(void *opaque, int64_t offset, int whence) case SEEK_END: atrac->decodePos = atrac->first.filesize - (u32)offset; break; +#ifdef USE_FFMPEG + case AVSEEK_SIZE: + return atrac->first.filesize; +#endif } - return offset; + return atrac->decodePos; } #endif // USE_FFMPEG