8313697: [XWayland][Screencast] consequent getPixelColor calls are slow #15250
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,6 +43,9 @@ int DEBUG_SCREENCAST_ENABLED = FALSE; | |
| (*env)->ExceptionDescribe(env); \ | ||
| } | ||
|
|
||
| static volatile gboolean sessionClosed = TRUE; | ||
| static GString *activeSessionToken; | ||
|
|
||
| struct ScreenSpace screenSpace = {0}; | ||
| static struct PwLoopData pw = {0}; | ||
|
|
||
|
|
@@ -89,8 +92,8 @@ static void doCleanup() { | |
| struct ScreenProps *screenProps = &screenSpace.screens[i]; | ||
| if (screenProps->data) { | ||
| if (screenProps->data->stream) { | ||
| fp_pw_stream_disconnect(screenProps->data->stream); | ||
| fp_pw_thread_loop_lock(pw.loop); | ||
|
There was a problem hiding this comment. Moving |
||
| fp_pw_stream_destroy(screenProps->data->stream); | ||
| fp_pw_thread_loop_unlock(pw.loop); | ||
| screenProps->data->stream = NULL; | ||
|
|
@@ -124,6 +127,9 @@ static void doCleanup() { | |
| free(screenSpace.screens); | ||
| screenSpace.screens = NULL; | ||
| } | ||
|
|
||
| gtk->g_string_set_size(activeSessionToken, 0); | ||
| sessionClosed = TRUE; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -132,6 +138,24 @@ static void doCleanup() { | |
| static gboolean initScreencast(const gchar *token, | ||
| GdkRectangle *affectedBounds, | ||
| gint affectedBoundsLength) { | ||
| gboolean isSameToken = !token | ||
| ? FALSE | ||
| : strcmp(token, activeSessionToken->str) == 0; | ||
|
|
||
| if (!sessionClosed) { | ||
| if (isSameToken) { | ||
| DEBUG_SCREENCAST("Reusing active session.\n", NULL); | ||
| return TRUE; | ||
| } else { | ||
| DEBUG_SCREENCAST( | ||
| "Active session has a different token |%s| -> |%s|," | ||
| " closing current session.\n", | ||
| activeSessionToken->str, token | ||
| ); | ||
| doCleanup(); | ||
| } | ||
| } | ||
|
|
||
| fp_pw_init(NULL, NULL); | ||
|
|
||
| pw.pwFd = RESULT_ERROR; | ||
|
|
@@ -145,6 +169,8 @@ static gboolean initScreencast(const gchar *token, | |
| return FALSE; | ||
| } | ||
|
|
||
| gtk->g_string_printf(activeSessionToken, "%s", token); | ||
| sessionClosed = FALSE; | ||
| return TRUE; | ||
| } | ||
|
|
||
|
|
@@ -386,8 +412,19 @@ static gboolean connectStream(int index) { | |
|
|
||
| data->screenProps = &screenSpace.screens[index]; | ||
|
|
||
| if (!sessionClosed && data->stream) { | ||
| fp_pw_thread_loop_lock(pw.loop); | ||
| int result = fp_pw_stream_set_active(data->stream, TRUE); | ||
| fp_pw_thread_loop_unlock(pw.loop); | ||
|
|
||
| DEBUG_SCREEN_PREFIX(data->screenProps, | ||
| "stream %p: activate result |%i|\n", | ||
| data->stream, result); | ||
|
|
||
| return result == 0; // 0 - success | ||
| }; | ||
|
|
||
| data->hasFormat = FALSE; | ||
|
|
||
| data->stream = fp_pw_stream_new( | ||
| pw.core, | ||
|
|
@@ -505,60 +542,64 @@ static const struct pw_core_events coreEvents = { | |
| * @return TRUE on success | ||
| */ | ||
| static gboolean doLoop(GdkRectangle requestedArea) { | ||
| if (!pw.loop && !sessionClosed) { | ||
| pw.loop = fp_pw_thread_loop_new("AWT Pipewire Thread", NULL); | ||
|
|
||
| if (!pw.loop) { | ||
| DEBUG_SCREENCAST("!!! Could not create a loop\n", NULL); | ||
| doCleanup(); | ||
| return FALSE; | ||
| } | ||
|
|
||
| pw.context = fp_pw_context_new( | ||
| fp_pw_thread_loop_get_loop(pw.loop), | ||
| NULL, | ||
| 0 | ||
| ); | ||
|
|
||
| if (!pw.context) { | ||
| DEBUG_SCREENCAST("!!! Could not create a pipewire context\n", NULL); | ||
| doCleanup(); | ||
| return FALSE; | ||
| } | ||
|
|
||
| if (fp_pw_thread_loop_start(pw.loop) != 0) { | ||
| DEBUG_SCREENCAST("!!! Could not start pipewire thread loop\n", NULL); | ||
| doCleanup(); | ||
| return FALSE; | ||
| } | ||
|
|
||
| fp_pw_thread_loop_lock(pw.loop); | ||
|
|
||
| pw.core = fp_pw_context_connect_fd( | ||
| pw.context, | ||
| pw.pwFd, | ||
| NULL, | ||
| 0 | ||
| ); | ||
|
|
||
| if (!pw.core) { | ||
| DEBUG_SCREENCAST("!!! Could not create pipewire core\n", NULL); | ||
| goto fail; | ||
| } | ||
|
|
||
| pw_core_add_listener(pw.core, &pw.coreListener, &coreEvents, NULL); | ||
| } | ||
|
|
||
| for (int i = 0; i < screenSpace.screenCount; ++i) { | ||
| struct ScreenProps *screen = &screenSpace.screens[i]; | ||
| if (!screen->data && !sessionClosed) { | ||
| struct PwStreamData *data = | ||
| (struct PwStreamData*) malloc(sizeof (struct PwStreamData)); | ||
| if (!data) { | ||
| ERR("failed to allocate memory\n"); | ||
| goto fail; | ||
| } | ||
|
|
||
| memset(data, 0, sizeof (struct PwStreamData)); | ||
|
|
||
| screen->data = data; | ||
| } | ||
|
|
||
| DEBUG_SCREEN_PREFIX(screen, "@@@ adding screen %i\n", i); | ||
| if (checkScreen(i, requestedArea)) { | ||
|
|
@@ -746,6 +787,8 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_screencast_ScreencastHelper_loadPipewire | |
| return JNI_FALSE; | ||
| } | ||
|
|
||
| activeSessionToken = gtk->g_string_new(""); | ||
|
|
||
| gboolean usable = initXdgDesktopPortal(); | ||
| portalScreenCastCleanup(); | ||
| return usable; | ||
|
|
@@ -783,6 +826,17 @@ static void arrayToRectangles(JNIEnv *env, | |
| (*env)->ReleaseIntArrayElements(env, boundsArray, body, 0); | ||
| } | ||
|
|
||
| /* | ||
| * Class: sun_awt_screencast_ScreencastHelper | ||
| * Method: closeSession | ||
| * Signature: ()V | ||
| */ | ||
| JNIEXPORT void JNICALL | ||
| Java_sun_awt_screencast_ScreencastHelper_closeSession(JNIEnv *env, jclass cls) { | ||
| DEBUG_SCREENCAST("closing screencast session\n\n", NULL); | ||
| doCleanup(); | ||
| } | ||
|
|
||
| /* | ||
| * Class: sun_awt_screencast_ScreencastHelper | ||
| * Method: getRGBPixelsImpl | ||
|
|
@@ -805,7 +859,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl | |
| boundsLen = (*env)->GetArrayLength(env, affectedScreensBoundsArray); | ||
| EXCEPTION_CHECK_DESCRIBE(); | ||
| if (boundsLen % 4 != 0) { | ||
| DEBUG_SCREENCAST("incorrect array length\n", NULL); | ||
| return RESULT_ERROR; | ||
| } | ||
| affectedBoundsLength = boundsLen / 4; | ||
|
|
@@ -896,11 +950,12 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl | |
|
|
||
| fp_pw_thread_loop_lock(pw.loop); | ||
| fp_pw_stream_set_active(screenProps->data->stream, FALSE); | ||
| fp_pw_thread_loop_unlock(pw.loop); | ||
|
|
||
| screenProps->captureDataReady = FALSE; | ||
| } | ||
| } | ||
|
|
||
| releaseToken(env, jtoken, token); | ||
| return 0; | ||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason you can't use java.util.Timer ?
Ideally [*] AWT classes should not depend on Swing classes since already Swing classes depend on AWT classes ..
[*] yes, I know we already have such dependencies but only for very good reasons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course we can use java.util.Timer. Swing timer is just more convenient to use. Updated.