sys/v4l/v4l_calls.c: Fix for some v4l cards which hang in v4lsrc
Original commit message from CVS: 2004-10-25 Zaheer Abbas Merali <zaheerabbas at merali dot org> reviewed by: Ronald Bultje <rbultje at gnome dot org> * sys/v4l/v4l_calls.c: (gst_v4l_get_chan_names): Fix for some v4l cards which hang in v4lsrc
This commit is contained in:
parent
64f5768c35
commit
3e6dfe2955
@ -1,3 +1,10 @@
|
|||||||
|
2004-10-25 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
|
reviewed by: Ronald Bultje <rbultje at gnome dot org>
|
||||||
|
|
||||||
|
* sys/v4l/v4l_calls.c: (gst_v4l_get_chan_names):
|
||||||
|
Fix for some v4l cards which hang in v4lsrc
|
||||||
|
|
||||||
2004-10-25 Wim Taymans <wim@fluendo.com>
|
2004-10-25 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_remove),
|
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_remove),
|
||||||
|
@ -316,10 +316,16 @@ gst_v4l_get_chan_names (GstV4lElement * v4lelement)
|
|||||||
gint n;
|
gint n;
|
||||||
|
|
||||||
for (n = 0;; n++) {
|
for (n = 0;; n++) {
|
||||||
|
if (n >= vchan.tuners) {
|
||||||
|
vtun.tuner = 0;
|
||||||
|
} else {
|
||||||
vtun.tuner = n;
|
vtun.tuner = n;
|
||||||
if (ioctl (v4lelement->video_fd, VIDIOCGTUNER, &vtun) < 0)
|
if (ioctl (v4lelement->video_fd, VIDIOCGTUNER, &vtun) >= 0)
|
||||||
break; /* no more tuners */
|
continue; /* no more tuners */
|
||||||
if (!strcmp (vtun.name, vchan.name)) {
|
if (strcmp (vtun.name, vchan.name) != 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
v4lchannel->tuner = n;
|
v4lchannel->tuner = n;
|
||||||
channel->flags |= GST_TUNER_CHANNEL_FREQUENCY;
|
channel->flags |= GST_TUNER_CHANNEL_FREQUENCY;
|
||||||
channel->freq_multiplicator =
|
channel->freq_multiplicator =
|
||||||
@ -330,7 +336,7 @@ gst_v4l_get_chan_names (GstV4lElement * v4lelement)
|
|||||||
channel->max_signal = 0xffff;
|
channel->max_signal = 0xffff;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (vchan.flags & VIDEO_VC_AUDIO) {
|
if (vchan.flags & VIDEO_VC_AUDIO) {
|
||||||
struct video_audio vaud;
|
struct video_audio vaud;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user