diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c index 4935ac7d2f..cb58c9a070 100644 --- a/ext/theora/gsttheoradec.c +++ b/ext/theora/gsttheoradec.c @@ -45,6 +45,7 @@ #include #include #include +#include #define GST_CAT_DEFAULT theoradec_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); @@ -826,10 +827,10 @@ theora_negotiate_pool (GstTheoraDec * dec, GstCaps * caps, GstVideoInfo * info) config = gst_buffer_pool_get_config (pool); gst_buffer_pool_config_set (config, caps, size, min, max, prefix, alignment); - /* just set the metadata, if the pool can support it we will transparently use + /* just set the option, if the pool can support it we will transparently use * it through the video info API. We could also see if the pool support this - * metadata and only activate it then. */ - gst_buffer_pool_config_add_meta (config, GST_META_API_VIDEO); + * option and only activate it then. */ + gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_META_VIDEO); /* check if downstream supports cropping */ dec->use_cropping = diff --git a/gst/videoconvert/gstvideoconvert.c b/gst/videoconvert/gstvideoconvert.c index 2fad4b0864..937e650ad4 100644 --- a/gst/videoconvert/gstvideoconvert.c +++ b/gst/videoconvert/gstvideoconvert.c @@ -40,6 +40,7 @@ #include "gstvideoconvert.h" #include #include +#include #include @@ -172,7 +173,8 @@ gst_video_convert_setup_allocation (GstBaseTransform * trans, GstQuery * query) GstStructure *config; config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_add_meta (config, GST_META_API_VIDEO); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_META_VIDEO); gst_buffer_pool_set_config (pool, config); } return TRUE; diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index e806e3b845..8ab4dc6495 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -77,6 +77,7 @@ #include #include +#include #include "gstvideoscale.h" #include "gstvideoscaleorc.h" @@ -364,7 +365,8 @@ gst_video_scale_setup_allocation (GstBaseTransform * trans, GstQuery * query) GstStructure *config; config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_add_meta (config, GST_META_API_VIDEO); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_META_VIDEO); gst_buffer_pool_set_config (pool, config); } return TRUE; diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 652dec418a..2d3e40ca2d 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -665,7 +665,8 @@ gst_video_test_src_setup_allocation (GstBaseSrc * bsrc, GstQuery * query) GstStructure *config; config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_add_meta (config, GST_META_API_VIDEO); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_META_VIDEO); gst_buffer_pool_set_config (pool, config); } gst_query_set_allocation_params (query, size, min, max, prefix, diff --git a/gst/videotestsrc/gstvideotestsrc.h b/gst/videotestsrc/gstvideotestsrc.h index ac723bcde6..31673f8331 100644 --- a/gst/videotestsrc/gstvideotestsrc.h +++ b/gst/videotestsrc/gstvideotestsrc.h @@ -25,6 +25,7 @@ #include #include +#include G_BEGIN_DECLS diff --git a/sys/ximage/ximagepool.c b/sys/ximage/ximagepool.c index 41ae012822..8bb47247e8 100644 --- a/sys/ximage/ximagepool.c +++ b/sys/ximage/ximagepool.c @@ -30,6 +30,7 @@ /* Helper functions */ #include #include +#include GST_DEBUG_CATEGORY_EXTERN (gst_debug_ximagepool); #define GST_CAT_DEFAULT gst_debug_ximagepool @@ -442,11 +443,11 @@ G_DEFINE_TYPE (GstXImageBufferPool, gst_ximage_buffer_pool, GST_TYPE_BUFFER_POOL); static const gchar ** -ximage_buffer_pool_get_metas (GstBufferPool * pool) +ximage_buffer_pool_get_options (GstBufferPool * pool) { - static const gchar *metas[] = { "GstMetaVideo", NULL }; + static const gchar *options[] = { GST_BUFFER_POOL_OPTION_META_VIDEO, NULL }; - return metas; + return options; } static gboolean @@ -479,7 +480,8 @@ ximage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) /* check for the configured metadata */ priv->add_metavideo = - gst_buffer_pool_config_has_meta (config, GST_META_API_VIDEO); + gst_buffer_pool_config_has_option (config, + GST_BUFFER_POOL_OPTION_META_VIDEO); return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config); @@ -572,7 +574,7 @@ gst_ximage_buffer_pool_class_init (GstXImageBufferPoolClass * klass) gobject_class->finalize = gst_ximage_buffer_pool_finalize; - gstbufferpool_class->get_metas = ximage_buffer_pool_get_metas; + gstbufferpool_class->get_options = ximage_buffer_pool_get_options; gstbufferpool_class->set_config = ximage_buffer_pool_set_config; gstbufferpool_class->alloc_buffer = ximage_buffer_pool_alloc; gstbufferpool_class->free_buffer = ximage_buffer_pool_free; diff --git a/sys/xvimage/xvimagepool.c b/sys/xvimage/xvimagepool.c index 28221916c7..87cea3aa45 100644 --- a/sys/xvimage/xvimagepool.c +++ b/sys/xvimage/xvimagepool.c @@ -30,6 +30,8 @@ /* Helper functions */ #include #include +#include + GST_DEBUG_CATEGORY_EXTERN (gst_debug_xvimagepool); #define GST_CAT_DEFAULT gst_debug_xvimagepool @@ -475,11 +477,11 @@ G_DEFINE_TYPE (GstXvImageBufferPool, gst_xvimage_buffer_pool, GST_TYPE_BUFFER_POOL); static const gchar ** -xvimage_buffer_pool_get_metas (GstBufferPool * pool) +xvimage_buffer_pool_get_options (GstBufferPool * pool) { - static const gchar *metas[] = { "GstMetaVideo", NULL }; + static const gchar *options[] = { GST_BUFFER_POOL_OPTION_META_VIDEO, NULL }; - return metas; + return options; } static gboolean @@ -514,7 +516,8 @@ xvimage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) /* enable metadata based on config of the pool */ priv->add_metavideo = - gst_buffer_pool_config_has_meta (config, GST_META_API_VIDEO); + gst_buffer_pool_config_has_option (config, + GST_BUFFER_POOL_OPTION_META_VIDEO); if (priv->im_format == -1) goto unknown_format; @@ -622,7 +625,7 @@ gst_xvimage_buffer_pool_class_init (GstXvImageBufferPoolClass * klass) gobject_class->finalize = gst_xvimage_buffer_pool_finalize; - gstbufferpool_class->get_metas = xvimage_buffer_pool_get_metas; + gstbufferpool_class->get_options = xvimage_buffer_pool_get_options; gstbufferpool_class->set_config = xvimage_buffer_pool_set_config; gstbufferpool_class->alloc_buffer = xvimage_buffer_pool_alloc; gstbufferpool_class->free_buffer = xvimage_buffer_pool_free;