aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRam Mohan <ram.mohan@ittiam.com>2017-11-27 17:58:58 +0530
committerRam Mohan <ram.mohan@ittiam.com>2017-12-04 12:00:56 +0530
commit91a6cefe9f48379ec99719f2268fa36c3997f64f (patch)
treebbff8f3d0a18cbb9d83805a3554a766888f0e74e
parent82fb2d30cdf3990e45611af4e9ccd4f460f9314c (diff)
downloadlibavc-91a6cefe9f48379ec99719f2268fa36c3997f64f.tar.gz
avcenc: Disable intra planar evaluation in FASTEST preset
Test: avcenc test.cfg Change-Id: I55b1b5b530925cee4c4c0d9dc1301ae9a1f63257
-rw-r--r--encoder/ih264e_intra_modes_eval.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/encoder/ih264e_intra_modes_eval.c b/encoder/ih264e_intra_modes_eval.c
index 871bdd4..3edf98f 100644
--- a/encoder/ih264e_intra_modes_eval.c
+++ b/encoder/ih264e_intra_modes_eval.c
@@ -428,7 +428,8 @@ void ih264e_evaluate_intra16x16_modes_for_least_cost_rdoptoff(process_ctxt_t *ps
/* set valid intra modes for evaluation */
u4_valid_intra_modes = u1_valid_intra_modes[i4_ngbr_avbl];
- if (ps_codec->s_cfg.u4_enc_speed_preset == IVE_FAST)
+ if (ps_codec->s_cfg.u4_enc_speed_preset == IVE_FAST ||
+ ps_codec->s_cfg.u4_enc_speed_preset == IVE_FASTEST)
u4_valid_intra_modes &= ~(1 << PLANE_I16x16);
/* evaluate b/w HORZ_I16x16, VERT_I16x16 & DC_I16x16 */
@@ -440,8 +441,7 @@ void ih264e_evaluate_intra16x16_modes_for_least_cost_rdoptoff(process_ctxt_t *ps
/* cost = distortion + lambda*rate */
i4_mb_cost_least = i4_mb_distortion_least;
- if ((( (u4_valid_intra_modes >> 3) & 1) != 0) && (ps_codec->s_cfg.u4_enc_speed_preset != IVE_FASTEST ||
- ps_proc->i4_slice_type == ISLICE))
+ if (((u4_valid_intra_modes >> 3) & 1) != 0)
{
/* intra prediction for PLANE mode*/
(ps_codec->apf_intra_pred_16_l)[PLANE_I16x16](pu1_ngbr_pels_i16, pu1_pred_mb_intra_16x16_plane, 0, i4_pred_strd, i4_ngbr_avbl);
@@ -1450,7 +1450,8 @@ void ih264e_evaluate_chroma_intra8x8_modes_for_least_cost_rdoptoff(process_ctxt_
u4_valid_intra_modes = u1_valid_intra_modes[i4_ngbr_avbl];
- if (ps_codec->s_cfg.u4_enc_speed_preset == IVE_FAST)
+ if (ps_codec->s_cfg.u4_enc_speed_preset == IVE_FAST ||
+ ps_codec->s_cfg.u4_enc_speed_preset == IVE_FASTEST)
u4_valid_intra_modes &= ~(1 << PLANE_CH_I8x8);
i4_chroma_mb_distortion = INT_MAX;