From 30a00a81bc0830cbdb24b9a45eae218b4164592f Mon Sep 17 00:00:00 2001
From: ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 11 May 2007 11:24:06 +0000
Subject: cosmetics; one test per line for all isXXX(x) macros

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23296 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libswscale/swscale.c          | 64 ++++++++++++++++++++++++++++++++-----------
 libswscale/swscale_internal.h | 58 +++++++++++++++++++++++++++++----------
 2 files changed, 91 insertions(+), 31 deletions(-)

(limited to 'libswscale')

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 266177068d..583bf1781c 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -102,22 +102,54 @@ untested special converters
 #define PI 3.14159265358979323846
 #endif
 
-#define isSupportedIn(x)  ((x)==PIX_FMT_YUV420P   || (x)==PIX_FMT_YUYV422 || (x)==PIX_FMT_UYVY422 \
-                        || (x)==PIX_FMT_RGB32     || (x)==PIX_FMT_BGR24   || (x)==PIX_FMT_BGR565 || (x)==PIX_FMT_BGR555 \
-                        || (x)==PIX_FMT_BGR32     || (x)==PIX_FMT_RGB24   || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
-                        || (x)==PIX_FMT_GRAY8     || (x)==PIX_FMT_YUV410P  \
-                        || (x)==PIX_FMT_GRAY16BE  || (x)==PIX_FMT_GRAY16LE \
-                        || (x)==PIX_FMT_YUV444P   || (x)==PIX_FMT_YUV422P || (x)==PIX_FMT_YUV411P \
-                        || (x)==PIX_FMT_PAL8      || (x)==PIX_FMT_BGR8    || (x)==PIX_FMT_RGB8 \
-                        || (x)==PIX_FMT_BGR4_BYTE || (x)==PIX_FMT_RGB4_BYTE)
-#define isSupportedOut(x) ((x)==PIX_FMT_YUV420P  || (x)==PIX_FMT_YUYV422 || (x)==PIX_FMT_UYVY422 \
-                        || (x)==PIX_FMT_YUV444P  || (x)==PIX_FMT_YUV422P || (x)==PIX_FMT_YUV411P \
-                        || isRGB(x) || isBGR(x) \
-                        || (x)==PIX_FMT_NV12     || (x)==PIX_FMT_NV21 \
-                        || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE \
-                        || (x)==PIX_FMT_GRAY8    || (x)==PIX_FMT_YUV410P)
-#define isPacked(x)    ((x)==PIX_FMT_PAL8    || (x)==PIX_FMT_YUYV422 || \
-                        (x)==PIX_FMT_UYVY422 || isRGB(x) || isBGR(x))
+#define isSupportedIn(x)    (       \
+           (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_RGB32       \
+        || (x)==PIX_FMT_BGR24       \
+        || (x)==PIX_FMT_BGR565      \
+        || (x)==PIX_FMT_BGR555      \
+        || (x)==PIX_FMT_BGR32       \
+        || (x)==PIX_FMT_RGB24       \
+        || (x)==PIX_FMT_RGB565      \
+        || (x)==PIX_FMT_RGB555      \
+        || (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_YUV410P     \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || (x)==PIX_FMT_PAL8        \
+        || (x)==PIX_FMT_BGR8        \
+        || (x)==PIX_FMT_RGB8        \
+        || (x)==PIX_FMT_BGR4_BYTE   \
+        || (x)==PIX_FMT_RGB4_BYTE   \
+    )
+#define isSupportedOut(x)   (       \
+           (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || isRGB(x)                 \
+        || isBGR(x)                 \
+        || (x)==PIX_FMT_NV12        \
+        || (x)==PIX_FMT_NV21        \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+        || (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_YUV410P     \
+    )
+#define isPacked(x)         (       \
+           (x)==PIX_FMT_PAL8        \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || isRGB(x)                 \
+        || isBGR(x)                 \
+    )
 
 #define RGB2YUV_SHIFT 16
 #define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5))
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 5aa99e5975..2d766f4746 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -171,21 +171,49 @@ int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange,
 char *sws_format_name(int format);
 
 //FIXME replace this with something faster
-#define isPlanarYUV(x) ((x)==PIX_FMT_YUV410P  || (x)==PIX_FMT_YUV420P \
-                     || (x)==PIX_FMT_YUV411P  || (x)==PIX_FMT_YUV422P \
-                     || (x)==PIX_FMT_YUV444P  || (x)==PIX_FMT_NV12    \
-                     || (x)==PIX_FMT_NV21)
-#define isYUV(x)       ((x)==PIX_FMT_UYVY422  || (x)==PIX_FMT_YUYV422  || isPlanarYUV(x))
-#define isGray(x)      ((x)==PIX_FMT_GRAY8    || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isGray16(x)    ((x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isRGB(x)       ((x)==PIX_FMT_BGR32    || (x)==PIX_FMT_RGB24   \
-                     || (x)==PIX_FMT_RGB565   || (x)==PIX_FMT_RGB555  \
-                     || (x)==PIX_FMT_RGB8     || (x)==PIX_FMT_RGB4 || (x)==PIX_FMT_RGB4_BYTE \
-                     || (x)==PIX_FMT_MONOBLACK)
-#define isBGR(x)       ((x)==PIX_FMT_RGB32    || (x)==PIX_FMT_BGR24   \
-                     || (x)==PIX_FMT_BGR565   || (x)==PIX_FMT_BGR555  \
-                     || (x)==PIX_FMT_BGR8     || (x)==PIX_FMT_BGR4 || (x)==PIX_FMT_BGR4_BYTE \
-                     || (x)==PIX_FMT_MONOBLACK)
+#define isPlanarYUV(x)  (           \
+           (x)==PIX_FMT_YUV410P     \
+        || (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_NV12        \
+        || (x)==PIX_FMT_NV21        \
+    )
+#define isYUV(x)        (           \
+           (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_YUYV422     \
+        || isPlanarYUV(x)           \
+    )
+#define isGray(x)       (           \
+           (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isGray16(x)     (           \
+           (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isRGB(x)        (           \
+           (x)==PIX_FMT_BGR32       \
+        || (x)==PIX_FMT_RGB24       \
+        || (x)==PIX_FMT_RGB565      \
+        || (x)==PIX_FMT_RGB555      \
+        || (x)==PIX_FMT_RGB8        \
+        || (x)==PIX_FMT_RGB4        \
+        || (x)==PIX_FMT_RGB4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
+#define isBGR(x)        (           \
+           (x)==PIX_FMT_RGB32       \
+        || (x)==PIX_FMT_BGR24       \
+        || (x)==PIX_FMT_BGR565      \
+        || (x)==PIX_FMT_BGR555      \
+        || (x)==PIX_FMT_BGR8        \
+        || (x)==PIX_FMT_BGR4        \
+        || (x)==PIX_FMT_BGR4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
 
 static inline int fmt_depth(int fmt)
 {
-- 
cgit v1.2.3