summaryrefslogtreecommitdiffstats
path: root/encoder
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-06-20 21:46:30 +0300
committerMarco Nelissen <marcone@google.com>2015-06-25 08:25:55 -0700
commitb5a707eee3b1d743fbf6823c81acf163745c9413 (patch)
tree005d3872c7d4477dbd711f1065bcea943aa9693d /encoder
parent205e6fe11056f892b3449aac437ff14f159149d4 (diff)
downloadandroid_external_libavc-b5a707eee3b1d743fbf6823c81acf163745c9413.tar.gz
android_external_libavc-b5a707eee3b1d743fbf6823c81acf163745c9413.tar.bz2
android_external_libavc-b5a707eee3b1d743fbf6823c81acf163745c9413.zip
Allow setting profile IV_PROFILE_MAIN
Now once that the encoder supports the main profile, allow it to be set in the IVE_CMD_CTL_SET_PROFILE_PARAMS request. The actual profile value set here is ignored in practice, but at least allow setting it to main.
Diffstat (limited to 'encoder')
-rw-r--r--encoder/ih264e_api.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/encoder/ih264e_api.c b/encoder/ih264e_api.c
index 881ea53..df8d6ec 100644
--- a/encoder/ih264e_api.c
+++ b/encoder/ih264e_api.c
@@ -1748,7 +1748,8 @@ static IV_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle,
return IV_FAIL;
}
- if (ps_ip->s_ive_ip.e_profile != IV_PROFILE_BASE)
+ if (ps_ip->s_ive_ip.e_profile != IV_PROFILE_BASE &&
+ ps_ip->s_ive_ip.e_profile != IV_PROFILE_MAIN)
{
ps_op->s_ive_op.u4_error_code |= 1
<< IVE_UNSUPPORTEDPARAM;