mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: fix detection of raw video caps.

Browse source 
Use the new gst_caps_has_vaapi_surface() helper function to better
detect raw video caps, and in particular those from RGB colorspace.

https://bugzilla.gnome.org/show_bug.cgi?id=734665
This commit is contained in:
Gwenole Beauchesne 2014-08-20 11:43:08 +02:00
parent 95d1826dca
commit 7e9ac1cb98
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/vaapi/gstvaapipluginbase.c
View file

@ -389,6 +389,7 @@ gst_vaapi_plugin_base_set_caps (GstVaapiPluginBase * plugin, GstCaps * incaps,
if (!gst_video_info_from_caps (&plugin->sinkpad_info, incaps)) if (!gst_video_info_from_caps (&plugin->sinkpad_info, incaps))
return FALSE; return FALSE;
plugin->sinkpad_caps_changed = TRUE; plugin->sinkpad_caps_changed = TRUE;
plugin->sinkpad_caps_is_raw = !gst_caps_has_vaapi_surface (incaps);
} }
if (outcaps && outcaps != plugin->srcpad_caps) { if (outcaps && outcaps != plugin->srcpad_caps) {
@ -398,7 +399,7 @@ gst_vaapi_plugin_base_set_caps (GstVaapiPluginBase * plugin, GstCaps * incaps,
plugin->srcpad_caps_changed = TRUE; plugin->srcpad_caps_changed = TRUE;
} }
if (plugin->uploader && GST_VIDEO_INFO_IS_YUV (&plugin->sinkpad_info)) { if (plugin->uploader && plugin->sinkpad_caps_is_raw) {
if (!gst_vaapi_uploader_ensure_display (plugin->uploader, plugin->display)) if (!gst_vaapi_uploader_ensure_display (plugin->uploader, plugin->display))
return FALSE; return FALSE;
if (!gst_vaapi_uploader_ensure_caps (plugin->uploader, if (!gst_vaapi_uploader_ensure_caps (plugin->uploader,
@ -477,7 +478,7 @@ gst_vaapi_plugin_base_allocate_input_buffer (GstVaapiPluginBase * plugin,
plugin->sinkpad_caps_changed = TRUE; plugin->sinkpad_caps_changed = TRUE;
} }
if (!GST_VIDEO_INFO_IS_YUV (&plugin->sinkpad_info)) if (!plugin->sinkpad_caps_is_raw)
return GST_FLOW_OK; return GST_FLOW_OK;
if (!gst_vaapi_uploader_ensure_display (plugin->uploader, plugin->display)) if (!gst_vaapi_uploader_ensure_display (plugin->uploader, plugin->display))
@ -529,7 +530,7 @@ gst_vaapi_plugin_base_get_input_buffer (GstVaapiPluginBase * plugin,
return GST_FLOW_OK; return GST_FLOW_OK;
} }
if (!GST_VIDEO_INFO_IS_YUV (&plugin->sinkpad_info)) if (!plugin->sinkpad_caps_is_raw)
goto error_invalid_buffer; goto error_invalid_buffer;
if (!plugin->sinkpad_buffer_pool) if (!plugin->sinkpad_buffer_pool)
@ -586,7 +587,7 @@ error_map_src_buffer:
#else #else
if (meta) if (meta)
outbuf = gst_buffer_ref (inbuf); outbuf = gst_buffer_ref (inbuf);
else if (GST_VIDEO_INFO_IS_YUV (&plugin->sinkpad_info)) { else if (plugin->sinkpad_caps_is_raw) {
outbuf = gst_vaapi_uploader_get_buffer (plugin->uploader); outbuf = gst_vaapi_uploader_get_buffer (plugin->uploader);
if (!outbuf) if (!outbuf)
goto error_create_buffer; goto error_create_buffer;
@ -595,7 +596,7 @@ error_map_src_buffer:
} else } else
goto error_invalid_buffer; goto error_invalid_buffer;
if (GST_VIDEO_INFO_IS_YUV (&plugin->sinkpad_info) && if (plugin->sinkpad_caps_is_raw &&
!gst_vaapi_uploader_process (plugin->uploader, inbuf, outbuf)) !gst_vaapi_uploader_process (plugin->uploader, inbuf, outbuf))
goto error_copy_buffer; goto error_copy_buffer;

1
gst/vaapi/gstvaapipluginbase.h
View file

@ -123,6 +123,7 @@ struct _GstVaapiPluginBase
GstPad *sinkpad; GstPad *sinkpad;
GstCaps *sinkpad_caps; GstCaps *sinkpad_caps;
gboolean sinkpad_caps_changed; gboolean sinkpad_caps_changed;
gboolean sinkpad_caps_is_raw;
GstVideoInfo sinkpad_info; GstVideoInfo sinkpad_info;
GstPadQueryFunction sinkpad_query; GstPadQueryFunction sinkpad_query;
#if GST_CHECK_VERSION(1,0,0) #if GST_CHECK_VERSION(1,0,0)