mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvbsrc: fix usage of PES & DVR acronyms everywhere

Browse source 
Additionally, improve message on gst_poll_new() failure
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-05-23 14:02:10 -07:00
parent e597e45008
commit 31a52b6c7c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/dvb/gstdvbsrc.c
View file

@ -1129,10 +1129,10 @@ gst_dvbsrc_set_pids (GstDvbSrc * dvbsrc, const gchar * pid_string)
g_strfreev (tmp); g_strfreev (tmp);
} }
/* if we are in playing or paused, then set filters now */ /* if we are in playing or paused, then set filters now */
GST_INFO_OBJECT (dvbsrc, "checking if playing for setting pes filters"); GST_INFO_OBJECT (dvbsrc, "checking if playing for setting PES filters");
if (GST_ELEMENT (dvbsrc)->current_state == GST_STATE_PLAYING || if (GST_ELEMENT (dvbsrc)->current_state == GST_STATE_PLAYING ||
GST_ELEMENT (dvbsrc)->current_state == GST_STATE_PAUSED) { GST_ELEMENT (dvbsrc)->current_state == GST_STATE_PAUSED) {
GST_INFO_OBJECT (dvbsrc, "Setting pes filters now"); GST_INFO_OBJECT (dvbsrc, "Setting PES filters now");
gst_dvbsrc_set_pes_filters (dvbsrc); gst_dvbsrc_set_pes_filters (dvbsrc);
} }
} }
@ -1770,7 +1770,7 @@ gst_dvbsrc_open_dvr (GstDvbSrc * object)
dvr_dev = g_strdup_printf ("/dev/dvb/adapter%d/dvr%d", dvr_dev = g_strdup_printf ("/dev/dvb/adapter%d/dvr%d",
object->adapter_number, object->frontend_number); object->adapter_number, object->frontend_number);
GST_INFO_OBJECT (object, "Using dvr device: %s", dvr_dev); GST_INFO_OBJECT (object, "Using DVR device: %s", dvr_dev);
/* open DVR */ /* open DVR */
if ((object->fd_dvr = open (dvr_dev, O_RDONLY | O_NONBLOCK)) < 0) { if ((object->fd_dvr = open (dvr_dev, O_RDONLY | O_NONBLOCK)) < 0) {
@ -1990,7 +1990,7 @@ gst_dvbsrc_start (GstBaseSrc * bsrc)
return FALSE; 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 */ /* unset filters also */
gst_dvbsrc_unset_pes_filters (src); gst_dvbsrc_unset_pes_filters (src);
close (src->fd_frontend); close (src->fd_frontend);
@ -1998,7 +1998,7 @@ gst_dvbsrc_start (GstBaseSrc * bsrc)
} }
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 fdset: %s (%d)", g_strerror (errno), errno)); ("Could not create an fd set: %s (%d)", g_strerror (errno), errno));
/* unset filters also */ /* unset filters also */
gst_dvbsrc_unset_pes_filters (src); gst_dvbsrc_unset_pes_filters (src);
close (src->fd_frontend); close (src->fd_frontend);
@ -2785,7 +2785,7 @@ gst_dvbsrc_set_pes_filters (GstDvbSrc * object)
pes_filter.pes_type = DMX_PES_OTHER; pes_filter.pes_type = DMX_PES_OTHER;
pes_filter.flags = DMX_IMMEDIATE_START; pes_filter.flags = DMX_IMMEDIATE_START;
GST_INFO_OBJECT (object, "Setting pes-filter, pid = %d, type = %d", GST_INFO_OBJECT (object, "Setting PES filter: pid = %d, type = %d",
pes_filter.pid, pes_filter.pes_type); pes_filter.pid, pes_filter.pes_type);
LOOP_WHILE_EINTR (err, ioctl (*fd, DMX_SET_PES_FILTER, &pes_filter)); LOOP_WHILE_EINTR (err, ioctl (*fd, DMX_SET_PES_FILTER, &pes_filter));