[FFmpeg-cvslog] r30171 - trunk/libswscale/swscale.c

[stefano]

Author: stefano
Date: Sun Jan  3 01:09:24 2010
New Revision: 30171

Log:
Simplify getSubSampleFactors(), make it use the values provided by
av_pix_fmt_descriptors().

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jan  2 21:45:27 2010	(r30170)
+++ trunk/libswscale/swscale.c	Sun Jan  3 01:09:24 2010	(r30171)
@@ -2280,53 +2280,8 @@ static int planarCopy(SwsContext *c, uin
 
 static void getSubSampleFactors(int *h, int *v, int format)
 {
-    switch(format) {
-    case PIX_FMT_UYVY422:
-    case PIX_FMT_YUYV422:
-        *h=1;
-        *v=0;
-        break;
-    case PIX_FMT_YUV420P:
-    case PIX_FMT_YUV420P16LE:
-    case PIX_FMT_YUV420P16BE:
-    case PIX_FMT_YUVA420P:
-    case PIX_FMT_GRAY16BE:
-    case PIX_FMT_GRAY16LE:
-    case PIX_FMT_GRAY8: //FIXME remove after different subsamplings are fully implemented
-    case PIX_FMT_NV12:
-    case PIX_FMT_NV21:
-        *h=1;
-        *v=1;
-        break;
-    case PIX_FMT_YUV440P:
-        *h=0;
-        *v=1;
-        break;
-    case PIX_FMT_YUV410P:
-        *h=2;
-        *v=2;
-        break;
-    case PIX_FMT_YUV444P:
-    case PIX_FMT_YUV444P16LE:
-    case PIX_FMT_YUV444P16BE:
-        *h=0;
-        *v=0;
-        break;
-    case PIX_FMT_YUV422P:
-    case PIX_FMT_YUV422P16LE:
-    case PIX_FMT_YUV422P16BE:
-        *h=1;
-        *v=0;
-        break;
-    case PIX_FMT_YUV411P:
-        *h=2;
-        *v=0;
-        break;
-    default:
-        *h=0;
-        *v=0;
-        break;
-    }
+    *h = av_pix_fmt_descriptors[format].log2_chroma_w;
+    *v = av_pix_fmt_descriptors[format].log2_chroma_h;
 }
 
 static uint16_t roundToInt16(int64_t f)