videoaggregator: Set video-meta option on buffer pool configuration correctly

CID 1435451
This commit is contained in:
Sebastian Dröge 2018-05-07 17:53:32 +03:00
parent e21481e301
commit 2308c9555a

View file

@ -2292,6 +2292,10 @@ gst_video_aggregator_decide_allocation (GstAggregator * agg, GstQuery * query)
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_buffer_pool_config_set_allocator (config, allocator, &params); gst_buffer_pool_config_set_allocator (config, allocator, &params);
if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)) {
gst_buffer_pool_config_add_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_META);
}
/* buffer pool may have to do some changes */ /* buffer pool may have to do some changes */
if (!gst_buffer_pool_set_config (pool, config)) { if (!gst_buffer_pool_set_config (pool, config)) {
@ -2305,16 +2309,16 @@ gst_video_aggregator_decide_allocation (GstAggregator * agg, GstQuery * query)
pool = gst_video_buffer_pool_new (); pool = gst_video_buffer_pool_new ();
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_buffer_pool_config_set_allocator (config, allocator, &params); gst_buffer_pool_config_set_allocator (config, allocator, &params);
}
if (!gst_buffer_pool_set_config (pool, config))
goto config_failed;
}
if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)) { if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)) {
gst_buffer_pool_config_add_option (config, gst_buffer_pool_config_add_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_META); GST_BUFFER_POOL_OPTION_VIDEO_META);
} }
}
if (!gst_buffer_pool_set_config (pool, config))
goto config_failed;
}
if (update) if (update)
gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max); gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);