wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "avcenc: Disable intra planar evaluation in FASTEST preset" am: 62e0d0c9e2

Browse source 
am: ac209ff352

Change-Id: I5738f3efaf6aee57ff9188fedaae737e98f8c4ab
This commit is contained in:
Hangyu Kuang 2018-01-17 20:45:39 +00:00 • committed by android-build-merger
commit f7b56300bd
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
encoder/ih264e_intra_modes_eval.c
View file

@ -428,7 +428,8 @@ void ih264e_evaluate_intra16x16_modes_for_least_cost_rdoptoff(process_ctxt_t *ps
/* set valid intra modes for evaluation */ /* set valid intra modes for evaluation */
u4_valid_intra_modes = u1_valid_intra_modes[i4_ngbr_avbl]; 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); u4_valid_intra_modes &= ~(1 << PLANE_I16x16);
/* evaluate b/w HORZ_I16x16, VERT_I16x16 & DC_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 */ /* cost = distortion + lambda*rate */
i4_mb_cost_least = i4_mb_distortion_least; 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 || if (((u4_valid_intra_modes >> 3) & 1) != 0)
ps_proc->i4_slice_type == ISLICE))
{ {
/* intra prediction for PLANE mode*/ /* 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); (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]; 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); u4_valid_intra_modes &= ~(1 << PLANE_CH_I8x8);
i4_chroma_mb_distortion = INT_MAX; i4_chroma_mb_distortion = INT_MAX;