Improve SAS ADSR rates and types #5361
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
They were wrong for a few combinations before. Could have effected how accurate sound effects were (they may have been too quite, or dropped off wrong, etc.)
Might happen due to a bug in a game, rejected by real firmware.
Might prevent a game bug from breaking sounds, pretty unlikely.
| if (voiceNum >= PSP_SAS_VOICES_MAX || voiceNum < 0) { | ||
| WARN_LOG(SCESAS, "%s: invalid voicenum %d", __FUNCTION__, voiceNum); | ||
| return ERROR_SAS_INVALID_VOICE; | ||
| } | ||
| // Create a mask like flag for the invalid values. | ||
| int invalid = (a < 0 ? 0x1 : 0) | (a < 0 ? 0x1 : 0) | (s < 0 ? 0x1 : 0) | (r < 0 ? 0x1 : 0); |
There was a problem hiding this comment.
Hm, there are some typos on this line. Not only is 'a' checked twice, but you set all the bits to 0x1 - I would have expected you to use 0x1, 0x2, 0x4, 0x8 for example.
There was a problem hiding this comment.
Duh, sorry. My test probably should've tested each case individually.
-[Unknown]
hrydgard
added a commit
that referenced
this pull request
Feb 8, 2014
Improve SAS ADSR rates and types
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This does not actually affect the envelope calculation, just the initial values as set by the __sceSasSetSimpleADSR() func and validations for the other two __sceSasSetADSR*() funcs.
The simple bitfields were not being parsed entirely correctly. Final Fantasy Tactics, at least, hits basically all of these cases. I don't have a good ear for it, but this may possibly improve some of its sound effects. It could also affect games hanging, since a couple cases produced negative or 0 rates incorrectly.
This passes some in-progress tests I have, but they depend on the sceSas struct being written properly, which I'm still not ready with.
Also adds reporting for the "Every Extend Extra" case which I can't reproduce returning success. Worried this could break things, does anyone have Every Extend Extra to verify it calls it this way still (I see from blame history that this was quite a long time ago)?
@gid15 I believe the "simple ADSR" bit stuff came from JPCSP. I checked really quick and AFAICT it's incorrect per these changes / my tests. Just FYI.
-[Unknown]