Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Atrac: Adjust reads a bit earlier when skipping.

Browse source 
The frames we initially get may not start at 0, depending on how many
frames we're skipping.  Of course...
This commit is contained in:
Unknown W. Brackets 2016-01-02 11:13:09 -08:00
parent 6fe5fe07a4
commit 85ff5eb68a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/HLE/sceAtrac.cpp
View file

@ -408,7 +408,12 @@ struct Atrac {
// Prefill the decode buffer with packets before the first sample offset.
avcodec_flush_buffers(pCodecCtx);
const u32 off = getFileOffsetBySample(sample);
int adjust = 0;
if (sample == 0) {
int offsetSamples = firstSampleoffset + firstOffsetExtra();
adjust = -(offsetSamples % samplesPerFrame());
}
const u32 off = getFileOffsetBySample(sample + adjust);
const u32 backfill = atracBytesPerFrame * 2;
const u32 start = off - dataOff < backfill ? dataOff : off - backfill;
for (u32 pos = start; pos < off; pos += atracBytesPerFrame) {
@ -426,8 +431,8 @@ struct Atrac {
currentSample = sample;
}
bool FillPacket() {
u32 off = getFileOffsetBySample(currentSample);
bool FillPacket(int adjust = 0) {
u32 off = getFileOffsetBySample(currentSample + adjust);
if (off < first.size) {
#ifdef USE_FFMPEG
av_init_packet(packet);
@ -1004,7 +1009,7 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
atrac->SeekToSample(atrac->currentSample);
AtracDecodeResult res = ATDECODE_FEEDME;
while (atrac->FillPacket()) {
while (atrac->FillPacket(-skipSamples)) {
res = atrac->DecodePacket();
if (res == ATDECODE_FAILED) {
*SamplesNum = 0;