diff options
author | Ray Essick <essick@google.com> | 2021-04-28 02:01:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-28 02:01:39 +0000 |
commit | a5f7557e5ffae64f103a67a04e9798581436e467 (patch) | |
tree | d5de7df34a7cbefa9b6306e944c7074d2db7c69b | |
parent | 3106948b7be3b399427f72657011b9ca00972466 (diff) | |
parent | 2c273564b9e95664ae2294e548361d1c6d165e70 (diff) | |
download | libhevc-a5f7557e5ffae64f103a67a04e9798581436e467.tar.gz |
Merge "encoder: Fix entropy sync mode for height <= 64"android-s-beta-2android-s-beta-1
-rw-r--r-- | encoder/ihevce_plugin.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/encoder/ihevce_plugin.c b/encoder/ihevce_plugin.c index df7cee0..9dbf376 100644 --- a/encoder/ihevce_plugin.c +++ b/encoder/ihevce_plugin.c @@ -735,6 +735,13 @@ IHEVCE_PLUGIN_STATUS_T ihevce_init(ihevce_static_cfg_params_t *ps_params, void * MIN(MAX_NUM_FRM_IN_GOP, ps_ctxt->ps_static_cfg_prms->s_coding_tools_prms.i4_max_i_open_gop_period); + /* entropy sync is disabled if there is only one CTB row */ + if(ps_ctxt->ps_static_cfg_prms->s_src_prms.i4_height <= + (1 << ps_ctxt->ps_static_cfg_prms->s_config_prms.i4_max_log2_cu_size)) + { + ps_ctxt->ps_static_cfg_prms->s_coding_tools_prms.i4_enable_entropy_sync = 0; + } + /* --------------------------------------------------------------------- */ /* High Level Encoder context init */ /* --------------------------------------------------------------------- */ |