mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12memory: Define new D3D12 map flags

Browse source 
Define GST_MAP_READ_D3D12 and GST_MAP_READ_D3D12 flags

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6494>
This commit is contained in:
Seungha Yang 2024-03-31 20:28:27 +09:00 committed by GStreamer Marge Bot
parent abeccdd6bc
commit 7829315305
5 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12encoder.cpp
View file

@ -704,8 +704,7 @@ gst_d3d12_encoder_upload_frame (GstD3D12Encoder * self, GstBuffer * buffer)
auto dmem = GST_D3D12_MEMORY_CAST (mem); auto dmem = GST_D3D12_MEMORY_CAST (mem);
if (gst_d3d12_device_is_equal (dmem->device, self->device)) { if (gst_d3d12_device_is_equal (dmem->device, self->device)) {
GstMapInfo map_info; GstMapInfo map_info;
if (!gst_memory_map (mem, &map_info, if (!gst_memory_map (mem, &map_info, GST_MAP_READ_D3D12)) {
(GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
GST_ERROR_OBJECT (self, "Couldn't map memory"); GST_ERROR_OBJECT (self, "Couldn't map memory");
return nullptr; return nullptr;
} }
@ -813,8 +812,7 @@ gst_d3d12_encoder_upload_frame (GstD3D12Encoder * self, GstBuffer * buffer)
GstMapInfo map_info; GstMapInfo map_info;
mem = gst_buffer_peek_memory (upload, 0); mem = gst_buffer_peek_memory (upload, 0);
if (!gst_memory_map (mem, &map_info, if (!gst_memory_map (mem, &map_info, GST_MAP_READ_D3D12)) {
(GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
GST_ERROR_OBJECT (self, "Couldn't map memory"); GST_ERROR_OBJECT (self, "Couldn't map memory");
gst_buffer_unref (upload); gst_buffer_unref (upload);
return nullptr; return nullptr;

3
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12graphicscapture.cpp
View file

@ -582,8 +582,7 @@ public:
shared_data, (GDestroyNotify) shared_texture_data_free); shared_data, (GDestroyNotify) shared_texture_data_free);
} }
if (!gst_memory_map (mem, if (!gst_memory_map (mem, &map_info, GST_MAP_WRITE_D3D12)) {
&map_info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D12))) {
GST_ERROR_OBJECT (obj_, "Couldn't map memory"); GST_ERROR_OBJECT (obj_, "Couldn't map memory");
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;

3
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12ipcsink.cpp
View file

@ -620,8 +620,7 @@ gst_d3d12_ipc_sink_prepare (GstBaseSink * sink, GstBuffer * buf)
dmem = (GstD3D12Memory *) gst_buffer_peek_memory (uploaded, 0); dmem = (GstD3D12Memory *) gst_buffer_peek_memory (uploaded, 0);
/* Upload staging to device memory */ /* Upload staging to device memory */
if (!gst_video_frame_map (&frame, &priv->info, uploaded, if (!gst_video_frame_map (&frame, &priv->info, uploaded, GST_MAP_READ_D3D12)) {
(GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
GST_ERROR_OBJECT (self, "Couldn't upload memory"); GST_ERROR_OBJECT (self, "Couldn't upload memory");
gst_buffer_unref (uploaded); gst_buffer_unref (uploaded);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;

14
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12memory.h
View file

@ -68,6 +68,20 @@ G_BEGIN_DECLS
*/ */
#define GST_MAP_D3D12 (GST_MAP_FLAG_LAST << 1) #define GST_MAP_D3D12 (GST_MAP_FLAG_LAST << 1)
/**
* GST_MAP_READ_D3D12:
*
* GstMapFlags value alias for GST_MAP_READ | GST_MAP_D3D12
*/
#define GST_MAP_READ_D3D12 ((GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))
/**
* GST_MAP_WRITE_D3D12:
*
* GstMapFlags value alias for GST_MAP_WRITE | GST_MAP_D3D12
*/
#define GST_MAP_WRITE_D3D12 ((GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D12))
/** /**
* GstD3D12MemoryTransfer: * GstD3D12MemoryTransfer:
* *

6
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12pluginutils.cpp
View file

@ -228,15 +228,13 @@ gst_d3d12_buffer_copy_into (GstBuffer * dst, GstBuffer * src,
/* Map memory to execute pending upload and wait for external fence */ /* Map memory to execute pending upload and wait for external fence */
GstMapInfo map_info; GstMapInfo map_info;
if (!gst_memory_map (src_mem, &map_info, if (!gst_memory_map (src_mem, &map_info, GST_MAP_READ_D3D12)) {
(GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
GST_ERROR ("Cannot map src d3d12 memory"); GST_ERROR ("Cannot map src d3d12 memory");
return FALSE; return FALSE;
} }
gst_memory_unmap (src_mem, &map_info); gst_memory_unmap (src_mem, &map_info);
if (!gst_memory_map (dst_mem, &map_info, if (!gst_memory_map (dst_mem, &map_info, GST_MAP_WRITE_D3D12)) {
(GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D12))) {
GST_ERROR ("Cannot map dst d3d12 memory"); GST_ERROR ("Cannot map dst d3d12 memory");
return FALSE; return FALSE;
} }