mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11convert: Fix fallback texture setup when resolution is not even number

Browse source 
When texture format is semi-planar, resolution should be even number,
and add missing P016 format handling

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1275>
This commit is contained in:
Seungha Yang 2020-05-16 21:52:59 +09:00 committed by GStreamer Merge Bot
parent a966cc20bc
commit 24f30b2e6e
2 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
sys/d3d11/gstd3d11colorconvert.c
View file

@ -1170,10 +1170,23 @@ create_shader_input_resource (GstD3D11ColorConvert * self,
} }
} }
} else { } else {
gboolean is_semiplanar = FALSE;
if (format->dxgi_format == DXGI_FORMAT_NV12 ||
format->dxgi_format == DXGI_FORMAT_P010 ||
format->dxgi_format == DXGI_FORMAT_P016)
is_semiplanar = TRUE;
texture_desc.Width = GST_VIDEO_INFO_WIDTH (info); texture_desc.Width = GST_VIDEO_INFO_WIDTH (info);
texture_desc.Height = GST_VIDEO_INFO_HEIGHT (info); texture_desc.Height = GST_VIDEO_INFO_HEIGHT (info);
texture_desc.Format = format->dxgi_format; texture_desc.Format = format->dxgi_format;
/* semiplanar format resolution of should be even number */
if (is_semiplanar) {
texture_desc.Width = GST_ROUND_UP_2 (texture_desc.Width);
texture_desc.Height = GST_ROUND_UP_2 (texture_desc.Height);
}
hr = ID3D11Device_CreateTexture2D (device_handle, hr = ID3D11Device_CreateTexture2D (device_handle,
&texture_desc, NULL, &tex[0]); &texture_desc, NULL, &tex[0]);
if (!gst_d3d11_result (hr, device)) { if (!gst_d3d11_result (hr, device)) {
@ -1181,8 +1194,7 @@ create_shader_input_resource (GstD3D11ColorConvert * self,
goto error; goto error;
} }
if (format->dxgi_format == DXGI_FORMAT_NV12 || if (is_semiplanar) {
format->dxgi_format == DXGI_FORMAT_P010) {
ID3D11Resource_AddRef (tex[0]); ID3D11Resource_AddRef (tex[0]);
tex[1] = tex[0]; tex[1] = tex[0];
} }
@ -1274,10 +1286,23 @@ create_shader_output_resource (GstD3D11ColorConvert * self,
} }
} }
} else { } else {
gboolean is_semiplanar = FALSE;
if (format->dxgi_format == DXGI_FORMAT_NV12 ||
format->dxgi_format == DXGI_FORMAT_P010 ||
format->dxgi_format == DXGI_FORMAT_P016)
is_semiplanar = TRUE;
texture_desc.Width = GST_VIDEO_INFO_WIDTH (info); texture_desc.Width = GST_VIDEO_INFO_WIDTH (info);
texture_desc.Height = GST_VIDEO_INFO_HEIGHT (info); texture_desc.Height = GST_VIDEO_INFO_HEIGHT (info);
texture_desc.Format = format->dxgi_format; texture_desc.Format = format->dxgi_format;
/* semiplanar format resolution of should be even number */
if (is_semiplanar) {
texture_desc.Width = GST_ROUND_UP_2 (texture_desc.Width);
texture_desc.Height = GST_ROUND_UP_2 (texture_desc.Height);
}
hr = ID3D11Device_CreateTexture2D (device_handle, hr = ID3D11Device_CreateTexture2D (device_handle,
&texture_desc, NULL, &tex[0]); &texture_desc, NULL, &tex[0]);
if (!gst_d3d11_result (hr, device)) { if (!gst_d3d11_result (hr, device)) {
@ -1285,8 +1310,7 @@ create_shader_output_resource (GstD3D11ColorConvert * self,
goto error; goto error;
} }
if (format->dxgi_format == DXGI_FORMAT_NV12 || if (is_semiplanar) {
format->dxgi_format == DXGI_FORMAT_P010) {
ID3D11Resource_AddRef (tex[0]); ID3D11Resource_AddRef (tex[0]);
tex[1] = tex[0]; tex[1] = tex[0];
} }
@ -1385,6 +1409,21 @@ gst_d3d11_color_convert_set_info (GstD3D11BaseFilter * filter,
return FALSE; return FALSE;
} }
/* setup D3D11_BOX struct for fallback copy */
self->in_src_box.left = 0;
self->in_src_box.top = 0;
self->in_src_box.front = 0;
self->in_src_box.back = 1;
self->in_src_box.right = GST_VIDEO_INFO_WIDTH (in_info);
self->in_src_box.bottom = GST_VIDEO_INFO_HEIGHT (in_info);
self->out_src_box.left = 0;
self->out_src_box.top = 0;
self->out_src_box.front = 0;
self->out_src_box.back = 1;
self->out_src_box.right = GST_VIDEO_INFO_WIDTH (out_info);
self->out_src_box.bottom = GST_VIDEO_INFO_HEIGHT (out_info);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
@ -1468,7 +1507,7 @@ gst_d3d11_color_convert_transform (GstBaseTransform * trans,
ID3D11DeviceContext_CopySubresourceRegion (context_handle, ID3D11DeviceContext_CopySubresourceRegion (context_handle,
(ID3D11Resource *) self->in_texture[i], 0, 0, 0, 0, (ID3D11Resource *) self->in_texture[i], 0, 0, 0, 0,
(ID3D11Resource *) d3d11_mem->texture, d3d11_mem->subresource_index, (ID3D11Resource *) d3d11_mem->texture, d3d11_mem->subresource_index,
NULL); &self->in_src_box);
} }
gst_d3d11_device_unlock (device); gst_d3d11_device_unlock (device);
} }
@ -1522,7 +1561,8 @@ gst_d3d11_color_convert_transform (GstBaseTransform * trans,
ID3D11DeviceContext_CopySubresourceRegion (context_handle, ID3D11DeviceContext_CopySubresourceRegion (context_handle,
(ID3D11Resource *) d3d11_mem->texture, d3d11_mem->subresource_index, (ID3D11Resource *) d3d11_mem->texture, d3d11_mem->subresource_index,
0, 0, 0, (ID3D11Resource *) self->out_texture[i], 0, NULL); 0, 0, 0, (ID3D11Resource *) self->out_texture[i], 0,
&self->out_src_box);
} }
gst_d3d11_device_unlock (device); gst_d3d11_device_unlock (device);
} else { } else {

4
sys/d3d11/gstd3d11colorconvert.h
View file

@ -50,6 +50,10 @@ struct _GstD3D11ColorConvert
guint num_output_view; guint num_output_view;
GstD3D11ColorConverter *converter; GstD3D11ColorConverter *converter;
/* used for fallback texture copy */
D3D11_BOX in_src_box;
D3D11_BOX out_src_box;
}; };
struct _GstD3D11ColorConvertClass struct _GstD3D11ColorConvertClass