commit a30774c50d2b1b626b05a99dcd29aa766f0b223b
author Deb Mukherjee <debargha@google.com> Wed Oct 01 12:17:37 2014 -0700
committer Deb Mukherjee <debargha@google.com> Wed Oct 01 16:51:48 2014 -0700
tree 37c7d40913ec6fd72079b18e5f3219f4c02d2f7d
parent 30fbf23fdae441441bf5d6b71665a1b35560fbf8

Adds support of 440 content.

Adds enums and corresponding vpx level code.

Change-Id: Ia402d47490a4466988d7edc6b7e3e5163f20a381

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index f5c945c..45dd041 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -541,6 +541,7 @@
     case VPX_IMG_FMT_I42016:
     case VPX_IMG_FMT_I42216:
     case VPX_IMG_FMT_I44416:
+    case VPX_IMG_FMT_I44016:
       break;
     default:
       fatal("Unsupported image conversion");
@@ -580,6 +581,7 @@
     case VPX_IMG_FMT_I420:
     case VPX_IMG_FMT_I422:
     case VPX_IMG_FMT_I444:
+    case VPX_IMG_FMT_I440:
       break;
     default:
       fatal("Unsupported image conversion");
@@ -626,6 +628,7 @@
     case VPX_IMG_FMT_I42016:
     case VPX_IMG_FMT_I42216:
     case VPX_IMG_FMT_I44416:
+    case VPX_IMG_FMT_I44016:
       break;
     default:
       fatal("Unsupported image conversion");
@@ -664,6 +667,7 @@
     case VPX_IMG_FMT_I420:
     case VPX_IMG_FMT_I422:
     case VPX_IMG_FMT_I444:
+    case VPX_IMG_FMT_I440:
       break;
     default:
       fatal("Unsupported image conversion");
@@ -941,7 +945,7 @@
   if (use_y4m && !noblit) {
     if (!single_file) {
       fprintf(stderr, "YUV4MPEG2 not supported with output patterns,"
-              " try --i420 or --yv12.\n");
+              " try --i420 or --yv12 or --rawvideo.\n");
       return EXIT_FAILURE;
     }
 
@@ -1164,6 +1168,10 @@
         if (use_y4m) {
           char buf[Y4M_BUFFER_SIZE] = {0};
           size_t len = 0;
+          if (img->fmt == VPX_IMG_FMT_I440 || img->fmt == VPX_IMG_FMT_I44016) {
+            fprintf(stderr, "Cannot produce y4m output for 440 sampling.\n");
+            goto fail;
+          }
           if (frame_out == 1) {
             // Y4M file header
             len = y4m_write_file_header(buf, sizeof(buf),