Mercurial > mplayer.hg

changeset 30129:a8283bcc8d2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify getSubSampleFactors(), make it use the values provided by av_pix_fmt_descriptors().
author stefano
date Sun, 03 Jan 2010 00:09:24 +0000
parents fe2645bad519
children 0d34fd3b0db8
files libswscale/swscale.c
diffstat 1 files changed, 2 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Sat Jan 02 20:45:27 2010 +0000
+++ b/libswscale/swscale.c	Sun Jan 03 00:09:24 2010 +0000
@@ -2280,53 +2280,8 @@
 
 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)