summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer-plugins/Makefile4
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c71
2 files changed, 43 insertions, 32 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 0a674692a..afcf18b22 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,12 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.106 2008/02/23 20:56:01 marcus Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.107 2008/02/29 22:02:14 marcus Exp $
#
PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH= 3
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c
index 379f4c4b2..afbfb75e3 100644
--- a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c
+++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c
@@ -1,5 +1,5 @@
---- sys/v4l/v4lsrc_calls.c.orig 2008-02-29 16:36:45.000000000 -0500
-+++ sys/v4l/v4lsrc_calls.c 2008-02-29 16:59:19.000000000 -0500
+--- sys/v4l/v4lsrc_calls.c.orig 2008-03-13 23:13:21.000000000 -0400
++++ sys/v4l/v4lsrc_calls.c 2008-03-14 01:18:32.000000000 -0400
@@ -26,12 +26,14 @@
#include <stdlib.h>
@@ -15,7 +15,7 @@
#include "v4lsrc_calls.h"
#include <sys/time.h>
-@@ -87,6 +89,45 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls
+@@ -87,6 +89,51 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls
return FALSE;
}
@@ -23,6 +23,7 @@
+ struct video_picture vp;
+ struct video_window vw;
+
++
+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) {
+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL),
+ ("Error getting current picture info for frame (%d): %s", num, g_strerror (errno)));
@@ -45,11 +46,16 @@
+ vw.width = v4lsrc->mmap.width;
+ vw.height = v4lsrc->mmap.height;
+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) {
-+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL),
-+ ("Error setting window properties for frame (%d): %s", num, g_strerror (errno)));
-+ return FALSE;
++ vw.flags &= (0x3F00 - 1);
++ vw.flags |= 15 << 16;
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) {
++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL),
++ ("Error setting window properties for frame (%d): %s", num, g_strerror (errno)));
++ return FALSE;
++ }
+ }
+
++
+ if (read(GST_V4LELEMENT (v4lsrc)->video_fd, GST_V4LELEMENT (v4lsrc)->buffer + (1024 * 768 * 3 * num), v4lsrc->mmap.width * v4lsrc->mmap.height * 3/2) < 0) {
+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL),
+ ("Error queueing a buffer (%d): %s", num, g_strerror (errno)));
@@ -61,7 +67,7 @@
/* instruct the driver to prepare capture using buffer frame num */
v4lsrc->mmap.frame = num;
if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd,
-@@ -95,6 +136,7 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls
+@@ -95,6 +142,7 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls
("Error queueing a buffer (%d): %s", num, g_strerror (errno)));
return FALSE;
}
@@ -69,7 +75,7 @@
v4lsrc->frame_queue_state[num] = QUEUE_STATE_QUEUED;
v4lsrc->num_queued++;
-@@ -117,6 +159,10 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr
+@@ -117,6 +165,10 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr
return FALSE;
}
@@ -80,7 +86,7 @@
while (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSYNC, &num) < 0) {
/* if the sync() got interrupted, we can retry */
if (errno != EINTR) {
-@@ -126,6 +172,7 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr
+@@ -126,6 +178,7 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr
}
GST_DEBUG_OBJECT (v4lsrc, "Sync got interrupted");
}
@@ -88,7 +94,7 @@
GST_LOG_OBJECT (v4lsrc, "VIOIOCSYNC on frame %d done", num);
v4lsrc->frame_queue_state[num] = QUEUE_STATE_SYNCED;
-@@ -168,13 +215,28 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l
+@@ -168,13 +221,28 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l
GST_V4L_CHECK_OPEN (GST_V4LELEMENT (v4lsrc));
GST_V4L_CHECK_NOT_ACTIVE (GST_V4LELEMENT (v4lsrc));
@@ -120,7 +126,7 @@
}
if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) {
-@@ -205,6 +267,7 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l
+@@ -205,6 +273,7 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l
GST_V4LELEMENT (v4lsrc)->buffer = NULL;
return FALSE;
}
@@ -128,7 +134,7 @@
return TRUE;
}
-@@ -413,10 +476,14 @@ gst_v4lsrc_capture_deinit (GstV4lSrc * v
+@@ -413,10 +482,14 @@ gst_v4lsrc_capture_deinit (GstV4lSrc * v
v4lsrc->frame_queue_state = NULL;
/* unmap the buffer */
@@ -147,7 +153,7 @@
}
GST_V4LELEMENT (v4lsrc)->buffer = NULL;
-@@ -446,6 +513,7 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
+@@ -446,6 +519,7 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
/* so, we need a buffer and some more stuff */
int frame = 0;
guint8 *buffer;
@@ -155,7 +161,7 @@
struct video_mbuf vmbuf;
struct video_mmap vmmap;
-@@ -456,17 +524,17 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
+@@ -456,17 +530,17 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
/* let's start by requesting a buffer and mmap()'ing it */
if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) {
@@ -184,7 +190,7 @@
}
/* now that we have a buffer, let's try out our format */
-@@ -474,6 +542,49 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
+@@ -474,6 +548,54 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
vmmap.height = height;
vmmap.format = palette;
vmmap.frame = frame;
@@ -192,37 +198,42 @@
+ struct video_picture vp;
+ struct video_window vw;
+
-+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) {
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) {
+ GST_ERROR_OBJECT (v4lsrc,
-+ "Error getting current picture info: %s", g_strerror (errno));
++ "Error getting current window properties: %s", g_strerror (errno));
+ g_free (buffer);
+ return FALSE;
+ }
+
-+ vp.palette = palette;
-+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) {
-+ GST_ERROR_OBJECT (v4lsrc,
-+ "Error setting picture info: %s", g_strerror (errno));
-+ g_free (buffer);
-+ return FALSE;
++ vw.width = width;
++ vw.height = height;
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) {
++ vw.flags &= (0x3F00 - 1);
++ vw.flags |= 15 << 16;
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) {
++ GST_ERROR_OBJECT (v4lsrc,
++ "Error setting window properties: %s", g_strerror (errno));
++ g_free (buffer);
++ return FALSE;
++ }
+ }
+
-+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) {
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) {
+ GST_ERROR_OBJECT (v4lsrc,
-+ "Error getting current window properties: %s", g_strerror (errno));
++ "Error getting current picture info: %s", g_strerror (errno));
+ g_free (buffer);
+ return FALSE;
+ }
+
-+ vw.width = width;
-+ vw.height = height;
-+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) {
++ vp.palette = palette;
++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) {
+ GST_ERROR_OBJECT (v4lsrc,
-+ "Error setting window properties: %s", g_strerror (errno));
++ "Error setting picture info: %s", g_strerror (errno));
+ g_free (buffer);
+ return FALSE;
+ }
+
++
+ if (read (GST_V4LELEMENT (v4lsrc)->video_fd, buffer, width * height * 3/2) < 0) {
+ GST_ERROR_OBJECT (v4lsrc,
+ "Error reading into our try-out buffer: %s", g_strerror (errno));
@@ -234,7 +245,7 @@
if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) {
if (errno != EINVAL) /* our format failed! */
GST_ERROR_OBJECT (v4lsrc,
-@@ -488,7 +599,11 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
+@@ -488,7 +610,11 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls
return FALSE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 23:29:50 +0800