summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-14 18:38:50 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-14 18:38:50 +0000
commitf56e0c0ed38edbddbbbf2d55cad1ce4f8e054f5d (patch)
tree180ad50de5500f3ded97b1023dda5926041b996d
parent1991ec77e78b8c5b4a8338ae98645ba5ece529eb (diff)
parent9fa58d4db3ef176ed54af5f602970b48624be413 (diff)
downloadandroid_external_libavc-f56e0c0ed38edbddbbbf2d55cad1ce4f8e054f5d.tar.gz
android_external_libavc-f56e0c0ed38edbddbbbf2d55cad1ce4f8e054f5d.tar.bz2
android_external_libavc-f56e0c0ed38edbddbbbf2d55cad1ce4f8e054f5d.zip
[automerger] Encoder: Return error for odd resolution am: 9fa58d4db3
Change-Id: I4b71af182f1d2be051bc831dfe134b4c012048af
-rw-r--r--encoder/ih264e_api.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/encoder/ih264e_api.c b/encoder/ih264e_api.c
index 69085ab..b40be55 100644
--- a/encoder/ih264e_api.c
+++ b/encoder/ih264e_api.c
@@ -1147,6 +1147,24 @@ static IV_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle,
return (IV_FAIL);
}
+ if(ps_ip->s_ive_ip.u4_wd & 1)
+ {
+ ps_op->s_ive_op.u4_error_code |= 1
+ << IVE_UNSUPPORTEDPARAM;
+ ps_op->s_ive_op.u4_error_code |=
+ IH264E_WIDTH_NOT_SUPPORTED;
+ return (IV_FAIL);
+ }
+
+ if(ps_ip->s_ive_ip.u4_ht & 1)
+ {
+ ps_op->s_ive_op.u4_error_code |= 1
+ << IVE_UNSUPPORTEDPARAM;
+ ps_op->s_ive_op.u4_error_code |=
+ IH264E_HEIGHT_NOT_SUPPORTED;
+ return (IV_FAIL);
+ }
+
break;
}