mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/gui: Support RGBA, unusual strides, and add higher bitrate option

Browse source
This commit is contained in:
Moses Turner 2022-02-18 19:26:56 -06:00
parent 433ae0d9c6
commit 0dcc73d5cf
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/xrt/state_trackers/gui/gui_ogl.c
View file

@ -4,6 +4,7 @@
* @file * @file
* @brief OpenGL functions to drive the gui. * @brief OpenGL functions to drive the gui.
* @author Jakob Bornecrantz <jakob@collabora.com> * @author Jakob Bornecrantz <jakob@collabora.com>
* @author Moses Turner <moses@collabora.com>
* @ingroup gui * @ingroup gui
*/ */
@ -79,17 +80,28 @@ destroy(struct xrt_frame_node *node)
} }
static void static void
update_r8g8b8(struct gui_ogl_sink *s, GLint w, GLint h, uint8_t *data) update_r8g8b8x8(struct gui_ogl_sink *s, GLint w, GLint h, GLint stride, uint8_t *data)
{ {
glBindTexture(GL_TEXTURE_2D, s->tex.id); glBindTexture(GL_TEXTURE_2D, s->tex.id);
glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / 4);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glBindTexture(GL_TEXTURE_2D, 0);
}
static void
update_r8g8b8(struct gui_ogl_sink *s, GLint w, GLint h, GLint stride, uint8_t *data)
{
glBindTexture(GL_TEXTURE_2D, s->tex.id);
glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / 3);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, data); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }
static void static void
update_l8(struct gui_ogl_sink *s, GLint w, GLint h, uint8_t *data) update_l8(struct gui_ogl_sink *s, GLint w, GLint h, GLint stride, uint8_t *data)
{ {
glBindTexture(GL_TEXTURE_2D, s->tex.id); glBindTexture(GL_TEXTURE_2D, s->tex.id);
glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, data); glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, data);
GLint swizzleMask[] = {GL_RED, GL_RED, GL_RED, GL_ONE}; GLint swizzleMask[] = {GL_RED, GL_RED, GL_RED, GL_ONE};
glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask); glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
@ -112,11 +124,12 @@ gui_ogl_sink_update(struct gui_ogl_texture *tex)
return; return;
} }
GLint w, h; GLint w, h, stride;
uint8_t *data; uint8_t *data;
w = frame->width; w = frame->width;
h = frame->height; h = frame->height;
stride = frame->stride;
if (tex->w != (uint32_t)w || tex->h != (uint32_t)h) { if (tex->w != (uint32_t)w || tex->h != (uint32_t)h) {
tex->w = w; tex->w = w;
@ -132,8 +145,10 @@ gui_ogl_sink_update(struct gui_ogl_texture *tex)
data = frame->data; data = frame->data;
switch (frame->format) { switch (frame->format) {
case XRT_FORMAT_R8G8B8: update_r8g8b8(s, w, h, data); break; case XRT_FORMAT_R8G8B8: update_r8g8b8(s, w, h, stride, data); break;
case XRT_FORMAT_L8: update_l8(s, w, h, data); break; case XRT_FORMAT_R8G8B8A8:
case XRT_FORMAT_R8G8B8X8: update_r8g8b8x8(s, w, h, stride, data); break;
case XRT_FORMAT_L8: update_l8(s, w, h, stride, data); break;
default: break; default: break;
} }

8
src/xrt/state_trackers/gui/gui_window_record.c
View file

@ -60,6 +60,7 @@ create_pipeline(struct gui_record_window *rw)
switch (rw->gst.bitrate) { switch (rw->gst.bitrate) {
default: default:
case GUI_RECORD_BITRATE_32768: bitrate = "32768"; break;
case GUI_RECORD_BITRATE_4096: bitrate = "4096"; break; case GUI_RECORD_BITRATE_4096: bitrate = "4096"; break;
case GUI_RECORD_BITRATE_2048: bitrate = "2048"; break; case GUI_RECORD_BITRATE_2048: bitrate = "2048"; break;
case GUI_RECORD_BITRATE_1024: bitrate = "1024"; break; case GUI_RECORD_BITRATE_1024: bitrate = "1024"; break;
@ -166,7 +167,8 @@ draw_gst(struct gui_record_window *rw)
os_mutex_unlock(&rw->gst.mutex); os_mutex_unlock(&rw->gst.mutex);
igComboStr("Pipeline", (int *)&rw->gst.pipeline, "SW Fast\0SW Medium\0SW Slow\0SW Veryslow\0VAAPI H264\0\0", 5); igComboStr("Pipeline", (int *)&rw->gst.pipeline, "SW Fast\0SW Medium\0SW Slow\0SW Veryslow\0VAAPI H264\0\0", 5);
igComboStr("Bitrate", (int *)&rw->gst.bitrate, "4096bps\0002048bps\0001024bps\0\0", 3); igComboStr("Bitrate", (int *)&rw->gst.bitrate, "32768bps (Be careful!)\0004096bps\0002048bps\0001024bps\0\0",
3);
igInputText("Filename", rw->gst.filename, sizeof(rw->gst.filename), 0, NULL, NULL); igInputText("Filename", rw->gst.filename, sizeof(rw->gst.filename), 0, NULL, NULL);
@ -266,13 +268,15 @@ gui_window_record_init(struct gui_record_window *rw)
} }
snprintf(rw->gst.filename, sizeof(rw->gst.filename), "/tmp/capture.mp4"); snprintf(rw->gst.filename, sizeof(rw->gst.filename), "/tmp/capture.mp4");
rw->gst.bitrate = GUI_RECORD_BITRATE_4096;
#endif #endif
// Setup the preview texture. // Setup the preview texture.
rw->texture.scale = 1; rw->texture.scale = 1;
struct xrt_frame_sink *tmp = NULL; struct xrt_frame_sink *tmp = NULL;
rw->texture.ogl = gui_ogl_sink_create("View", &rw->texture.xfctx, &tmp); rw->texture.ogl = gui_ogl_sink_create("View", &rw->texture.xfctx, &tmp);
u_sink_create_to_r8g8b8_or_l8(&rw->texture.xfctx, tmp, &tmp); u_sink_create_to_r8g8b8_r8g8b8a8_r8g8b8x8_or_l8(&rw->texture.xfctx, tmp, &tmp);
u_sink_queue_create(&rw->texture.xfctx, 1, tmp, &rw->texture.sink); u_sink_queue_create(&rw->texture.xfctx, 1, tmp, &rw->texture.sink);
return true; return true;

1
src/xrt/state_trackers/gui/gui_window_record.h
View file

@ -27,6 +27,7 @@ struct gui_ogl_texture;
enum gui_record_bitrate enum gui_record_bitrate
{ {
GUI_RECORD_BITRATE_32768,
GUI_RECORD_BITRATE_4096, GUI_RECORD_BITRATE_4096,
GUI_RECORD_BITRATE_2048, GUI_RECORD_BITRATE_2048,
GUI_RECORD_BITRATE_1024, GUI_RECORD_BITRATE_1024,