gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused code

Browse Source 
It looks like we don't need to watch for hanging writes now that we're using the callback mechanism.
This commit is contained in:
Sam Lantinga
2023-09-27 09:16:25 -07:00
parent a6854098f7
commit ea5f59c234
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/audio/aaudio/SDL_aaudio.c
View File

@@ -408,37 +408,6 @@ void AAUDIO_ResumeDevices(void)
} }
} }
// !!! FIXME: do we need this now that we use the callback?
/*
We can sometimes get into a state where AAudioStream_write() will just block forever until we pause and unpause.
None of the standard state queries indicate any problem in my testing. And the error callback doesn't actually get called.
But, AAudioStream_getTimestamp() does return AAUDIO_ERROR_INVALID_STATE
*/
static SDL_bool DetectBrokenPlayStatePerDevice(SDL_AudioDevice *device, void *userdata)
{
SDL_assert(device != NULL);
if (!device->iscapture && device->hidden != NULL) {
struct SDL_PrivateAudioData *hidden = device->hidden;
int64_t framePosition, timeNanoseconds;
aaudio_result_t res = ctx.AAudioStream_getTimestamp(hidden->stream, CLOCK_MONOTONIC, &framePosition, &timeNanoseconds);
if (res == AAUDIO_ERROR_INVALID_STATE) {
aaudio_stream_state_t currentState = ctx.AAudioStream_getState(hidden->stream);
// AAudioStream_getTimestamp() will also return AAUDIO_ERROR_INVALID_STATE while the stream is still initially starting. But we only care if it silently went invalid while playing.
if (currentState == AAUDIO_STREAM_STATE_STARTED) {
LOGI("SDL AAUDIO_DetectBrokenPlayState: detected invalid audio device state: AAudioStream_getTimestamp result=%d, framePosition=%lld, timeNanoseconds=%lld, getState=%d", (int)res, (long long)framePosition, (long long)timeNanoseconds, (int)currentState);
return SDL_TRUE; // this guy.
}
}
}
return SDL_FALSE; // enumerate more devices.
}
SDL_bool AAUDIO_DetectBrokenPlayState(void)
{
return (ctx.handle && SDL_FindPhysicalAudioDeviceByCallback(DetectBrokenPlayStatePerDevice, NULL) != NULL) ? SDL_TRUE : SDL_FALSE;
}
static void AAUDIO_Deinitialize(void) static void AAUDIO_Deinitialize(void)
{ {
Android_StopAudioHotplug(); Android_StopAudioHotplug();

2
src/audio/aaudio/SDL_aaudio.h
View File

@@ -27,13 +27,11 @@
void AAUDIO_ResumeDevices(void); void AAUDIO_ResumeDevices(void);
void AAUDIO_PauseDevices(void); void AAUDIO_PauseDevices(void);
SDL_bool AAUDIO_DetectBrokenPlayState(void);
#else #else
#define AAUDIO_ResumeDevices() #define AAUDIO_ResumeDevices()
#define AAUDIO_PauseDevices() #define AAUDIO_PauseDevices()
#define AAUDIO_DetectBrokenPlayState() (SDL_FALSE)
#endif #endif

10
src/video/android/SDL_androidevents.c
View File

@@ -159,11 +159,6 @@ void Android_PumpEvents_Blocking(SDL_VideoDevice *_this)
} }
} }
} }
if (AAUDIO_DetectBrokenPlayState()) {
AAUDIO_PauseDevices();
AAUDIO_ResumeDevices();
}
} }
void Android_PumpEvents_NonBlocking(SDL_VideoDevice *_this) void Android_PumpEvents_NonBlocking(SDL_VideoDevice *_this)
@@ -245,11 +240,6 @@ void Android_PumpEvents_NonBlocking(SDL_VideoDevice *_this)
} }
} }
} }
if (AAUDIO_DetectBrokenPlayState()) {
AAUDIO_PauseDevices();
AAUDIO_ResumeDevices();
}
} }
#endif /* SDL_VIDEO_DRIVER_ANDROID */ #endif /* SDL_VIDEO_DRIVER_ANDROID */