diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/v4l2/gstv4l2element.c | 4 | ||||
| -rw-r--r-- | sys/v4l2/v4l2_calls.c | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c index 1595e87f..4b7c6182 100644 --- a/sys/v4l2/gstv4l2element.c +++ b/sys/v4l2/gstv4l2element.c @@ -383,7 +383,7 @@ gst_v4l2element_class_init (GstV4l2ElementClass * klass) "input/output to switch to", NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, ARG_FREQUENCY, g_param_spec_ulong ("frequency", "frequency", - "frequency to tune to", 0, G_MAXULONG, 0, G_PARAM_READWRITE)); + "frequency to tune to (in Hz)", 0, G_MAXULONG, 0, G_PARAM_READWRITE)); /* signals */ gst_v4l2element_signals[SIGNAL_OPEN] = @@ -411,7 +411,7 @@ gst_v4l2element_init (GstV4l2Element * v4l2element) /* some default values */ v4l2element->video_fd = -1; v4l2element->buffer = NULL; - v4l2element->device = g_strdup ("/dev/video"); + v4l2element->device = g_strdup ("/dev/video0"); v4l2element->display = g_strdup (g_getenv ("DISPLAY")); v4l2element->channels = NULL; diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index 92de8a42..7b32ad7c 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -123,8 +123,10 @@ gst_v4l2_fill_lists (GstV4l2Element * v4l2element) g_object_unref (G_OBJECT (channel)); return FALSE; } - channel->min_frequency = vtun.rangelow; - channel->max_frequency = vtun.rangehigh; + channel->freq_multiplicator = + 62.5 * ((vtun.capability & V4L2_TUNER_CAP_LOW) ? 1 : 1000); + channel->min_frequency = vtun.rangelow * channel->freq_multiplicator; + channel->max_frequency = vtun.rangehigh * channel->freq_multiplicator; channel->min_signal = 0; channel->max_signal = 0xffff; } @@ -620,10 +622,13 @@ gst_v4l2_get_frequency (GstV4l2Element * v4l2element, gint tunernum, gulong * frequency) { struct v4l2_frequency freq; + GstTunerChannel *channel; DEBUG ("getting current tuner frequency"); GST_V4L2_CHECK_OPEN (v4l2element); + channel = gst_tuner_get_channel (GST_TUNER (v4l2element)); + freq.tuner = tunernum; if (ioctl (v4l2element->video_fd, VIDIOC_G_FREQUENCY, &freq) < 0) { GST_ELEMENT_ERROR (v4l2element, RESOURCE, SETTINGS, (NULL), @@ -632,7 +637,7 @@ gst_v4l2_get_frequency (GstV4l2Element * v4l2element, return FALSE; } - *frequency = freq.frequency; + *frequency = freq.frequency * channel->freq_multiplicator; return TRUE; } @@ -649,15 +654,18 @@ gst_v4l2_set_frequency (GstV4l2Element * v4l2element, gint tunernum, gulong frequency) { struct v4l2_frequency freq; + GstTunerChannel *channel; DEBUG ("setting current tuner frequency to %lu", frequency); GST_V4L2_CHECK_OPEN (v4l2element); GST_V4L2_CHECK_NOT_ACTIVE (v4l2element); + channel = gst_tuner_get_channel (GST_TUNER (v4l2element)); + freq.tuner = tunernum; /* fill in type - ignore error */ ioctl (v4l2element->video_fd, VIDIOC_G_FREQUENCY, &freq); - freq.frequency = frequency; + freq.frequency = frequency / channel->freq_multiplicator; if (ioctl (v4l2element->video_fd, VIDIOC_S_FREQUENCY, &freq) < 0) { GST_ELEMENT_ERROR (v4l2element, RESOURCE, SETTINGS, (NULL), |