commit 471812b710583ffdb5b4bda6c7c85c893762b0f2
author Rebecca Schultz Zavin <rebecca@android.com> Tue May 15 16:49:56 2012 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Wed May 30 17:16:43 2012 -0700
tree 59efa225e09bc60df9ce62b62e0d8bed59c2ee43
parent 88cc230929f380e97a664d83299a7cf7deb45ac7

Fix camera to work with dma_buf

1. Switch camera to submig DMA_BUF buffers insetad
of userptr

2. Modify camera so that yuv buffers are now allocated
with one ion filedescriptor per plane
These file descriptors are now submitted to the camera
via v4l2 as dma_bufs

Change-Id: I31478143cb99329ab039cd7c39db8906a787cf65
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

libcamera/ExynosCamera.cpp

diff --git a/libcamera/ExynosCamera.cpp b/libcamera/ExynosCamera.cpp
index 0d74085..0485aa9 100644
--- a/libcamera/ExynosCamera.cpp
+++ b/libcamera/ExynosCamera.cpp
@@ -1262,7 +1262,7 @@
         struct v4l2_requestbuffers req;
         req.count  = 0;
         req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-        req.memory = V4L2_MEMORY_USERPTR;
+        req.memory = V4L2_MEMORY_DMABUF;
 
         if (exynos_v4l2_reqbufs(m_previewDev->fd, &req) < 0) {
             ALOGE("ERR(%s):exynos_v4l2_reqbufs() fail", __func__);
@@ -1325,7 +1325,7 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
@@ -1365,12 +1365,12 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.index    = buf->reserved.p;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
-        v4l2_buf.m.planes[i].m.userptr = (unsigned long)m_previewBuf[buf->reserved.p].virt.extP[i];
+        v4l2_buf.m.planes[i].m.fd= m_previewBuf[buf->reserved.p].fd.extFd[i];
         v4l2_buf.m.planes[i].length   = m_previewBuf[buf->reserved.p].size.extS[i];
 
         if (m_previewBuf[buf->reserved.p].size.extS[i] != 0)
@@ -1473,7 +1473,7 @@
         struct v4l2_requestbuffers req;
         req.count  = 0;
         req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-        req.memory = V4L2_MEMORY_USERPTR;
+        req.memory = V4L2_MEMORY_DMABUF;
 
         if (exynos_v4l2_reqbufs(m_videoDev->fd, &req) < 0) {
             ALOGE("ERR(%s):exynos_v4l2_reqbufs() fail", __func__);
@@ -1529,7 +1529,7 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
@@ -1580,12 +1580,12 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.index    = buf->reserved.p;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
-        v4l2_buf.m.planes[i].m.userptr = (unsigned long)m_videoBuf[buf->reserved.p].virt.extP[i];
+        v4l2_buf.m.planes[i].m.fd = (unsigned long)m_videoBuf[buf->reserved.p].fd.extFd[i];
         v4l2_buf.m.planes[i].length   = m_videoBuf[buf->reserved.p].size.extS[i];
 
         if (m_videoBuf[buf->reserved.p].size.extS[i] != 0)
@@ -1656,7 +1656,7 @@
         struct v4l2_requestbuffers req;
         req.count  = 0;
         req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-        req.memory = V4L2_MEMORY_USERPTR;
+        req.memory = V4L2_MEMORY_DMABUF;
 
         if (exynos_v4l2_reqbufs(m_pictureDev->fd, &req) < 0) {
             ALOGE("ERR(%s):exynos_v4l2_reqbufs() fail", __func__);
@@ -1712,7 +1712,7 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
@@ -1757,12 +1757,12 @@
 
     v4l2_buf.m.planes = planes;
     v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+    v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
     v4l2_buf.index    = buf->reserved.p;
     v4l2_buf.length   = 0;
 
     for (int i = 0; i < 3; i++) {
-        v4l2_buf.m.planes[i].m.userptr = (unsigned long)m_pictureBuf[buf->reserved.p].virt.extP[i];
+        v4l2_buf.m.planes[i].m.fd = (unsigned long)m_pictureBuf[buf->reserved.p].fd.extFd[i];
         v4l2_buf.m.planes[i].length   = m_pictureBuf[buf->reserved.p].size.extS[i];
 
         if (m_pictureBuf[buf->reserved.p].size.extS[i] != 0)
@@ -3399,7 +3399,8 @@
     int numOfBuf = 0;
 
     for (int i = 0; i < VIDEO_MAX_FRAME; i++) {
-        if (buf[i].virt.p != NULL || buf[i].phys.p != 0) {
+        if (buf[i].virt.p != NULL || buf[i].phys.p != 0 || 
+	    buf[i].fd.fd >= 0) {
             validBuf[i] = true;
             numOfBuf++;
         } else {
@@ -3455,7 +3456,7 @@
     struct v4l2_requestbuffers req;
     req.count  = numOfBuf;
     req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    req.memory = V4L2_MEMORY_USERPTR;
+    req.memory = V4L2_MEMORY_DMABUF;
 
     if (exynos_v4l2_reqbufs(fd, &req) < 0) {
         ALOGE("ERR(%s):exynos_v4l2_reqbufs(%d) fail", __func__, numOfBuf);
@@ -3470,12 +3471,12 @@
 
             v4l2_buf.m.planes = planes;
             v4l2_buf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-            v4l2_buf.memory   = V4L2_MEMORY_USERPTR;
+            v4l2_buf.memory   = V4L2_MEMORY_DMABUF;
             v4l2_buf.index    = buf[i].reserved.p;
             v4l2_buf.length   = 0;
 
             for (int j = 0; j < 3; j++) {
-                v4l2_buf.m.planes[j].m.userptr = (unsigned long)buf[i].virt.extP[j];
+                v4l2_buf.m.planes[j].m.fd = buf[i].fd.extFd[j];
                 v4l2_buf.m.planes[j].length   = buf[i].size.extS[j];
 
                 if (buf[i].size.extS[j] != 0)