diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-10-02 07:56:23 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-10-02 09:24:21 -0700 |
| commit | d32a0c29a2f6a03f05816d142e1440ba9348935d (patch) | |
| tree | 7fbde0d528e27fe3a7277f96dbfbe33e99ecaa82 /vp9 | |
| parent | 439bd095c6c1b6aa107326c34b9b1c6afff2a7bf (diff) | |
| download | libvpx-d32a0c29a2f6a03f05816d142e1440ba9348935d.tar libvpx-d32a0c29a2f6a03f05816d142e1440ba9348935d.tar.gz libvpx-d32a0c29a2f6a03f05816d142e1440ba9348935d.tar.bz2 libvpx-d32a0c29a2f6a03f05816d142e1440ba9348935d.zip | |
Adds some missing I440 checks
Change-Id: I034b73bb27e8023733aae63e6f8565f0a64c7267
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 473166cb7..041ba27da 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -303,16 +303,18 @@ static vpx_codec_err_t validate_img(vpx_codec_alg_priv_t *ctx, 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 @@ static int get_image_bps(const vpx_image_t *img) { 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; |