Commit graph

470 commits

Author SHA1 Message Date
Unknown W. Brackets
a0604c6de3 Atrac: DRY a tiny bit of the code down. 2015-11-08 09:04:11 -08:00
Unknown W. Brackets
28a957694a Atrac: Apply second FACT as loop offset.
It seems like, when these values are different, the difference indicates
some kind of delta in other sample values?

Mostly trying to match values coming out of firmware structs here.

Fixes music looping in Kurohyo 2.
2015-11-08 08:26:41 -08:00
Unknown W. Brackets
27043b5fa5 Atrac: Do not output remain on ending decode.
It's not supposed to output 0, or -1, or anything.  It leaves the original
value in place.  This is probably why some games "liked" different values.
2015-11-08 08:20:09 -08:00
Unknown W. Brackets
9da62c1efc Atrac: Use end codes for remaining when streaming. 2015-11-07 23:30:09 -08:00
Unknown W. Brackets
959887d407 Atrac: Correct remaining frames return value.
Streaming buffers still not correct in some cases, primarily looping.
2015-11-07 23:30:09 -08:00
Unknown W. Brackets
e28fa3c426 Atrac: Correct transition to fully loaded.
Normally it won't go over of course, oops.
2015-11-07 23:30:05 -08:00
Unknown W. Brackets
61e530df91 Atrac: Check more buffer states in GetRemainFrame. 2015-11-07 23:30:04 -08:00
Unknown W. Brackets
a932b0858c Atrac: Make sure NO_DATA is always set.
This way we can move away from data_buf, which eventually we'll stop using
entirely, in preference for PSP RAM.
2015-11-07 23:29:59 -08:00
Unknown W. Brackets
3f3700cb45 Atrac: Allow games to update buffer state.
Because they can and do.  This primarily only happens with low level and
SAS streams, I think.
2015-11-07 23:29:59 -08:00
Unknown W. Brackets
91de8e46c1 Atrac: Fix an internal typo. 2015-11-07 23:29:58 -08:00
Unknown W. Brackets
26a81f5179 Atrac: Simplify USE_FFMPEG checks.
Maybe we should just remove the option, but this way the behavior is a lot
more similar.
2015-11-07 23:29:58 -08:00
Unknown W. Brackets
9ebc9f695e Atrac: Clean up logging in sceAtracGetRemainFrame. 2015-11-07 23:29:57 -08:00
Unknown W. Brackets
3afc86e9b8 Atrac: correct offsetting logic in resetting.
Probably not super important exactly, but got the numbers backwards when I
reduced the test data.  Oops.
2015-11-06 23:19:21 -08:00
Unknown W. Brackets
696cb6649e Atrac: Match PSP on reset of streaming data.
This attempts to match the sizes and positions requested by the PSP
firmware APIs.  The two functions have to match: if they don't, it will
start reading incorrect data.
2015-11-05 23:23:59 -08:00
Unknown W. Brackets
4511407506 Atrac: Add reschedule when resetting play pos.
This matches tests, although the actual delay is more variable.
2015-11-05 23:23:55 -08:00
Unknown W. Brackets
a2c4f7760a Atrac: Add range check when resetting play pos. 2015-11-05 23:23:50 -08:00
Unknown W. Brackets
91e5916f66 Atrac: Fix sample range check to match output.
It allows some negative values, actually.
2015-11-05 23:23:45 -08:00
Unknown W. Brackets
85fac290c9 Atrac: Calc NO DATA status when loading old state. 2015-10-25 18:00:13 -07:00
Unknown W. Brackets
2b58af3db5 Atrac: Handle loop samples more correctly.
They need to be offset same as currentSamples.  Starting to really think
it'd be better to offset currentSamples instead...
2015-10-25 17:04:27 -07:00
Unknown W. Brackets
278d6b3690 Atrac: Set 0 read offset when fully loaded. 2015-10-25 17:04:27 -07:00
Unknown W. Brackets
85a699912d Atrac: Correct streamed bytes field in context. 2015-10-25 17:04:26 -07:00
Unknown W. Brackets
5cc13c45f4 Atrac: Try to handle endSample more consistently.
Maybe we should offset currentSample by the firstSampleOffset instead?
2015-10-25 17:04:25 -07:00
Unknown W. Brackets
e51891e9cd Atrac: Keep track of PSP-like buffer status.
This isn't correct yet, but tracking this much fixes looping of certain
audio.
2015-10-25 17:04:25 -07:00
Unknown W. Brackets
7e05d0db4b Atrac: Correct decode data when there's an offset. 2015-10-25 17:04:24 -07:00
Unknown W. Brackets
e90f88a687 Atrac: Parse size and fact offset more correctly. 2015-10-25 17:04:24 -07:00
Unknown W. Brackets
2e5f8d687f Atrac: Validate loop end and return an error. 2015-10-25 17:04:23 -07:00
Unknown W. Brackets
9ea765a347 Atrac: Calculate total samples based on data chunk.
Not on the entire RIFF size, which will be (slightly) inflated.
2015-10-25 17:04:22 -07:00
Unknown W. Brackets
ac56eff31c Atrac: Parse the smpl chunk more correctly.
Returns the same errors as the PSP.
2015-10-25 17:04:22 -07:00
Unknown W. Brackets
596ecdc431 Atrac: Allow data to extend outside RIFF size.
This seems technically incorrect, but it's allowed on the PSP, possibly
intentionally due to data shipped truncated by accident?
2015-10-25 17:04:21 -07:00
Unknown W. Brackets
522a1743f4 Atrac: Return an error if there's no data chunk. 2015-10-25 17:04:20 -07:00
Unknown W. Brackets
f7fa0a06d4 Atrac: Reset the fileoffset only when adding data.
Otherwise, it's only a seek.  For example, a seek to 0, as commonly seen.
2015-10-24 10:37:14 -07:00
Unknown W. Brackets
23c27d61df Improve an error return value. 2015-10-18 13:02:05 -07:00
Unknown W. Brackets
d0a9813844 Account for uneven sized chunks by rounding up.
Chunks have an extra pad byte if the size is uneven.  This probably isn't
happening, but just to be safe.
2015-10-18 12:50:40 -07:00
Unknown W. Brackets
8fa843bbc3 Atrac: attempt to power through bad frames. 2015-10-17 16:20:27 -07:00
Unknown W. Brackets
d30508ac43 Buildfix for Symbian/Blackberry/etc. 2015-10-17 16:20:27 -07:00
Unknown W. Brackets
60378dd59d Atrac: Hack to make seeking in GTA work. 2015-10-17 16:20:26 -07:00
Unknown W. Brackets
7d32876610 Atrac: Cleanup FFmpeg context ptr management. 2015-10-17 16:20:25 -07:00
Unknown W. Brackets
b47458eabb Atrac: fix loading certain savestates.
Some worked with it that high, but others not.
2015-10-17 16:20:24 -07:00
Unknown W. Brackets
5177f16c8d Atrac: Use constants for the states, more clarity. 2015-10-17 16:20:23 -07:00
Unknown W. Brackets
310aa6ed47 Atrac: Remove avio helpers. 2015-10-17 16:20:22 -07:00
Unknown W. Brackets
6420b679d4 Atrac: Split out low-level packet handling.
So we don't have the hack in the other code at all.
2015-10-17 16:20:22 -07:00
Unknown W. Brackets
5174f7df69 Atrac: Read in the jointStereo flag for ATRAC3. 2015-10-17 16:20:21 -07:00
Unknown W. Brackets
27a10bc49f Atrac: Fix AA3 dataOff value.
Note: will still be wrong in savestates...
2015-10-17 16:20:20 -07:00
Unknown W. Brackets
7d0dd0b94a Atrac: Stop using avio/avformat entirely.
Probably breaks AA3 support at this point...
2015-10-17 16:20:20 -07:00
Unknown W. Brackets
2037977292 Revert compatibility flag for GTA Music Hack.
This reverts commit eb4ca0cf81.
2015-10-17 16:20:19 -07:00
Unknown W. Brackets
4e7c59daae Fix minor typo. 2015-10-12 22:14:14 -07:00
Unknown W. Brackets
679b64ef5a Atrac: calculate instead of using header value map.
These are knowable values, so there's no real benefit to a static table
except potentially error detection.
2015-10-12 22:10:35 -07:00
Henrik Rydgard
eb4ca0cf81 Add a compatibility flag to revert sceAtrac to before #6976. Makes audio work in GTA again.
Hopefully we will find a better fix in the future.

Also see issue #7863.
2015-09-27 11:51:46 +02:00
Henrik Rydgard
9937b41461 ARM64: Fix vi2uc and vi2us and enable them. 2015-07-11 16:46:11 +02:00
Unknown W. Brackets
ffe7ef1ee2 Avoid spurious warnings in sceAtrac.
Valkyrie Profile for example calls this, doesn't seem like 0 matters.
2015-04-12 10:35:53 -07:00