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

avcenc: Fix PSNR computation for 420 semi-planar output in test am: 29393d25cd

Browse source 
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/200630

Change-Id: I2a411057dd0145ea1c8ce9590986d903931d9c09
This commit is contained in:
Harish Mahendrakar 2020-11-14 03:13:45 +00:00 • committed by Automerger Merge Worker
commit 389e9708cc
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/encoder/psnr.c
View file

@ -111,13 +111,13 @@ void compute_psnr(app_ctxt_t *ps_app_ctxt, iv_raw_buf_t *ps_buf1, iv_raw_buf_t *
pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[comp]; pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[comp];
wd = ps_buf1->au4_wd[comp]; wd = ps_buf1->au4_wd[comp];
ht = ps_buf1->au4_ht[comp]; ht = ps_buf1->au4_ht[comp];
strd1 = ps_buf1->au4_strd[comp]; strd1 = ps_buf1->au4_strd[comp] - ps_buf1->au4_wd[comp];
strd2 = ps_buf2->au4_strd[comp]; strd2 = ps_buf2->au4_strd[comp] - ps_buf2->au4_wd[comp];
incr1 = 1; incr1 = 1;
incr2 = 1; incr2 = 1;
if((IV_YUV_420SP_UV == ps_buf1->e_color_fmt) if((IV_YUV_420SP_UV == ps_buf1->e_color_fmt)
|| (IV_YUV_420SP_UV == ps_buf1->e_color_fmt)) || (IV_YUV_420SP_VU == ps_buf1->e_color_fmt))
{ {
switch(comp) switch(comp)
{ {
@ -130,6 +130,8 @@ void compute_psnr(app_ctxt_t *ps_app_ctxt, iv_raw_buf_t *ps_buf1, iv_raw_buf_t *
else else
pu1_buf1 = (UWORD8 *)ps_buf1->apv_bufs[1] + 1; pu1_buf1 = (UWORD8 *)ps_buf1->apv_bufs[1] + 1;
incr1 = 2; incr1 = 2;
wd = ps_buf1->au4_wd[0] >> 1;
ht = ps_buf1->au4_ht[0] >> 1;
break; break;
case 2: case 2:
if(IV_YUV_420SP_UV == ps_buf1->e_color_fmt) if(IV_YUV_420SP_UV == ps_buf1->e_color_fmt)
@ -137,11 +139,14 @@ void compute_psnr(app_ctxt_t *ps_app_ctxt, iv_raw_buf_t *ps_buf1, iv_raw_buf_t *
else else
pu1_buf1 = ps_buf1->apv_bufs[1]; pu1_buf1 = ps_buf1->apv_bufs[1];
incr1 = 2; incr1 = 2;
wd = ps_buf1->au4_wd[0] >> 1;
ht = ps_buf1->au4_ht[0] >> 1;
strd1 = ps_buf1->au4_strd[1] - ps_buf1->au4_wd[1];
break; break;
} }
} }
if ((IV_YUV_420SP_UV == ps_buf2->e_color_fmt) if ((IV_YUV_420SP_UV == ps_buf2->e_color_fmt)
|| (IV_YUV_420SP_UV == ps_buf2->e_color_fmt)) || (IV_YUV_420SP_VU == ps_buf2->e_color_fmt))
{ {
switch(comp) switch(comp)
{ {
@ -153,14 +158,21 @@ void compute_psnr(app_ctxt_t *ps_app_ctxt, iv_raw_buf_t *ps_buf1, iv_raw_buf_t *
pu1_buf2 = ps_buf2->apv_bufs[1]; pu1_buf2 = ps_buf2->apv_bufs[1];
else else
pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[1] + 1; pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[1] + 1;
incr1 = 2; incr2 = 2;
wd = ps_buf2->au4_wd[0] >> 1;
ht = ps_buf2->au4_ht[0] >> 1;
break; break;
case 2: case 2:
if(IV_YUV_420SP_UV == ps_buf2->e_color_fmt) if(IV_YUV_420SP_UV == ps_buf2->e_color_fmt)
pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[1] + 1; pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[1] + 1;
else else
pu1_buf2 = ps_buf2->apv_bufs[1]; pu1_buf2 = ps_buf2->apv_bufs[1];
incr1 = 2; incr2 = 2;
wd = ps_buf2->au4_wd[0] >> 1;
ht = ps_buf2->au4_ht[0] >> 1;
strd2 = ps_buf2->au4_strd[1] - ps_buf2->au4_wd[1];
break; break;
} }
} }
@ -175,8 +187,8 @@ void compute_psnr(app_ctxt_t *ps_app_ctxt, iv_raw_buf_t *ps_buf1, iv_raw_buf_t *
pu1_buf2 += incr2; pu1_buf2 += incr2;
df_psnr[comp] += diff * diff; df_psnr[comp] += diff * diff;
} }
pu1_buf1 += strd1 - ps_buf1->au4_wd[comp]; pu1_buf1 += strd1;
pu1_buf2 += strd2 - ps_buf2->au4_wd[comp]; pu1_buf2 += strd2;
} }
df_psnr[comp] /= (wd * ht); df_psnr[comp] /= (wd * ht);
if(df_psnr[comp]) if(df_psnr[comp])