mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-play: Improve Win32 keyboard input handling

Browse source 
The console HANDLE will be keep signalled state unless application
reads console input buffer immediately. So we should read and flush
console input buffer from the thread where the event is signalled,
instead of GMain context thread.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2058>
This commit is contained in:
Seungha Yang 2022-03-29 22:16:14 +09:00 committed by GStreamer Marge Bot
parent 2952a73f40
commit f465156bf9
1 changed files with 54 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
subprojects/gst-plugins-base/tools/gst-play-kb.c
View file

@ -145,37 +145,37 @@ typedef struct
static Win32KeyHandler *win32_handler = NULL; static Win32KeyHandler *win32_handler = NULL;
static gboolean typedef struct
gst_play_kb_source_cb (Win32KeyHandler * handler)
{ {
HANDLE h_input = handler->console_handle; gboolean is_ascii;
INPUT_RECORD buffer; WORD vkcode;
DWORD n; gchar key_val[2];
} KbSourceData;
if (PeekConsoleInput (h_input, &buffer, 1, &n) && n == 1) { static gboolean
ReadConsoleInput (h_input, &buffer, 1, &n); gst_play_kb_source_cb (KbSourceData * data)
{
if (!kb_callback)
return G_SOURCE_REMOVE;
if (buffer.EventType == KEY_EVENT && buffer.Event.KeyEvent.bKeyDown) { if (data->is_ascii) {
gchar key_val[2] = { 0 }; kb_callback (data->key_val, kb_callback_data);
} else {
switch (buffer.Event.KeyEvent.wVirtualKeyCode) { switch (data->vkcode) {
case VK_RIGHT: case VK_RIGHT:
kb_callback (GST_PLAY_KB_ARROW_RIGHT, kb_callback_data); kb_callback (GST_PLAY_KB_ARROW_RIGHT, kb_callback_data);
break; break;
case VK_LEFT: case VK_LEFT:
kb_callback (GST_PLAY_KB_ARROW_LEFT, kb_callback_data); kb_callback (GST_PLAY_KB_ARROW_LEFT, kb_callback_data);
break; break;
case VK_UP: case VK_UP:
kb_callback (GST_PLAY_KB_ARROW_UP, kb_callback_data); kb_callback (GST_PLAY_KB_ARROW_UP, kb_callback_data);
break; break;
case VK_DOWN: case VK_DOWN:
kb_callback (GST_PLAY_KB_ARROW_DOWN, kb_callback_data); kb_callback (GST_PLAY_KB_ARROW_DOWN, kb_callback_data);
break; break;
default: default:
key_val[0] = buffer.Event.KeyEvent.uChar.AsciiChar; break;
kb_callback (key_val, kb_callback_data);
break;
}
} }
} }
@ -187,6 +187,8 @@ gst_play_kb_win32_thread (gpointer user_data)
{ {
Win32KeyHandler *handler = (Win32KeyHandler *) user_data; Win32KeyHandler *handler = (Win32KeyHandler *) user_data;
HANDLE handles[2]; HANDLE handles[2];
INPUT_RECORD buffer;
DWORD n;
handles[0] = handler->event_handle; handles[0] = handler->event_handle;
handles[1] = handler->console_handle; handles[1] = handler->console_handle;
@ -210,7 +212,30 @@ gst_play_kb_win32_thread (gpointer user_data)
} }
g_mutex_unlock (&handler->lock); g_mutex_unlock (&handler->lock);
g_idle_add ((GSourceFunc) gst_play_kb_source_cb, handler); if (PeekConsoleInput (handler->console_handle, &buffer, 1, &n) && n == 1) {
if (ReadConsoleInput (handler->console_handle, &buffer, 1, &n) &&
buffer.EventType == KEY_EVENT && buffer.Event.KeyEvent.bKeyDown) {
KbSourceData *data = g_new0 (KbSourceData, 1);
switch (buffer.Event.KeyEvent.wVirtualKeyCode) {
case VK_RIGHT:
case VK_LEFT:
case VK_UP:
case VK_DOWN:
data->is_ascii = FALSE;
data->vkcode = buffer.Event.KeyEvent.wVirtualKeyCode;
break;
default:
data->is_ascii = TRUE;
data->key_val[0] = buffer.Event.KeyEvent.uChar.AsciiChar;
data->key_val[1] = '\0';
break;
}
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
(GSourceFunc) gst_play_kb_source_cb, data, g_free);
}
}
} }
return NULL; return NULL;