commit 8b5b7cfec4e99d3375096dd758f6b9a948a81d1d
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Sat Nov 14 04:27:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Nov 14 04:27:41 2020 +0000
tree adea66329001e9e24d325330fa8a67682d537da3
parent a2a10ae66a591d6151dd355e97f3f9414324dca9
parent a6b23407851776304dfa7e69856e1447f4c6b67a

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

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

Change-Id: Icabb0e05e3a3be1b288b7339de975697021aa4e5

test/encoder/psnr.c

diff --git a/test/encoder/psnr.c b/test/encoder/psnr.c
index d5a953c..87a03b0 100644
--- a/test/encoder/psnr.c
+++ b/test/encoder/psnr.c
@@ -111,13 +111,13 @@
         pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[comp];
         wd = ps_buf1->au4_wd[comp];
         ht = ps_buf1->au4_ht[comp];
-        strd1 = ps_buf1->au4_strd[comp];
-        strd2 = ps_buf2->au4_strd[comp];
+        strd1 = ps_buf1->au4_strd[comp] - ps_buf1->au4_wd[comp];
+        strd2 = ps_buf2->au4_strd[comp] - ps_buf2->au4_wd[comp];
         incr1 = 1;
         incr2 = 1;
 
         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)
             {
@@ -130,6 +130,8 @@
                     else
                         pu1_buf1 = (UWORD8 *)ps_buf1->apv_bufs[1] + 1;
                     incr1 = 2;
+                    wd = ps_buf1->au4_wd[0] >> 1;
+                    ht = ps_buf1->au4_ht[0] >> 1;
                     break;
                 case 2:
                     if(IV_YUV_420SP_UV == ps_buf1->e_color_fmt)
@@ -137,11 +139,14 @@
                     else
                         pu1_buf1 = ps_buf1->apv_bufs[1];
                     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;
             }
         }
         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)
             {
@@ -153,14 +158,21 @@
                         pu1_buf2 = ps_buf2->apv_bufs[1];
                     else
                         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;
                 case 2:
                     if(IV_YUV_420SP_UV == ps_buf2->e_color_fmt)
                         pu1_buf2 = (UWORD8 *)ps_buf2->apv_bufs[1] + 1;
                     else
                         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;
             }
         }
@@ -175,8 +187,8 @@
                 pu1_buf2 += incr2;
                 df_psnr[comp] += diff * diff;
             }
-            pu1_buf1 += strd1 - ps_buf1->au4_wd[comp];
-            pu1_buf2 += strd2 - ps_buf2->au4_wd[comp];
+            pu1_buf1 += strd1;
+            pu1_buf2 += strd2;
         }
         df_psnr[comp] /= (wd * ht);
         if(df_psnr[comp])