merge: ~mkrufky/tda18271

From: Michael Krufky <mkrufky@kernellabs.com>

Priority: normal

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>

1 files changed, 167 insertions, 8 deletions

diff --git a/v4l2-apps/libv4l/libv4lconvert/flip.c b/v4l2-apps/libv4l/libv4lconvert/flip.c
index cd3468a89..8c4d8233c 100644
--- a/v4l2-apps/libv4l/libv4lconvert/flip.c
+++ b/v4l2-apps/libv4l/libv4lconvert/flip.c
@@ -20,10 +20,102 @@
 
 */
 
+#include <string.h>
 #include "libv4lconvert-priv.h"
 
-void v4lconvert_rotate180_rgbbgr24(const unsigned char *src, unsigned char *dst,
-  int width, int height)
+static void v4lconvert_vflip_rgbbgr24(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt)
+{
+  int y;
+
+  src += fmt->fmt.pix.height * fmt->fmt.pix.bytesperline;
+  for (y = 0; y < fmt->fmt.pix.height; y++) {
+    src -= fmt->fmt.pix.bytesperline;
+    memcpy(dest, src, fmt->fmt.pix.width * 3);
+    dest += fmt->fmt.pix.width * 3;
+  }
+}
+
+static void v4lconvert_vflip_yuv420(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt)
+{
+  int y;
+
+  /* First flip the Y plane */
+  src += fmt->fmt.pix.height * fmt->fmt.pix.bytesperline;
+  for (y = 0; y < fmt->fmt.pix.height; y++) {
+    src -= fmt->fmt.pix.bytesperline;
+    memcpy(dest, src, fmt->fmt.pix.width);
+    dest += fmt->fmt.pix.width;
+  }
+
+  /* Now flip the U plane */
+  src += fmt->fmt.pix.height * fmt->fmt.pix.bytesperline * 5 / 4;
+  for (y = 0; y < fmt->fmt.pix.height / 2; y++) {
+    src -= fmt->fmt.pix.bytesperline / 2;
+    memcpy(dest, src, fmt->fmt.pix.width / 2);
+    dest += fmt->fmt.pix.width / 2;
+  }
+
+  /* Last flip the V plane */
+  src += fmt->fmt.pix.height * fmt->fmt.pix.bytesperline / 2;
+  for (y = 0; y < fmt->fmt.pix.height / 2; y++) {
+    src -= fmt->fmt.pix.bytesperline / 2;
+    memcpy(dest, src, fmt->fmt.pix.width / 2);
+    dest += fmt->fmt.pix.width / 2;
+  }
+}
+
+static void v4lconvert_hflip_rgbbgr24(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt)
+{
+  int x, y;
+
+  for (y = 0; y < fmt->fmt.pix.height; y++) {
+    src += fmt->fmt.pix.width * 3;
+    for (x = 0; x < fmt->fmt.pix.width; x++) {
+      src -= 3;
+      dest[0] = src[0];
+      dest[1] = src[1];
+      dest[2] = src[2];
+      dest += 3;
+    }
+    src += fmt->fmt.pix.bytesperline;
+  }
+}
+
+static void v4lconvert_hflip_yuv420(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt)
+{
+  int x, y;
+
+  /* First flip the Y plane */
+  for (y = 0; y < fmt->fmt.pix.height; y++) {
+    src += fmt->fmt.pix.width;
+    for (x = 0; x < fmt->fmt.pix.width; x++)
+      *dest++ = *--src;
+    src += fmt->fmt.pix.bytesperline;
+  }
+
+  /* Now flip the U plane */
+  for (y = 0; y < fmt->fmt.pix.height / 2; y++) {
+    src += fmt->fmt.pix.width / 2;
+    for (x = 0; x < fmt->fmt.pix.width / 2; x++)
+      *dest++ = *--src;
+    src += fmt->fmt.pix.bytesperline / 2;
+  }
+
+  /* Last flip the V plane */
+  for (y = 0; y < fmt->fmt.pix.height / 2; y++) {
+    src += fmt->fmt.pix.width / 2;
+    for (x = 0; x < fmt->fmt.pix.width / 2; x++)
+      *dest++ = *--src;
+    src += fmt->fmt.pix.bytesperline / 2;
+  }
+}
+
+static void v4lconvert_rotate180_rgbbgr24(const unsigned char *src,
+  unsigned char *dst, int width, int height)
 {
   int i;
 
@@ -38,8 +130,8 @@ void v4lconvert_rotate180_rgbbgr24(const unsigned char *src, unsigned char *dst,
   }
 }
 
-void v4lconvert_rotate180_yuv420(const unsigned char *src, unsigned char *dst,
-  int width, int height)
+static void v4lconvert_rotate180_yuv420(const unsigned char *src,
+  unsigned char *dst, int width, int height)
 {
   int i;
 
@@ -59,8 +151,8 @@ void v4lconvert_rotate180_yuv420(const unsigned char *src, unsigned char *dst,
     *dst++ = *src--;
 }
 
-void v4lconvert_rotate90_rgbbgr24(const unsigned char *src, unsigned char *dst,
-  int destwidth, int destheight)
+static void v4lconvert_rotate90_rgbbgr24(const unsigned char *src,
+  unsigned char *dst, int destwidth, int destheight)
 {
   int x, y;
 #define srcwidth destheight
@@ -75,8 +167,8 @@ void v4lconvert_rotate90_rgbbgr24(const unsigned char *src, unsigned char *dst,
     }
 }
 
-void v4lconvert_rotate90_yuv420(const unsigned char *src, unsigned char *dst,
-  int destwidth, int destheight)
+static void v4lconvert_rotate90_yuv420(const unsigned char *src,
+  unsigned char *dst, int destwidth, int destheight)
 {
   int x, y;
 
@@ -105,3 +197,70 @@ void v4lconvert_rotate90_yuv420(const unsigned char *src, unsigned char *dst,
       *dst++ = src[offset];
     }
 }
+
+void v4lconvert_rotate90(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt)
+{
+  int tmp;
+
+  tmp = fmt->fmt.pix.width;
+  fmt->fmt.pix.width = fmt->fmt.pix.height;
+  fmt->fmt.pix.height = tmp;
+
+  switch (fmt->fmt.pix.pixelformat) {
+    case V4L2_PIX_FMT_RGB24:
+    case V4L2_PIX_FMT_BGR24:
+      v4lconvert_rotate90_rgbbgr24(src, dest, fmt->fmt.pix.width,
+				   fmt->fmt.pix.height);
+      break;
+    case V4L2_PIX_FMT_YUV420:
+    case V4L2_PIX_FMT_YVU420:
+      v4lconvert_rotate90_yuv420(src, dest, fmt->fmt.pix.width,
+				 fmt->fmt.pix.height);
+      break;
+  }
+}
+
+void v4lconvert_flip(unsigned char *src, unsigned char *dest,
+  struct v4l2_format *fmt, int hflip, int vflip)
+{
+  if (vflip && hflip) {
+    switch (fmt->fmt.pix.pixelformat) {
+      case V4L2_PIX_FMT_RGB24:
+      case V4L2_PIX_FMT_BGR24:
+	v4lconvert_rotate180_rgbbgr24(src, dest, fmt->fmt.pix.width,
+				      fmt->fmt.pix.height);
+	break;
+      case V4L2_PIX_FMT_YUV420:
+      case V4L2_PIX_FMT_YVU420:
+	v4lconvert_rotate180_yuv420(src, dest, fmt->fmt.pix.width,
+				    fmt->fmt.pix.height);
+	break;
+    }
+  } else if (hflip) {
+    switch (fmt->fmt.pix.pixelformat) {
+      case V4L2_PIX_FMT_RGB24:
+      case V4L2_PIX_FMT_BGR24:
+	v4lconvert_hflip_rgbbgr24(src, dest, fmt);
+	break;
+      case V4L2_PIX_FMT_YUV420:
+      case V4L2_PIX_FMT_YVU420:
+	v4lconvert_hflip_yuv420(src, dest, fmt);
+	break;
+    }
+  } else if (vflip) {
+    switch (fmt->fmt.pix.pixelformat) {
+      case V4L2_PIX_FMT_RGB24:
+      case V4L2_PIX_FMT_BGR24:
+	v4lconvert_vflip_rgbbgr24(src, dest, fmt);
+	break;
+      case V4L2_PIX_FMT_YUV420:
+      case V4L2_PIX_FMT_YVU420:
+	v4lconvert_vflip_yuv420(src, dest, fmt);
+	break;
+    }
+  }
+
+  /* Our newly written data has no padding */
+  v4lconvert_fixup_fmt(fmt);
+}