mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11videosink: Prepare window once streaming started

Browse source 
... instead of READY state. READY state is too early for setting
overlay window handle especially playbin/playsink scenario
since playsink will set given overlay handle on videosink once
READY state change of videosink is ensured.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1893>
This commit is contained in:
Seungha Yang 2020-12-20 22:12:44 +09:00
parent 6195fcf857
commit 28174b14d3
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
sys/d3d11/gstd3d11videosink.c
View file

@ -125,6 +125,7 @@ static gboolean gst_d3d11_video_sink_unlock_stop (GstBaseSink * sink);
static GstFlowReturn static GstFlowReturn
gst_d3d11_video_sink_show_frame (GstVideoSink * sink, GstBuffer * buf); gst_d3d11_video_sink_show_frame (GstVideoSink * sink, GstBuffer * buf);
static gboolean gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self);
#define gst_d3d11_video_sink_parent_class parent_class #define gst_d3d11_video_sink_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstD3D11VideoSink, gst_d3d11_video_sink, G_DEFINE_TYPE_WITH_CODE (GstD3D11VideoSink, gst_d3d11_video_sink,
@ -371,6 +372,9 @@ gst_d3d11_video_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
GST_DEBUG_OBJECT (self, "set caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (self, "set caps %" GST_PTR_FORMAT, caps);
if (!gst_d3d11_video_sink_prepare_window (self))
goto no_window;
if (!gst_video_info_from_caps (&self->info, caps)) if (!gst_video_info_from_caps (&self->info, caps))
goto invalid_format; goto invalid_format;
@ -511,6 +515,12 @@ invalid_format:
"Could not locate image format from caps %" GST_PTR_FORMAT, caps); "Could not locate image format from caps %" GST_PTR_FORMAT, caps);
return FALSE; return FALSE;
} }
no_window:
{
GST_ELEMENT_ERROR (sink, RESOURCE, NOT_FOUND, (NULL),
("Failed to open window."));
return FALSE;
}
no_disp_ratio: no_disp_ratio:
{ {
GST_ELEMENT_ERROR (sink, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (sink, CORE, NEGOTIATION, (NULL),
@ -552,7 +562,6 @@ gst_d3d11_video_sink_start (GstBaseSink * sink)
{ {
GstD3D11VideoSink *self = GST_D3D11_VIDEO_SINK (sink); GstD3D11VideoSink *self = GST_D3D11_VIDEO_SINK (sink);
gboolean is_hardware = TRUE; gboolean is_hardware = TRUE;
GstD3D11WindowNativeType window_type = GST_D3D11_WINDOW_NATIVE_TYPE_HWND;
GST_DEBUG_OBJECT (self, "Start"); GST_DEBUG_OBJECT (self, "Start");
@ -562,6 +571,25 @@ gst_d3d11_video_sink_start (GstBaseSink * sink)
return FALSE; return FALSE;
} }
g_object_get (self->device, "hardware", &is_hardware, NULL);
if (!is_hardware) {
GST_WARNING_OBJECT (self, "D3D11 device is running on software emulation");
self->can_convert = FALSE;
} else {
self->can_convert = TRUE;
}
return TRUE;
}
static gboolean
gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self)
{
GstD3D11WindowNativeType window_type = GST_D3D11_WINDOW_NATIVE_TYPE_HWND;
if (self->window)
return TRUE;
if (!self->window_id) if (!self->window_id)
gst_video_overlay_prepare_window_handle (GST_VIDEO_OVERLAY (self)); gst_video_overlay_prepare_window_handle (GST_VIDEO_OVERLAY (self));
@ -570,6 +598,8 @@ gst_d3d11_video_sink_start (GstBaseSink * sink)
gst_d3d11_window_get_native_type_from_handle (self->window_id); gst_d3d11_window_get_native_type_from_handle (self->window_id);
if (window_type != GST_D3D11_WINDOW_NATIVE_TYPE_NONE) { if (window_type != GST_D3D11_WINDOW_NATIVE_TYPE_NONE) {
GST_DEBUG_OBJECT (self, "Have window handle %" G_GUINTPTR_FORMAT,
self->window_id);
gst_video_overlay_got_window_handle (GST_VIDEO_OVERLAY (self), gst_video_overlay_got_window_handle (GST_VIDEO_OVERLAY (self),
self->window_id); self->window_id);
} }
@ -606,7 +636,7 @@ gst_d3d11_video_sink_start (GstBaseSink * sink)
} }
if (!self->window) { if (!self->window) {
GST_ERROR_OBJECT (sink, "Cannot create d3d11window"); GST_ERROR_OBJECT (self, "Cannot create d3d11window");
return FALSE; return FALSE;
} }
@ -626,15 +656,6 @@ gst_d3d11_video_sink_start (GstBaseSink * sink)
g_signal_connect (self->window, "mouse-event", g_signal_connect (self->window, "mouse-event",
G_CALLBACK (gst_d3d11_video_mouse_key_event), self); G_CALLBACK (gst_d3d11_video_mouse_key_event), self);
g_object_get (self->device, "hardware", &is_hardware, NULL);
if (!is_hardware) {
GST_WARNING_OBJECT (self, "D3D11 device is running on software emulation");
self->can_convert = FALSE;
} else {
self->can_convert = TRUE;
}
return TRUE; return TRUE;
} }