summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2011-04-17 19:18:10 +0200
committerRaúl Porcel <armin76@gentoo.org>2011-04-17 19:18:10 +0200
commit18f87cb140ef5e299af0bb6576f20fd5834f508a (patch)
treef71f34fcddf3632271f1861f0e0f56297f0a26c3 /media-plugins/gst-openmax/files
parentAdd ebuild for gst-plugins-v4l2. (diff)
downloadpandaboard-18f87cb140ef5e299af0bb6576f20fd5834f508a.tar.gz
pandaboard-18f87cb140ef5e299af0bb6576f20fd5834f508a.tar.bz2
pandaboard-18f87cb140ef5e299af0bb6576f20fd5834f508a.zip
Add 2.6.38 ebuilds
Diffstat (limited to 'media-plugins/gst-openmax/files')
-rw-r--r--media-plugins/gst-openmax/files/0001-videoenc-use-shared-buffers-on-output-port.patch27
-rw-r--r--media-plugins/gst-openmax/files/0002-Replace-deprecated-vstab-event-with-crop-event.patch64
-rw-r--r--media-plugins/gst-openmax/files/0099-temp-32k-header-dec10.patch81
-rw-r--r--media-plugins/gst-openmax/files/0099-temp-32k-header-nov10.patch82
4 files changed, 0 insertions, 254 deletions
diff --git a/media-plugins/gst-openmax/files/0001-videoenc-use-shared-buffers-on-output-port.patch b/media-plugins/gst-openmax/files/0001-videoenc-use-shared-buffers-on-output-port.patch
deleted file mode 100644
index ff10376..0000000
--- a/media-plugins/gst-openmax/files/0001-videoenc-use-shared-buffers-on-output-port.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Alejandro Gonzalez <a-gonzalez@ti.com>
-Date: Sat, 1 Jan 2000 00:03:26 +0000 (-0600)
-Subject: videoenc: Use shared buffers on output port.
-X-Git-Url: http://dev.omapzoom.org/?p=gstreamer%2Fgst-openmax.git;a=commitdiff_plain;h=0a0543a76ff2989d070693490b78625657a6c684
-
-videoenc: Use shared buffers on output port.
-
-Acked-by: Kiran Nataraju <knataraju@ti.com>
-Signed-off-by: Daniel Diaz <ddiaz@ti.com>
----
-
-diff --git a/omx/gstomx_base_videoenc.c b/omx/gstomx_base_videoenc.c
-index bdbd59b..c550e5e 100644
---- a/omx/gstomx_base_videoenc.c
-+++ b/omx/gstomx_base_videoenc.c
-@@ -332,9 +332,9 @@ type_instance_init (GTypeInstance *instance,
- omx_base->omx_setup = omx_setup;
-
- omx_base->in_port->omx_allocate = FALSE;
-- omx_base->out_port->omx_allocate = TRUE;
-+ omx_base->out_port->omx_allocate = FALSE;
- omx_base->in_port->share_buffer = TRUE;
-- omx_base->out_port->share_buffer = FALSE;
-+ omx_base->out_port->share_buffer = TRUE;
-
- gst_pad_set_setcaps_function (omx_base->sinkpad, sink_setcaps);
-
diff --git a/media-plugins/gst-openmax/files/0002-Replace-deprecated-vstab-event-with-crop-event.patch b/media-plugins/gst-openmax/files/0002-Replace-deprecated-vstab-event-with-crop-event.patch
deleted file mode 100644
index cc6bea2..0000000
--- a/media-plugins/gst-openmax/files/0002-Replace-deprecated-vstab-event-with-crop-event.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 74e364b3a4f6d64d14a56c0b527cd1530e0df917 Mon Sep 17 00:00:00 2001
-From: Rob Clark <rob@ti.com>
-Date: Fri, 24 Dec 2010 21:01:06 -0600
-Subject: [PATCH] Replace deprecated vstab event with crop event.
-
-Signed-off-by: Daniel Diaz <ddiaz@ti.com>
----
- omx/gstomx_base_videodec.c | 5 +++--
- omx/gstomx_base_videoenc.c | 4 ++--
- omx/gstomx_camera.c | 5 +++--
- 3 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/omx/gstomx_base_videodec.c b/omx/gstomx_base_videodec.c
-index dd35c8c..299a947 100644
---- a/omx/gstomx_base_videodec.c
-+++ b/omx/gstomx_base_videodec.c
-@@ -77,8 +77,9 @@ push_buffer (GstOmxBaseFilter *omx_base, GstBuffer *buf)
- if (n_offset)
- {
- gst_pad_push_event (omx_base->srcpad,
-- gst_event_new_vstab (n_offset / self->rowstride, /* top */
-- n_offset % self->rowstride)); /* left */
-+ gst_event_new_crop (n_offset / self->rowstride, /* top */
-+ n_offset % self->rowstride, /* left */
-+ -1, -1)); /* width/height: can be invalid for now */
- }
- return parent_class->push_buffer (omx_base, buf);
- }
-diff --git a/omx/gstomx_base_videoenc.c b/omx/gstomx_base_videoenc.c
-index c550e5e..a83eb3d 100644
---- a/omx/gstomx_base_videoenc.c
-+++ b/omx/gstomx_base_videoenc.c
-@@ -303,10 +303,10 @@ pad_event (GstPad *pad, GstEvent *event)
-
- switch (GST_EVENT_TYPE (event))
- {
-- case GST_EVENT_VSTAB:
-+ case GST_EVENT_CROP:
- {
- gint top, left;
-- gst_event_parse_vstab (event, &top, &left);
-+ gst_event_parse_crop (event, &top, &left, NULL, NULL);
-
- omx_base->in_port->n_offset = (self->rowstride * top) + left;
-
-diff --git a/omx/gstomx_camera.c b/omx/gstomx_camera.c
-index ca03de4..dc3130e 100644
---- a/omx/gstomx_camera.c
-+++ b/omx/gstomx_camera.c
-@@ -1509,8 +1509,9 @@ create (GstBaseSrc *gst_base,
-
- if (n_offset)
- {
-- vstab_evt = gst_event_new_vstab (n_offset / self->rowstride, /* top */
-- n_offset % self->rowstride); /* left */
-+ vstab_evt = gst_event_new_crop (n_offset / self->rowstride, /* top */
-+ n_offset % self->rowstride, /* left */
-+ -1, -1); /* width/height: we can just give invalid for now */
- gst_pad_push_event (GST_BASE_SRC (self)->srcpad,
- gst_event_ref (vstab_evt));
- }
---
-1.7.1
-
diff --git a/media-plugins/gst-openmax/files/0099-temp-32k-header-dec10.patch b/media-plugins/gst-openmax/files/0099-temp-32k-header-dec10.patch
deleted file mode 100644
index e85ad31..0000000
--- a/media-plugins/gst-openmax/files/0099-temp-32k-header-dec10.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 45d23a18eb366220992e367422b958699be55623 Mon Sep 17 00:00:00 2001
-From: Olivier Naudan <o-naudan@ti.com>
-Date: Thu, 16 Dec 2010 13:10:03 +0100
-Subject: [PATCH] Temporary patch to access OMAP 32K timer (not yet exported by the kernel)
-
----
- omx/gstomx_camera.c | 2 +-
- omx/timer-32k.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 49 insertions(+), 1 deletions(-)
- create mode 100644 omx/timer-32k.h
-
-diff --git a/omx/gstomx_camera.c b/omx/gstomx_camera.c
-index 9a33cfb..fc73422 100644
---- a/omx/gstomx_camera.c
-+++ b/omx/gstomx_camera.c
-@@ -34,7 +34,7 @@
- #include <stdint.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <linux/timer-32k.h>
-+#include "timer-32k.h"
- #include <OMX_CoreExt.h>
- #include <OMX_IndexExt.h>
-
-diff --git a/omx/timer-32k.h b/omx/timer-32k.h
-new file mode 100644
-index 0000000..98fc2dc
---- /dev/null
-+++ b/omx/timer-32k.h
-@@ -0,0 +1,48 @@
-+/*
-+ * OMAP2/3/4 timer32k driver interface
-+ *
-+ * Copyright (C) 2010 Texas Instruments, Inc
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#ifndef __LINUX_TIMER_32_H__
-+#define __LINUX_TIMER_32_H__
-+
-+#include <linux/ioctl.h>
-+#define OMAP_32K_READ _IOWR('t', 0, uint32_t)
-+#define OMAP_32K_READRAW _IOWR('t', 1, uint32_t)
-+
-+#ifndef __KERNEL__
-+
-+#include <stdint.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+
-+static inline uint32_t __omap_32k_call(int nr)
-+{
-+ static int fd;
-+ if (!fd)
-+ fd = open("/dev/timer32k", 0);
-+
-+ if (fd) {
-+ uint32_t t;
-+ if (ioctl(fd, nr, &t) >= 0)
-+ return t;
-+ }
-+ return 0;
-+}
-+static inline uint32_t omap_32k_read(void)
-+{
-+ return __omap_32k_call(OMAP_32K_READ);
-+}
-+static inline uint32_t omap_32k_readraw(void)
-+{
-+ return __omap_32k_call(OMAP_32K_READRAW);
-+}
-+#endif
-+
-+#endif /* __LINUX_TIMER_32_H__ */
-+
---
-1.7.1
-
diff --git a/media-plugins/gst-openmax/files/0099-temp-32k-header-nov10.patch b/media-plugins/gst-openmax/files/0099-temp-32k-header-nov10.patch
deleted file mode 100644
index 2851032..0000000
--- a/media-plugins/gst-openmax/files/0099-temp-32k-header-nov10.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1c2c1413e6777865c037ba3d849da69cf9342b0a Mon Sep 17 00:00:00 2001
-From: Daniel Diaz <ddiaz@ti.com>
-Date: Thu, 20 Jan 2011 16:21:18 -0600
-Subject: [PATCH] Temporary patch to access OMAP 32K timer (not yet exported by the kernel)
-
-Signed-off-by: Daniel Diaz <ddiaz@ti.com>
----
- omx/gstomx_camera.c | 2 +-
- omx/timer-32k.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 49 insertions(+), 1 deletions(-)
- create mode 100644 omx/timer-32k.h
-
-diff --git a/omx/gstomx_camera.c b/omx/gstomx_camera.c
-index 8e3983e..eb101fd 100644
---- a/omx/gstomx_camera.c
-+++ b/omx/gstomx_camera.c
-@@ -34,7 +34,7 @@
- #include <stdint.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <linux/timer-32k.h>
-+#include "timer-32k.h"
-
- /**
- * SECTION:element-omx_camerasrc
-diff --git a/omx/timer-32k.h b/omx/timer-32k.h
-new file mode 100644
-index 0000000..98fc2dc
---- /dev/null
-+++ b/omx/timer-32k.h
-@@ -0,0 +1,48 @@
-+/*
-+ * OMAP2/3/4 timer32k driver interface
-+ *
-+ * Copyright (C) 2010 Texas Instruments, Inc
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#ifndef __LINUX_TIMER_32_H__
-+#define __LINUX_TIMER_32_H__
-+
-+#include <linux/ioctl.h>
-+#define OMAP_32K_READ _IOWR('t', 0, uint32_t)
-+#define OMAP_32K_READRAW _IOWR('t', 1, uint32_t)
-+
-+#ifndef __KERNEL__
-+
-+#include <stdint.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+
-+static inline uint32_t __omap_32k_call(int nr)
-+{
-+ static int fd;
-+ if (!fd)
-+ fd = open("/dev/timer32k", 0);
-+
-+ if (fd) {
-+ uint32_t t;
-+ if (ioctl(fd, nr, &t) >= 0)
-+ return t;
-+ }
-+ return 0;
-+}
-+static inline uint32_t omap_32k_read(void)
-+{
-+ return __omap_32k_call(OMAP_32K_READ);
-+}
-+static inline uint32_t omap_32k_readraw(void)
-+{
-+ return __omap_32k_call(OMAP_32K_READRAW);
-+}
-+#endif
-+
-+#endif /* __LINUX_TIMER_32_H__ */
-+
---
-1.7.3.4
-