We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch test modified version of block_on_pause=0

patch_bug_4578_nonblocking.diff (text/plain), 1.85 KB, created by Sylvain on 2019-04-05 20:09:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2019-04-05 20:09:07 UTC

Size: 1.85 KB

patch

obsolete

>diff -r 3ef8a628853d src/video/android/SDL_androidevents.c
>--- a/src/video/android/SDL_androidevents.c	Fri Apr 05 08:15:01 2019 -0700
>+++ b/src/video/android/SDL_androidevents.c	Fri Apr 05 22:07:41 2019 +0200
>@@ -143,8 +143,23 @@
> Android_PumpEvents_NonBlocking(_THIS)
> {
>     SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
>+    static int backup_context;
> 
>     if (videodata->isPaused) {
>+
>+        if (backup_context) {
>+
>+            SDL_LockMutex(Android_ActivityMutex);
>+            android_egl_context_backup(Android_Window);
>+            SDL_UnlockMutex(Android_ActivityMutex);
>+
>+            ANDROIDAUDIO_PauseDevices();
>+            openslES_PauseDevices();
>+
>+            backup_context = 0;
>+        }
>+
>+
>         if (SDL_SemTryWait(Android_ResumeSem) == 0) {
> 
>             videodata->isPaused = 0;
>@@ -165,16 +180,18 @@
>             }
>         }
>     } else {
>-        if (SDL_SemTryWait(Android_PauseSem) == 0) {
>-
>-            SDL_LockMutex(Android_ActivityMutex);
>-            android_egl_context_backup(Android_Window);
>-            SDL_UnlockMutex(Android_ActivityMutex);
>-
>-            ANDROIDAUDIO_PauseDevices();
>-            openslES_PauseDevices();
>-
>-            videodata->isPaused = 1;
>+        if (videodata->isPausing || SDL_SemTryWait(Android_PauseSem) == 0) {
>+            /* We've been signaled to pause (potentially several times), but before we block ourselves,
>+             * we need to make sure that the very last event (of the first pause sequence, if several)
>+             * has reached the app */
>+            if (SDL_NumberOfEvents(SDL_APP_DIDENTERBACKGROUND) > SDL_SemValue(Android_PauseSem)) {
>+                videodata->isPausing = 1;
>+            }
>+            else {
>+                videodata->isPausing = 0;
>+                videodata->isPaused = 1;
>+                backup_context = 1;
>+            }
>         }
>     }
> }

Actions: View | Diff

Attachments on bug 4578: 3729 | 3730 | 3748

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.