mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklinkvideosrc: remove unnecessary checks for non-NULL frame

Browse source 
We can't get a NULL frame here.

CID 1359923
This commit is contained in:
Tim-Philipp Müller 2016-05-10 09:38:28 +01:00
parent d0e553a6d3
commit 8d128f8bf5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/decklink/gstdecklinkvideosrc.cpp
View file

@ -550,9 +550,10 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
f = (CaptureFrame *) g_queue_pop_head (&self->current_frames); f = (CaptureFrame *) g_queue_pop_head (&self->current_frames);
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
g_assert (f != NULL);
if (self->flushing) { if (self->flushing) {
if (f) capture_frame_free (f);
capture_frame_free (f);
GST_DEBUG_OBJECT (self, "Flushing"); GST_DEBUG_OBJECT (self, "Flushing");
return GST_FLOW_FLUSHING; return GST_FLOW_FLUSHING;
} }
@ -566,8 +567,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
self->caps_mode = f->mode; self->caps_mode = f->mode;
} else { } else {
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
if (f) capture_frame_free (f);
capture_frame_free (f);
GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
("Invalid mode in captured frame"), ("Invalid mode in captured frame"),
("Mode set to %d but captured %d", self->caps_mode, f->mode)); ("Mode set to %d but captured %d", self->caps_mode, f->mode));
@ -582,8 +582,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
self->caps_format = f->format; self->caps_format = f->format;
} else { } else {
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
if (f) capture_frame_free (f);
capture_frame_free (f);
GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
("Invalid pixel format in captured frame"), ("Invalid pixel format in captured frame"),
("Format set to %d but captured %d", self->caps_format, f->format)); ("Format set to %d but captured %d", self->caps_format, f->format));