Set Sample Rate to 32000 hz by sonicdcer · Pull Request #4780 · HarbourMasters/Shipwright

sonicdcer · 2025-01-01T05:04:06Z

This change fixes Vibrato and Portamento issues with the port.

Build Artifacts

briaguya0 · 2025-01-01T16:24:54Z

soh/soh/OTRGlobals.cpp

+        #if 0
+        // Values for 44100 hz
        #define SAMPLES_HIGH 752
        #define SAMPLES_LOW 720
+        #else
+        // Values for 32000 hz
+        #define SAMPLES_HIGH 560
+        #define SAMPLES_LOW 528
+
+        #endif


instead of this can we just change

//AudioMgr_ThreadEntry(&gAudioMgr); // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333.. // in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528 //#define SAMPLES_HIGH 560 //#define SAMPLES_LOW 528 // PAL values //#define SAMPLES_HIGH 656 //#define SAMPLES_LOW 624 // 44KHZ values #if 0 // Values for 44100 hz #define SAMPLES_HIGH 752 #define SAMPLES_LOW 720 #else // Values for 32000 hz #define SAMPLES_HIGH 560 #define SAMPLES_LOW 528 #endif

to

//AudioMgr_ThreadEntry(&gAudioMgr); // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333.. // in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528 #define SAMPLES_HIGH 560 #define SAMPLES_LOW 528

Are you willing to lose values for 44100? You don't rather have this for quick change and testing?

After the experience we've had so far with 44k, I doubt we'll go back, but if we do, we can look for this PR to see the differences.

i agree with @Malkierian. if someone wants to try to get 44.1k working again they can check the git blame and find them

briaguya0 · 2025-01-01T17:35:32Z

soh/soh/OTRGlobals.cpp

    overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P"));

-    context->InitAudio({ .SampleRate = 44100, .SampleLength = 1024, .DesiredBuffered = 2480 });
+    context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 2480 });


looks like DesiredBuffered was changed for 44.1k here

int SDLAudioPlayer::GetDesiredBuffered(void) { - return 1680; + return 2480; }

interestingly, it seems SampleLength was already 1024 before the switch to 44.1k

i also am not sure where these values are coming from:
32000/1680 = 19.047619048
44100/2480 = 17.782258065

@Kenix3 @NEstelami any ideas?

I can't find that. Where is it?

Shipwright/libultraship/libultraship/SDLAudioPlayer.cpp

Lines 31 to 33 in d24c845

int SDLAudioPlayer::GetDesiredBuffered(void) {

return 1680;

}

vs

Shipwright/libultraship/libultraship/SDLAudioPlayer.cpp

Lines 31 to 33 in 1f1b81a

int SDLAudioPlayer::GetDesiredBuffered(void) {

return 2480;

}

and

Shipwright/libultraship/libultraship/WasapiAudioPlayer.cpp

Lines 83 to 85 in 09432ee

int WasapiAudioPlayer::GetDesiredBuffered(void) {

return 1680;

}

vs

Shipwright/libultraship/libultraship/WasapiAudioPlayer.cpp

Lines 83 to 85 in 1f1b81a

int WasapiAudioPlayer::GetDesiredBuffered(void) {

return 2480;

}

for sample length, it's used here in LUS (but i don't see it being used in wasapi)

but it was hardcoded to 1024 at the beginning of the repo being public

Shipwright/libultraship/libultraship/SDLAudioPlayer.cpp

Line 15 in d24c845

want.samples = 1024;

ok, did some digging and figured out stuff about the value for samples

it looks like in SDL3 samples has been removed from AudioSpec
https://wiki.libsdl.org/SDL3/README/migration#sdl_audioh
https://wiki.libsdl.org/SDL2/SDL_AudioSpec
https://wiki.libsdl.org/SDL3/SDL_AudioSpec

from the migration guide:

SDL_AudioSpec has been reduced; now it only holds format, channel, and sample rate. SDL_GetSilenceValueForFormat() can provide the information from the SDL_AudioSpec's removed silence field. SDL3 now manages the removed samples field; apps that want more control over device latency and throughput can force a newly-opened device's sample count with the SDL_HINT_AUDIO_DEVICE_SAMPLE_FRAMES hint, but most apps should not risk messing with the defaults. The other SDL2 SDL_AudioSpec fields aren't relevant anymore.

sdl3 logic for getting the value is here https://github.com/libsdl-org/SDL/blob/7c9f6c631304829cb5d6fc68d873dace47c17152/src/audio/SDL_audio.c#L147-L166

if (freq <= 22050) { return 512; } else if (freq <= 48000) { return 1024; } else if (freq <= 96000) { return 2048; } else { return 4096; }

so based on what SDL is doing it seems 1024 is a reasonable value for both 32k and 44.1k

Suggested change

context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 2480 });

context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });

see

https://github.com/HarbourMasters/Shipwright/pull/4780/files?diff=unified&w=0#r1900436401
https://github.com/HarbourMasters/Shipwright/pull/4780/files?diff=unified&w=0#r1900475059

briaguya0 · 2025-01-07T14:23:15Z

soh/soh/OTRGlobals.cpp

    overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P"));

-    context->InitAudio({ .SampleRate = 44100, .SampleLength = 1024, .DesiredBuffered = 2480 });
+    context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 2480 });


Suggested change

context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 2480 });

context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });

see

https://github.com/HarbourMasters/Shipwright/pull/4780/files?diff=unified&w=0#r1900436401
https://github.com/HarbourMasters/Shipwright/pull/4780/files?diff=unified&w=0#r1900475059

This reverts commit 9455579.

…asters#5234) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

…asters#5234) (HarbourMasters#5508) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

Set Sample Rate to 32000 hz

e3dbce4

briaguya0 reviewed Jan 1, 2025

View reviewed changes

PR review

414ef04

briaguya0 approved these changes Jan 6, 2025

View reviewed changes

briaguya0 requested changes Jan 7, 2025

View reviewed changes

.DesiredBuffered = 1680

d0b7918

briaguya0 approved these changes Jan 7, 2025

View reviewed changes

Archez approved these changes Jan 7, 2025

View reviewed changes

Archez merged commit 9455579 into HarbourMasters:develop Jan 8, 2025

Malkierian added a commit to Malkierian/Shipwright that referenced this pull request Mar 28, 2025

Revert "Set Sample Rate to 32000 hz (HarbourMasters#4780)"

71a19aa

This reverts commit 9455579.

aMannus pushed a commit that referenced this pull request Mar 28, 2025

Revert "Set Sample Rate to 32000 hz (#4780)" (#5234)

feea299

This reverts commit 9455579.

Malkierian added a commit to Malkierian/Shipwright that referenced this pull request May 17, 2025

Reapply "Set Sample Rate to 32000 hz (HarbourMasters#4780)" (HarbourM…

f609851

…asters#5234) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

Malkierian added a commit that referenced this pull request Jun 19, 2025

Reapply "Set Sample Rate to 32000 hz (#4780)" (#5234) (#5508)

be22c02

This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

krazyjakee pushed a commit to krazyjakee/OOT that referenced this pull request Sep 6, 2025

Reapply "Set Sample Rate to 32000 hz (HarbourMasters#4780)" (HarbourM…

af813ff

…asters#5234) (HarbourMasters#5508) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set Sample Rate to 32000 hz#4780

Set Sample Rate to 32000 hz#4780
Archez merged 3 commits intoHarbourMasters:developfrom
sonicdcer:32khz

sonicdcer commented Jan 1, 2025 •

edited by github-actions bot

Loading

Uh oh!

briaguya0 Jan 1, 2025

Uh oh!

sonicdcer Jan 1, 2025

Uh oh!

Malkierian Jan 1, 2025

Uh oh!

briaguya0 Jan 1, 2025

Uh oh!

briaguya0 Jan 1, 2025

Uh oh!

sonicdcer Jan 1, 2025

Uh oh!

briaguya0 Jan 1, 2025 •

edited

Loading

Uh oh!

briaguya0 Jan 1, 2025 •

edited

Loading

Uh oh!

briaguya0 Jan 6, 2025

Uh oh!

briaguya0 Jan 7, 2025

Uh oh!

briaguya0 Jan 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	int WasapiAudioPlayer::GetDesiredBuffered(void) {
	return 1680;
	}

	int WasapiAudioPlayer::GetDesiredBuffered(void) {
	return 2480;
	}

	context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 2480 });
	context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });

Conversation

sonicdcer commented Jan 1, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Build Artifacts

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

briaguya0 Jan 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

briaguya0 Jan 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sonicdcer commented Jan 1, 2025 •

edited by github-actions bot

Loading

briaguya0 Jan 1, 2025 •

edited

Loading

briaguya0 Jan 1, 2025 •

edited

Loading