mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: remove param in gst_vaapi_plugin_base_decide_allocation()

Browse source
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-03-10 16:43:16 +01:00
parent 7f0bf08728
commit c5c60e2a33
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/vaapi/gstvaapidecode.c
View file

@ -748,7 +748,7 @@ gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
#endif #endif
return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec), return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec),
query, 0); query);
/* ERRORS */ /* ERRORS */
error_no_caps: error_no_caps:

9
gst/vaapi/gstvaapipluginbase.c
View file

@ -594,7 +594,7 @@ gst_vaapi_plugin_base_set_pool_config (GstBufferPool * pool,
*/ */
gboolean gboolean
gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin, gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
GstQuery * query, guint feature) GstQuery * query)
{ {
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstBufferPool *pool; GstBufferPool *pool;
@ -620,17 +620,14 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
if (!caps) if (!caps)
goto error_no_caps; goto error_no_caps;
if (!feature)
feature = gst_vaapi_find_preferred_caps_feature (plugin->srcpad, caps,
NULL);
has_video_meta = gst_query_find_allocation_meta (query, has_video_meta = gst_query_find_allocation_meta (query,
GST_VIDEO_META_API_TYPE, NULL); GST_VIDEO_META_API_TYPE, NULL);
#if (USE_GLX || USE_EGL) #if (USE_GLX || USE_EGL)
has_texture_upload_meta = gst_query_find_allocation_meta (query, has_texture_upload_meta = gst_query_find_allocation_meta (query,
GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, &idx) && GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, &idx) &&
(feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META); gst_vaapi_caps_feature_contains (caps,
GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META);
#if USE_GST_GL_HELPERS #if USE_GST_GL_HELPERS
if (has_texture_upload_meta) { if (has_texture_upload_meta) {

2
gst/vaapi/gstvaapipluginbase.h
View file

@ -213,7 +213,7 @@ gst_vaapi_plugin_base_propose_allocation (GstVaapiPluginBase * plugin,
G_GNUC_INTERNAL G_GNUC_INTERNAL
gboolean gboolean
gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin, gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
GstQuery * query, guint feature); GstQuery * query);
G_GNUC_INTERNAL G_GNUC_INTERNAL
GstFlowReturn GstFlowReturn

2
gst/vaapi/gstvaapipostproc.c
View file

@ -1334,7 +1334,7 @@ static gboolean
gst_vaapipostproc_decide_allocation (GstBaseTransform * trans, GstQuery * query) gst_vaapipostproc_decide_allocation (GstBaseTransform * trans, GstQuery * query)
{ {
return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (trans), return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (trans),
query, 0); query);
} }
static void static void