mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 19:13:40 +01:00
Ignore/fail on bad seeks for atrac3 audio.
This was happening in Disgaea, and causing it to crash.
This commit is contained in:
1 parent
34323a1192
commit
7531e50d27
1 file changed
+11
-2
+11
-2
@@ -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
|
||||
|
||||
Reference in new issue
Block a user