[MPlayer-cvslog] r30140 - in trunk: codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/mp_image.h m_option.c

[reimar]

Author: reimar
Date: Wed Dec 30 13:03:17 2009
New Revision: 30140

Log:
Add support for 440p colorspace.

Modified:
   trunk/codec-cfg.c
   trunk/fmt-conversion.c
   trunk/libmpcodecs/img_format.c
   trunk/libmpcodecs/img_format.h
   trunk/libmpcodecs/mp_image.h
   trunk/m_option.c

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/codec-cfg.c	Wed Dec 30 13:03:17 2009	(r30140)
@@ -155,6 +155,7 @@ static int add_to_format(char *s, char *
 		{"444P",  IMGFMT_444P},
 		{"422P",  IMGFMT_422P},
 		{"411P",  IMGFMT_411P},
+		{"440P",  IMGFMT_440P},
 		{"Y800",  IMGFMT_Y800},
 		{"Y8",    IMGFMT_Y8},
 

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/fmt-conversion.c	Wed Dec 30 13:03:17 2009	(r30140)
@@ -58,6 +58,7 @@ static const struct {
     {IMGFMT_411P,  PIX_FMT_YUV411P},
     {IMGFMT_422P,  PIX_FMT_YUV422P},
     {IMGFMT_444P,  PIX_FMT_YUV444P},
+    {IMGFMT_440P,  PIX_FMT_YUV440P},
 
     // YUVJ are YUV formats that use the full Y range and not just
     // 16 - 235 (see colorspaces.txt).
@@ -65,6 +66,7 @@ static const struct {
     {IMGFMT_YV12,  PIX_FMT_YUVJ420P},
     {IMGFMT_422P,  PIX_FMT_YUVJ422P},
     {IMGFMT_444P,  PIX_FMT_YUVJ444P},
+    {IMGFMT_440P,  PIX_FMT_YUVJ440P},
 
     {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC},
     {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT},

Modified: trunk/libmpcodecs/img_format.c
==============================================================================
--- trunk/libmpcodecs/img_format.c	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/libmpcodecs/img_format.c	Wed Dec 30 13:03:17 2009	(r30140)
@@ -108,6 +108,10 @@ int mp_get_chroma_shift(int format, int 
         xs = 2;
         ys = 0;
         break;
+    case IMGFMT_440P:
+        xs = 0;
+        ys = 1;
+        break;
     default:
         err = 1;
         break;

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/libmpcodecs/img_format.h	Wed Dec 30 13:03:17 2009	(r30140)
@@ -71,6 +71,7 @@
 #define IMGFMT_444P 0x50343434
 #define IMGFMT_422P 0x50323234
 #define IMGFMT_411P 0x50313134
+#define IMGFMT_440P 0x50303434
 #define IMGFMT_HM12 0x32314D48
 
 /* Packed YUV Formats */

Modified: trunk/libmpcodecs/mp_image.h
==============================================================================
--- trunk/libmpcodecs/mp_image.h	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/libmpcodecs/mp_image.h	Wed Dec 30 13:03:17 2009	(r30140)
@@ -151,6 +151,7 @@ static inline void mp_image_setfmt(mp_im
     case IMGFMT_444P:
     case IMGFMT_422P:
     case IMGFMT_411P:
+    case IMGFMT_440P:
 	return;
     case IMGFMT_Y800:
     case IMGFMT_Y8:

Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	Wed Dec 30 12:32:24 2009	(r30139)
+++ trunk/m_option.c	Wed Dec 30 13:03:17 2009	(r30140)
@@ -1035,6 +1035,7 @@ static struct {
   {"444p", IMGFMT_444P},
   {"422p", IMGFMT_422P},
   {"411p", IMGFMT_411P},
+  {"440p", IMGFMT_440P},
   {"yuy2", IMGFMT_YUY2},
   {"uyvy", IMGFMT_UYVY},
   {"yvu9", IMGFMT_YVU9},