mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt6: Fixes for dummy texture

Browse source 
* RED_OR_ALPHA8 will map value to alpha for OpenGL, use R8 to avoid
  2nd shader
* Determine texel size for proper texture memory preparation
* QByteArray::fromRawData() does shallow copy and thus leads to use of
  corrupted memory
* Make sure RGBA dummy texture is fully opaque
* QRhiTexture::create() must be called to allocate texture resources

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6581>
This commit is contained in:
Jochen Henneberg 2024-04-08 19:53:06 +02:00 committed by Tim-Philipp Müller
parent a0e870263e
commit 2aff9380c7
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
subprojects/gst-plugins-good/ext/qt6/gstqsg6material.cc
View file

@ -512,7 +512,21 @@ video_format_to_rhi_format (GstVideoFormat format, guint plane)
case GST_VIDEO_FORMAT_BGRA: case GST_VIDEO_FORMAT_BGRA:
return QRhiTexture::RGBA8; return QRhiTexture::RGBA8;
case GST_VIDEO_FORMAT_YV12: case GST_VIDEO_FORMAT_YV12:
return QRhiTexture::RED_OR_ALPHA8; return QRhiTexture::R8;
default:
g_assert_not_reached ();
}
}
static int
video_format_to_texel_size (GstVideoFormat format, guint plane)
{
switch (format) {
case GST_VIDEO_FORMAT_RGBA:
case GST_VIDEO_FORMAT_BGRA:
return 4;
case GST_VIDEO_FORMAT_YV12:
return 1;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
@ -576,24 +590,31 @@ out:
/* Make this a black 64x64 pixel RGBA texture. /* Make this a black 64x64 pixel RGBA texture.
* This size and format is supported pretty much everywhere, so these * This size and format is supported pretty much everywhere, so these
* are a safe pick. (64 pixel sidelength must be supported according * are a safe pick. (64 pixel sidelength must be supported according
* to the GLES2 spec, table 6.18.) * to the GLES2 spec, table 6.18.) */
* Set min/mag filters to GL_LINEAR to make sure no mipmapping is used. */
const int tex_sidelength = 64; const int tex_sidelength = 64;
std::vector < char > dummy_data (tex_sidelength * tex_sidelength * 4, 0);
rhi_tex = rhi->newTexture (video_format_to_rhi_format (v_format, plane), QSize(tex_sidelength, tex_sidelength), 1, {}); rhi_tex = rhi->newTexture (video_format_to_rhi_format (v_format, plane), QSize(tex_sidelength, tex_sidelength), 1, {});
g_assert (rhi_tex->create());
int ts = video_format_to_texel_size (v_format, plane);
QByteArray dummy_data (tex_sidelength * tex_sidelength * ts, 0);
char *data = dummy_data.data();
switch (v_format) { switch (v_format) {
case GST_VIDEO_FORMAT_RGBA: case GST_VIDEO_FORMAT_RGBA:
case GST_VIDEO_FORMAT_BGRA: case GST_VIDEO_FORMAT_BGRA:
case GST_VIDEO_FORMAT_RGB: case GST_VIDEO_FORMAT_RGB:
for (gsize j = 0; j < tex_sidelength; j++) {
for (gsize k = 0; k < tex_sidelength; k++) {
data[(j * tex_sidelength + k) * ts + 3] = 0xFF; // opaque
}
}
break; break;
case GST_VIDEO_FORMAT_YV12: case GST_VIDEO_FORMAT_YV12:
if (plane == 1 || plane == 2) { if (plane == 1 || plane == 2) {
char *data = dummy_data.data();
for (gsize j = 0; j < tex_sidelength; j++) { for (gsize j = 0; j < tex_sidelength; j++) {
for (gsize k = 0; k < tex_sidelength; k++) { for (gsize k = 0; k < tex_sidelength; k++) {
data[(j * tex_sidelength + k) * 4 + 0] = 0x7F; data[(j * tex_sidelength + k) * ts + 0] = 0x7F;
} }
} }
} }
@ -603,12 +624,9 @@ out:
break; break;
} }
QRhiTextureSubresourceUploadDescription sub_desc; QRhiTextureSubresourceUploadDescription sub_desc(dummy_data);
sub_desc.setData(QByteArray::fromRawData(dummy_data.data(), dummy_data.size()));
QRhiTextureUploadEntry entry(0, 0, sub_desc); QRhiTextureUploadEntry entry(0, 0, sub_desc);
QRhiTextureUploadDescription desc({ entry }); QRhiTextureUploadDescription desc(entry);
res_updates->uploadTexture(rhi_tex, desc); res_updates->uploadTexture(rhi_tex, desc);
GST_LOG ("%p binding for plane %d fallback dummy Qt texture", this, plane); GST_LOG ("%p binding for plane %d fallback dummy Qt texture", this, plane);