d3d11overlaycompositor: Add support for d3d11 memory
If overlay buffer is d3d11 memory, use it directly Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4826>
This commit is contained in:
parent
a72ca72a27
commit
01edbf6c6b
@ -105,6 +105,8 @@ struct GstD3D11CompositionOverlay
|
|||||||
{
|
{
|
||||||
if (overlay_rect)
|
if (overlay_rect)
|
||||||
gst_video_overlay_rectangle_unref (overlay_rect);
|
gst_video_overlay_rectangle_unref (overlay_rect);
|
||||||
|
if (d3d11_buffer)
|
||||||
|
gst_buffer_unref (d3d11_buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
GstVideoOverlayRectangle *overlay_rect = nullptr;
|
GstVideoOverlayRectangle *overlay_rect = nullptr;
|
||||||
@ -112,6 +114,7 @@ struct GstD3D11CompositionOverlay
|
|||||||
ComPtr<ID3D11ShaderResourceView> srv;
|
ComPtr<ID3D11ShaderResourceView> srv;
|
||||||
ComPtr<ID3D11Buffer> vertex_buffer;
|
ComPtr<ID3D11Buffer> vertex_buffer;
|
||||||
gboolean premul_alpha = FALSE;
|
gboolean premul_alpha = FALSE;
|
||||||
|
GstBuffer *d3d11_buffer = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::shared_ptr<GstD3D11CompositionOverlay> GstD3D11CompositionOverlayPtr;
|
typedef std::shared_ptr<GstD3D11CompositionOverlay> GstD3D11CompositionOverlayPtr;
|
||||||
@ -195,6 +198,8 @@ gst_d3d11_composition_overlay_new (GstD3D11OverlayCompositor * self,
|
|||||||
ComPtr < ID3D11Buffer > vertex_buffer;
|
ComPtr < ID3D11Buffer > vertex_buffer;
|
||||||
GstVideoOverlayFormatFlags flags;
|
GstVideoOverlayFormatFlags flags;
|
||||||
gboolean premul_alpha = FALSE;
|
gboolean premul_alpha = FALSE;
|
||||||
|
GstMemory *mem;
|
||||||
|
gboolean is_d3d11 = FALSE;
|
||||||
|
|
||||||
memset (&subresource_data, 0, sizeof (subresource_data));
|
memset (&subresource_data, 0, sizeof (subresource_data));
|
||||||
memset (&texture_desc, 0, sizeof (texture_desc));
|
memset (&texture_desc, 0, sizeof (texture_desc));
|
||||||
@ -225,6 +230,20 @@ gst_d3d11_composition_overlay_new (GstD3D11OverlayCompositor * self,
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mem = gst_buffer_peek_memory (buf, 0);
|
||||||
|
if (gst_is_d3d11_memory (mem)) {
|
||||||
|
GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
|
||||||
|
if (dmem->device == self->device) {
|
||||||
|
srv = gst_d3d11_memory_get_shader_resource_view (dmem, 0);
|
||||||
|
if (srv) {
|
||||||
|
texture = (ID3D11Texture2D *)
|
||||||
|
gst_d3d11_memory_get_resource_handle (dmem);
|
||||||
|
is_d3d11 = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_d3d11) {
|
||||||
vmeta = gst_buffer_get_video_meta (buf);
|
vmeta = gst_buffer_get_video_meta (buf);
|
||||||
if (!vmeta) {
|
if (!vmeta) {
|
||||||
GST_ERROR_OBJECT (self, "Failed to get video meta");
|
GST_ERROR_OBJECT (self, "Failed to get video meta");
|
||||||
@ -271,6 +290,7 @@ gst_d3d11_composition_overlay_new (GstD3D11OverlayCompositor * self,
|
|||||||
GST_ERROR_OBJECT (self, "Failed to create shader resource view");
|
GST_ERROR_OBJECT (self, "Failed to create shader resource view");
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
|
buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
|
||||||
buffer_desc.ByteWidth = sizeof (VertexData) * 4;
|
buffer_desc.ByteWidth = sizeof (VertexData) * 4;
|
||||||
@ -346,6 +366,8 @@ gst_d3d11_composition_overlay_new (GstD3D11OverlayCompositor * self,
|
|||||||
overlay->srv = srv;
|
overlay->srv = srv;
|
||||||
overlay->vertex_buffer = vertex_buffer;
|
overlay->vertex_buffer = vertex_buffer;
|
||||||
overlay->premul_alpha = premul_alpha;
|
overlay->premul_alpha = premul_alpha;
|
||||||
|
if (is_d3d11)
|
||||||
|
overlay->d3d11_buffer = gst_buffer_ref (buf);
|
||||||
|
|
||||||
return overlay;
|
return overlay;
|
||||||
}
|
}
|
||||||
@ -680,6 +702,13 @@ gst_d3d11_overlay_compositor_draw_unlocked (GstD3D11OverlayCompositor *
|
|||||||
for (auto overlay : priv->overlays) {
|
for (auto overlay : priv->overlays) {
|
||||||
ID3D11ShaderResourceView *srv[] = { overlay->srv.Get () };
|
ID3D11ShaderResourceView *srv[] = { overlay->srv.Get () };
|
||||||
ID3D11Buffer *vertex_buf[] = { overlay->vertex_buffer.Get () };
|
ID3D11Buffer *vertex_buf[] = { overlay->vertex_buffer.Get () };
|
||||||
|
GstMapInfo info;
|
||||||
|
GstMemory *mem = nullptr;
|
||||||
|
|
||||||
|
if (overlay->d3d11_buffer) {
|
||||||
|
mem = gst_buffer_peek_memory (overlay->d3d11_buffer, 0);
|
||||||
|
gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_READ));
|
||||||
|
}
|
||||||
|
|
||||||
if (overlay->premul_alpha)
|
if (overlay->premul_alpha)
|
||||||
context->PSSetShader (priv->premul_ps.Get (), nullptr, 0);
|
context->PSSetShader (priv->premul_ps.Get (), nullptr, 0);
|
||||||
@ -690,6 +719,9 @@ gst_d3d11_overlay_compositor_draw_unlocked (GstD3D11OverlayCompositor *
|
|||||||
context->IASetVertexBuffers (0, 1, vertex_buf, &strides, &offsets);
|
context->IASetVertexBuffers (0, 1, vertex_buf, &strides, &offsets);
|
||||||
|
|
||||||
context->DrawIndexed (6, 0, 0);
|
context->DrawIndexed (6, 0, 0);
|
||||||
|
|
||||||
|
if (mem)
|
||||||
|
gst_memory_unmap (mem, &info);
|
||||||
}
|
}
|
||||||
/* *INDENT-ON* */
|
/* *INDENT-ON* */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user