diff options
| author | Ray Essick <essick@google.com> | 2021-04-28 03:05:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 03:05:58 +0000 |
| commit | f96e852650f9b398e13029f7ce15da122551efcc (patch) | |
| tree | 0a6b6083a9160f5e5af890a0ba657440b58d84ea | |
| parent | 9a3fdcc7b7886a5d5d43f4ec716bad310d9d78da (diff) | |
| parent | 082ba204523b9fdcce147ad5edc4300980f548bf (diff) | |
| download | libhevc-f96e852650f9b398e13029f7ce15da122551efcc.tar.gz | |
Merge "encoder: Fix entropy sync mode for height <= 64" am: a5f7557e5f am: 082ba20452
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/1629485
Change-Id: I4f1cf898669cca4c209f0e3ea2932f1fb3b69e42
| -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 */ /* --------------------------------------------------------------------- */ |