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

dvbsrc: unify exit paths on _start()

Browse source
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-06-06 16:35:15 -07:00
parent 33893c5242
commit ea7c0981ec
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/dvb/gstdvbsrc.c
View file

@ -1985,32 +1985,29 @@ gst_dvbsrc_start (GstBaseSrc * bsrc)
} }
if (!gst_dvbsrc_tune (src)) { if (!gst_dvbsrc_tune (src)) {
GST_ERROR_OBJECT (src, "Not able to lock on to the dvb channel"); GST_ERROR_OBJECT (src, "Not able to lock on to the dvb channel");
gst_dvbsrc_unset_pes_filters (src); goto fail;
close (src->fd_frontend);
return FALSE;
} }
if (!gst_dvbsrc_open_dvr (src)) { if (!gst_dvbsrc_open_dvr (src)) {
GST_ERROR_OBJECT (src, "Not able to open DVR device"); GST_ERROR_OBJECT (src, "Not able to open DVR device");
/* unset filters also */ goto fail;
gst_dvbsrc_unset_pes_filters (src);
close (src->fd_frontend);
return FALSE;
} }
if (!(src->poll = gst_poll_new (TRUE))) { if (!(src->poll = gst_poll_new (TRUE))) {
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ_WRITE, (NULL), GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ_WRITE, (NULL),
("Could not create an fd set: %s (%d)", g_strerror (errno), errno)); ("Could not create an fd set: %s (%d)", g_strerror (errno), errno));
/* unset filters also */ goto fail;
gst_dvbsrc_unset_pes_filters (src);
close (src->fd_frontend);
return FALSE;
} else {
gst_poll_fd_init (&src->poll_fd_dvr);
src->poll_fd_dvr.fd = src->fd_dvr;
gst_poll_add_fd (src->poll, &src->poll_fd_dvr);
gst_poll_fd_ctl_read (src->poll, &src->poll_fd_dvr, TRUE);
} }
gst_poll_fd_init (&src->poll_fd_dvr);
src->poll_fd_dvr.fd = src->fd_dvr;
gst_poll_add_fd (src->poll, &src->poll_fd_dvr);
gst_poll_fd_ctl_read (src->poll, &src->poll_fd_dvr, TRUE);
return TRUE; return TRUE;
fail:
gst_dvbsrc_unset_pes_filters (src);
close (src->fd_frontend);
return FALSE;
} }
static gboolean static gboolean