mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-27 02:30:35 +00:00
update for bufferpool api change
This commit is contained in:
parent
9778d5dac7
commit
1c8324a0d1
7 changed files with 11 additions and 13 deletions
|
@ -456,7 +456,7 @@ gst_vis_src_negotiate (GstVisual * visual)
|
||||||
pool = gst_buffer_pool_new ();
|
pool = gst_buffer_pool_new ();
|
||||||
|
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_set (config, target, size, min, max, prefix, 0,
|
gst_buffer_pool_config_set (config, target, size, min, max, prefix,
|
||||||
alignment);
|
alignment);
|
||||||
gst_buffer_pool_set_config (pool, config);
|
gst_buffer_pool_set_config (pool, config);
|
||||||
}
|
}
|
||||||
|
|
|
@ -819,7 +819,7 @@ theora_negotiate_pool (GstTheoraDec * dec, GstCaps * caps)
|
||||||
pool = gst_buffer_pool_new ();
|
pool = gst_buffer_pool_new ();
|
||||||
|
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_set (config, caps, size, min, max, prefix, 0,
|
gst_buffer_pool_config_set (config, caps, size, min, max, prefix,
|
||||||
alignment);
|
alignment);
|
||||||
gst_buffer_pool_set_config (pool, config);
|
gst_buffer_pool_set_config (pool, config);
|
||||||
}
|
}
|
||||||
|
|
|
@ -705,7 +705,7 @@ gst_video_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
|
||||||
pool = gst_buffer_pool_new ();
|
pool = gst_buffer_pool_new ();
|
||||||
|
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_set (config, caps, size, min, max, prefix, 0,
|
gst_buffer_pool_config_set (config, caps, size, min, max, prefix,
|
||||||
alignment);
|
alignment);
|
||||||
gst_buffer_pool_set_config (pool, config);
|
gst_buffer_pool_set_config (pool, config);
|
||||||
}
|
}
|
||||||
|
|
|
@ -459,8 +459,7 @@ ximage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
|
||||||
gint width, height;
|
gint width, height;
|
||||||
const GstCaps *caps;
|
const GstCaps *caps;
|
||||||
|
|
||||||
if (!gst_buffer_pool_config_get (config, &caps, NULL, NULL, NULL, NULL,
|
if (!gst_buffer_pool_config_get (config, &caps, NULL, NULL, NULL, NULL, NULL))
|
||||||
NULL, NULL))
|
|
||||||
goto wrong_config;
|
goto wrong_config;
|
||||||
|
|
||||||
if (caps == NULL)
|
if (caps == NULL)
|
||||||
|
|
|
@ -1138,7 +1138,7 @@ gst_ximagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
newpool = gst_ximage_buffer_pool_new (ximagesink);
|
newpool = gst_ximage_buffer_pool_new (ximagesink);
|
||||||
|
|
||||||
structure = gst_buffer_pool_get_config (newpool);
|
structure = gst_buffer_pool_get_config (newpool);
|
||||||
gst_buffer_pool_config_set (structure, caps, 0, 0, 0, 0, 0, 16);
|
gst_buffer_pool_config_set (structure, caps, 0, 0, 0, 0, 16);
|
||||||
if (!gst_buffer_pool_set_config (newpool, structure))
|
if (!gst_buffer_pool_set_config (newpool, structure))
|
||||||
goto config_failed;
|
goto config_failed;
|
||||||
|
|
||||||
|
@ -1434,7 +1434,7 @@ gst_ximagesink_sink_query (GstPad * sinkpad, GstQuery * query)
|
||||||
/* we had a pool, check caps */
|
/* we had a pool, check caps */
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_get (config, &pcaps, &size, NULL, NULL, NULL,
|
gst_buffer_pool_config_get (config, &pcaps, &size, NULL, NULL, NULL,
|
||||||
NULL, NULL);
|
NULL);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (ximagesink,
|
GST_DEBUG_OBJECT (ximagesink,
|
||||||
"we had a pool with caps %" GST_PTR_FORMAT, pcaps);
|
"we had a pool with caps %" GST_PTR_FORMAT, pcaps);
|
||||||
|
@ -1459,7 +1459,7 @@ gst_ximagesink_sink_query (GstPad * sinkpad, GstQuery * query)
|
||||||
size = gst_video_format_get_size (format, width, height);
|
size = gst_video_format_get_size (format, width, height);
|
||||||
|
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 0, 16);
|
gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 16);
|
||||||
if (!gst_buffer_pool_set_config (pool, config))
|
if (!gst_buffer_pool_set_config (pool, config))
|
||||||
goto config_failed;
|
goto config_failed;
|
||||||
}
|
}
|
||||||
|
|
|
@ -495,8 +495,7 @@ xvimage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
|
||||||
gint width, height;
|
gint width, height;
|
||||||
const GstCaps *caps;
|
const GstCaps *caps;
|
||||||
|
|
||||||
if (!gst_buffer_pool_config_get (config, &caps, NULL, NULL, NULL, NULL,
|
if (!gst_buffer_pool_config_get (config, &caps, NULL, NULL, NULL, NULL, NULL))
|
||||||
NULL, NULL))
|
|
||||||
goto wrong_config;
|
goto wrong_config;
|
||||||
|
|
||||||
if (caps == NULL)
|
if (caps == NULL)
|
||||||
|
|
|
@ -1685,7 +1685,7 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
newpool = gst_xvimage_buffer_pool_new (xvimagesink);
|
newpool = gst_xvimage_buffer_pool_new (xvimagesink);
|
||||||
|
|
||||||
structure = gst_buffer_pool_get_config (newpool);
|
structure = gst_buffer_pool_get_config (newpool);
|
||||||
gst_buffer_pool_config_set (structure, caps, 0, 0, 0, 0, 0, 16);
|
gst_buffer_pool_config_set (structure, caps, 0, 0, 0, 0, 16);
|
||||||
if (!gst_buffer_pool_set_config (newpool, structure))
|
if (!gst_buffer_pool_set_config (newpool, structure))
|
||||||
goto config_failed;
|
goto config_failed;
|
||||||
|
|
||||||
|
@ -1996,7 +1996,7 @@ gst_xvimagesink_sink_query (GstPad * sinkpad, GstQuery * query)
|
||||||
/* we had a pool, check caps */
|
/* we had a pool, check caps */
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_get (config, &pcaps, &size, NULL, NULL, NULL,
|
gst_buffer_pool_config_get (config, &pcaps, &size, NULL, NULL, NULL,
|
||||||
NULL, NULL);
|
NULL);
|
||||||
|
|
||||||
if (!gst_caps_is_equal (caps, pcaps)) {
|
if (!gst_caps_is_equal (caps, pcaps)) {
|
||||||
GST_DEBUG_OBJECT (xvimagesink, "pool has different caps");
|
GST_DEBUG_OBJECT (xvimagesink, "pool has different caps");
|
||||||
|
@ -2019,7 +2019,7 @@ gst_xvimagesink_sink_query (GstPad * sinkpad, GstQuery * query)
|
||||||
size = gst_video_format_get_size (format, width, height);
|
size = gst_video_format_get_size (format, width, height);
|
||||||
|
|
||||||
config = gst_buffer_pool_get_config (pool);
|
config = gst_buffer_pool_get_config (pool);
|
||||||
gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 0, 16);
|
gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 16);
|
||||||
if (!gst_buffer_pool_set_config (pool, config))
|
if (!gst_buffer_pool_set_config (pool, config))
|
||||||
goto config_failed;
|
goto config_failed;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue