mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 00:25:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

No code with side-effects inside g_assert() please

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-08-08 10:56:51 +01:00
parent b4ff570532
commit 4de8bd004c
4 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/jpeg/gstjpegdec.c
View file

@ -1316,15 +1316,17 @@ invalid_yuvrgbgrayscale:
static gboolean static gboolean
gst_jpeg_dec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query) gst_jpeg_dec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query)
{ {
GstBufferPool *pool; GstBufferPool *pool = NULL;
GstStructure *config; GstStructure *config;
if (!GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation (bdec, query)) if (!GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation (bdec, query))
return FALSE; return FALSE;
g_assert (gst_query_get_n_allocation_pools (query) > 0); if (gst_query_get_n_allocation_pools (query) > 0)
gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL); gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL);
g_assert (pool != NULL);
if (pool == NULL)
return FALSE;
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
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)) {

10
ext/libpng/gstpngdec.c
View file

@ -394,15 +394,17 @@ beach:
static gboolean static gboolean
gst_pngdec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query) gst_pngdec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query)
{ {
GstBufferPool *pool; GstBufferPool *pool = NULL;
GstStructure *config; GstStructure *config;
if (!GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation (bdec, query)) if (!GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation (bdec, query))
return FALSE; return FALSE;
g_assert (gst_query_get_n_allocation_pools (query) > 0); if (gst_query_get_n_allocation_pools (query) > 0)
gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL); gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL);
g_assert (pool != NULL);
if (pool == NULL)
return FALSE;
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
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)) {

3
gst/isomp4/gstqtmoovrecover.c
View file

@ -362,7 +362,8 @@ gst_qt_moov_recover_change_state (GstElement * element,
gst_task_join (qtmr->task); gst_task_join (qtmr->task);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
g_assert (gst_task_get_state (qtmr->task) == GST_TASK_STOPPED); if (gst_task_get_state (qtmr->task) != GST_TASK_STOPPED)
GST_ERROR ("task %p should be stopped by now", qtmr->task);
gst_object_unref (qtmr->task); gst_object_unref (qtmr->task);
qtmr->task = NULL; qtmr->task = NULL;
g_rec_mutex_clear (&qtmr->task_mutex); g_rec_mutex_clear (&qtmr->task_mutex);

12
tests/icles/ximagesrc-test.c
View file

@ -37,9 +37,7 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
GstElement *pipeline; GstElement *pipeline;
#ifndef G_DISABLE_ASSERT GstState state;
GstState state, pending;
#endif
GError *error = NULL; GError *error = NULL;
gst_init (&argc, &argv); gst_init (&argc, &argv);
@ -55,9 +53,11 @@ main (int argc, char **argv)
gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_element_set_state (pipeline, GST_STATE_PLAYING);
/* lets check it gets to PLAYING */ /* lets check it gets to PLAYING */
g_assert (gst_element_get_state (pipeline, &state, &pending, if (gst_element_get_state (pipeline, &state, NULL,
GST_CLOCK_TIME_NONE) != GST_STATE_CHANGE_FAILURE); GST_CLOCK_TIME_NONE) == GST_STATE_CHANGE_FAILURE ||
g_assert (state == GST_STATE_PLAYING || pending == GST_STATE_PLAYING); state != GST_STATE_PLAYING) {
g_warning ("State change to playing failed");
}
/* We want to get out after 5 seconds */ /* We want to get out after 5 seconds */
g_timeout_add (5000, (GSourceFunc) terminate_playback, pipeline); g_timeout_add (5000, (GSourceFunc) terminate_playback, pipeline);