shithub: libvpx

Download patch

ref: 6a0976dc3cdef7886bcd7523a8b7262bf07c4577
parent: a50c8bbaf5116bf202813a2f3f563734503af187
parent: d32a0c29a2f6a03f05816d142e1440ba9348935d
author: Deb Mukherjee <[email protected]>
date: Thu Oct 2 05:33:54 EDT 2014 

Merge "Adds some missing I440 checks"


--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -303,16 +303,18 @@
       break;
     case VPX_IMG_FMT_I422:
     case VPX_IMG_FMT_I444:
+    case VPX_IMG_FMT_I440:
       if (ctx->cfg.g_profile != (unsigned int)PROFILE_1) {
-        ERROR("Invalid image format. I422, I444 images are "
+        ERROR("Invalid image format. I422, I444, I440 images are "
               "not supported in profile.");
       }
       break;
     case VPX_IMG_FMT_I42216:
     case VPX_IMG_FMT_I44416:
+    case VPX_IMG_FMT_I44016:
       if (ctx->cfg.g_profile != (unsigned int)PROFILE_1 &&
           ctx->cfg.g_profile != (unsigned int)PROFILE_3) {
-        ERROR("Invalid image format. 16-bit I422, I444 images are "
+        ERROR("Invalid image format. 16-bit I422, I444, I440 images are "
               "not supported in profile.");
       }
       break;
@@ -334,9 +336,11 @@
     case VPX_IMG_FMT_I420: return 12;
     case VPX_IMG_FMT_I422: return 16;
     case VPX_IMG_FMT_I444: return 24;
+    case VPX_IMG_FMT_I440: return 16;
     case VPX_IMG_FMT_I42016: return 24;
     case VPX_IMG_FMT_I42216: return 32;
     case VPX_IMG_FMT_I44416: return 48;
+    case VPX_IMG_FMT_I44016: return 32;
     default: assert(0 && "Invalid image format"); break;
   }
   return 0;