diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-10-01 12:17:37 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-10-01 16:51:48 -0700 |
| commit | a30774c50d2b1b626b05a99dcd29aa766f0b223b (patch) | |
| tree | 37c7d40913ec6fd72079b18e5f3219f4c02d2f7d /vpxdec.c | |
| parent | 30fbf23fdae441441bf5d6b71665a1b35560fbf8 (diff) | |
| download | libvpx-a30774c50d2b1b626b05a99dcd29aa766f0b223b.tar libvpx-a30774c50d2b1b626b05a99dcd29aa766f0b223b.tar.gz libvpx-a30774c50d2b1b626b05a99dcd29aa766f0b223b.tar.bz2 libvpx-a30774c50d2b1b626b05a99dcd29aa766f0b223b.zip | |
Adds support of 440 content.
Adds enums and corresponding vpx level code.
Change-Id: Ia402d47490a4466988d7edc6b7e3e5163f20a381
Diffstat (limited to 'vpxdec.c')
| -rw-r--r-- | vpxdec.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -541,6 +541,7 @@ static void high_img_upshift(vpx_image_t *dst, vpx_image_t *src, 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 @@ static void low_img_upshift(vpx_image_t *dst, vpx_image_t *src, 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 @@ static void high_img_downshift(vpx_image_t *dst, vpx_image_t *src, 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 @@ static void low_img_downshift(vpx_image_t *dst, vpx_image_t *src, 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 @@ int main_loop(int argc, const char **argv_) { 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 @@ int main_loop(int argc, const char **argv_) { 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), |