From 07ed811a0983771c45faa2f6f76a9fff186db407 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 18 Jan 2004 21:46:58 +0000 Subject: use new error signal and classification Original commit message from CVS: use new error signal and classification --- sys/v4l2/gstv4l2src.c | 2 +- sys/v4l2/v4l2src_calls.c | 56 ++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 27 deletions(-) (limited to 'sys/v4l2') diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index edce2091..d0b480f9 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -817,7 +817,7 @@ gst_v4l2src_get (GstPad *pad) if (v4l2src->use_fixed_fps && (fps = gst_v4l2src_get_fps(v4l2src)) == 0) { - gst_element_error (GST_ELEMENT (v4l2src), "Could not get frame rate for element."); + gst_element_error (v4l2src, RESOURCE, SETTINGS, NULL, ("could not get frame rate for element")); return NULL; } diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 3a55a231..ec7028c2 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -72,9 +72,9 @@ gst_v4l2src_fill_format_list (GstV4l2Src *v4l2src) if (errno == EINVAL) { break; /* end of enumeration */ } else { - gst_element_error(GST_ELEMENT(v4l2src), - "Failed to get no. %d in pixelformat enumeration for %s: %s", - n, GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, SETTINGS, NULL, + ("failed to get number %d in pixelformat enumeration for %s: %s", + n, GST_V4L2ELEMENT(v4l2src)->device, g_strerror (errno))); g_free (format); return FALSE; } @@ -117,8 +117,9 @@ gst_v4l2src_queue_frame (GstV4l2Src *v4l2src, GST_LOG_OBJECT (v4l2src, "queueing frame %u", i); if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_QBUF, &v4l2src->pool->buffers[i].buffer) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), "Error queueing buffer %u on device %s: %s", - i, GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, WRITE, + (_("Could not write to device \"%s\""), GST_V4L2ELEMENT(v4l2src)->device), + ("Error queueing buffer %u on device %s", i, g_strerror(errno))); return FALSE; } @@ -141,8 +142,8 @@ gst_v4l2src_grab_frame (GstV4l2Src *v4l2src) while (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_DQBUF, &buffer) < 0) { /* if the sync() got interrupted, we can retry */ if (errno != EINTR) { - gst_element_error(GST_ELEMENT(v4l2src), "Error syncing on a buffer on device %s: %s", - GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, SYNC, NULL, ("could not sync on a buffer on device %s: %s", + GST_V4L2ELEMENT(v4l2src)->device, g_strerror (errno))); return -1; } GST_DEBUG_OBJECT (v4l2src, "grab got interrupted"); @@ -169,9 +170,9 @@ gst_v4l2src_get_capture (GstV4l2Src *v4l2src) v4l2src->format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_G_FMT, &v4l2src->format) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), - "Failed to get pixel format for device %s: %s", - GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, SETTINGS, NULL, + ("failed to get pixelformat for device %s: %s", + n, GST_V4L2ELEMENT(v4l2src)->device, g_strerror (errno))); return FALSE; } @@ -205,10 +206,9 @@ gst_v4l2src_set_capture (GstV4l2Src *v4l2src, v4l2src->format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_S_FMT, &v4l2src->format) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), - "Failed to set pixel format to %s @ %dx%d for device %s: %s", - fmt->description, width, height, - GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, SETTINGS, NULL, + ("failed to set pixelformat to %s @ %dx%d for device %s: %s", + fmt->description, width, height, GST_V4L2ELEMENT(v4l2src)->device, g_strerror (errno))); return FALSE; } @@ -245,14 +245,16 @@ gst_v4l2src_capture_init (GstV4l2Src *v4l2src) v4l2src->breq.type = v4l2src->format.type; v4l2src->breq.memory = V4L2_MEMORY_MMAP; if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_REQBUFS, &v4l2src->breq) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), "Error requesting buffers (%d) for %s: %s", - v4l2src->breq.count, GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, READ, + (_("Could not get buffers from device \"%s\""), GST_V4L2ELEMENT(v4l2src)->device), + ("error requesting %d buffers: %s", v4l2src->breq.count, g_strerror (errno))); return FALSE; } if (v4l2src->breq.count < GST_V4L2_MIN_BUFFERS) { - gst_element_error(GST_ELEMENT(v4l2src), "Too little buffers. We got %d, we want at least %d", - v4l2src->breq.count, GST_V4L2_MIN_BUFFERS); + gst_element_error (v4l2src, RESOURCE, READ, + (_("Could not get enough buffers from device \"%s\""), GST_V4L2ELEMENT(v4l2src)->device), + ("we received %d, we want at least %d", v4l2src->breq.count, GST_V4L2_MIN_BUFFERS)); v4l2src->breq.count = buffers; return FALSE; } @@ -278,16 +280,16 @@ gst_v4l2src_capture_init (GstV4l2Src *v4l2src) buffer->buffer.index = n; buffer->buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_QUERYBUF, &buffer->buffer) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), "Failed to get buffer (%d) properties: %s", - n, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, READ, NULL, + ("Could not get buffer properties of buffer %d: %s", n, g_strerror (errno))); gst_v4l2src_capture_deinit(v4l2src); return FALSE; } buffer->start = mmap (0, buffer->buffer.length, PROT_READ|PROT_WRITE, MAP_SHARED, GST_V4L2ELEMENT(v4l2src)->video_fd, buffer->buffer.m.offset); if (buffer->start == MAP_FAILED) { - gst_element_error(GST_ELEMENT(v4l2src), "Error mapping video buffer (%d) on device %s: %s", - n, GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, READ, NULL, + ("Could not mmap video buffer %d: %s", n, g_strerror (errno))); buffer->start = 0; gst_v4l2src_capture_deinit (v4l2src); return FALSE; @@ -326,8 +328,9 @@ gst_v4l2src_capture_start (GstV4l2Src *v4l2src) v4l2src->quit = FALSE; if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_STREAMON, &type) < 0) { - gst_element_error(GST_ELEMENT(v4l2src), "Error starting streaming capture for %s: %s", - GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, OPEN_READ, NULL, + ("Error starting streaming capture from device %s: %s", + GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno))); return FALSE; } @@ -353,8 +356,9 @@ gst_v4l2src_capture_stop (GstV4l2Src *v4l2src) /* we actually need to sync on all queued buffers but not * on the non-queued ones */ if (ioctl(GST_V4L2ELEMENT(v4l2src)->video_fd, VIDIOC_STREAMOFF, &type) < 0) { - gst_element_error (GST_ELEMENT(v4l2src), "Error stopping streaming capture for %s: %s", - GST_V4L2ELEMENT(v4l2src)->device, g_strerror(errno)); + gst_element_error (v4l2src, RESOURCE, CLOSE, NULL, + ("Error stopping streaming capture from device %s: %s", + GST_V4L2ELEMENT(v4l2src)->device, g_strerror (errno))); return FALSE; } -- cgit v1.2.1