v4l2object: Readback pool config if used within the baseclass

This commit is contained in:
Nicolas Dufresne 2014-05-06 13:37:47 -04:00 committed by Nicolas Dufresne
parent 82a806e63b
commit ab465bd162

View file

@ -3204,12 +3204,14 @@ gst_v4l2_object_decide_allocation (GstV4l2Object * obj, GstQuery * query)
/* First step, configure our own pool */ /* First step, configure our own pool */
config = gst_buffer_pool_get_config (obj->pool);
/* If already configured/active, skip it */ /* If already configured/active, skip it */
/* FIXME not entirely correct, See bug 728268 */ /* FIXME not entirely correct, See bug 728268 */
if (gst_buffer_pool_is_active (obj->pool)) if (gst_buffer_pool_is_active (obj->pool)) {
gst_buffer_pool_config_get_params (config, NULL, &size, &min, &max);
goto setup_other_pool; goto setup_other_pool;
}
config = gst_buffer_pool_get_config (obj->pool);
if (obj->need_video_meta) { if (obj->need_video_meta) {
GST_DEBUG_OBJECT (obj->element, "activate Video Meta"); GST_DEBUG_OBJECT (obj->element, "activate Video Meta");
@ -3230,6 +3232,8 @@ gst_v4l2_object_decide_allocation (GstV4l2Object * obj, GstQuery * query)
GST_PTR_FORMAT, config); GST_PTR_FORMAT, config);
/* our pool will adjust the maximum buffer, which we are fine with */ /* our pool will adjust the maximum buffer, which we are fine with */
if (obj->pool == pool)
gst_buffer_pool_config_get_params (config, NULL, &size, &min, &max);
if (!gst_buffer_pool_set_config (obj->pool, config)) if (!gst_buffer_pool_set_config (obj->pool, config))
goto config_failed; goto config_failed;