Move PSNR611 to the end of opsnr.stt
This will avoid breaking parsing previous borg results on the
result server.
Change-Id: Ic9d44dc66870ba1fc7a63231e261be76c03f7d23
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 059ff57..f59bd34 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3089,12 +3089,12 @@
"Bitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\tGLPsnrP\t"
"AOMSSIM\tVPSSIMP\tFASTSIM\tPSNRHVS\t"
"WstPsnr\tWstSsim\tWstFast\tWstHVS\t"
- "AVPsrnY\tAPsnrCb\tAPsnrCr\tAPsnr611");
+ "AVPsrnY\tAPsnrCb\tAPsnrCr");
snprintf(results, sizeof(results),
"%7.2f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
"%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
"%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
- "%7.3f\t%7.3f\t%7.3f\t%7.3f",
+ "%7.3f\t%7.3f\t%7.3f",
dr, cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr,
cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr, total_ssim,
total_ssim, cpi->fastssim.stat[STAT_ALL] / cpi->count,
@@ -3102,10 +3102,7 @@
cpi->worst_ssim, cpi->fastssim.worst, cpi->psnrhvs.worst,
cpi->psnr.stat[STAT_Y] / cpi->count,
cpi->psnr.stat[STAT_U] / cpi->count,
- cpi->psnr.stat[STAT_V] / cpi->count,
- (6 * cpi->psnr.stat[STAT_Y] + cpi->psnr.stat[STAT_U] +
- cpi->psnr.stat[STAT_V]) /
- (cpi->count * 8));
+ cpi->psnr.stat[STAT_V] / cpi->count);
if (cpi->b_calculate_blockiness) {
SNPRINT(headings, "\t Block\tWstBlck");
@@ -3122,9 +3119,17 @@
SNPRINT2(results, "\t%7.3f", consistency);
SNPRINT2(results, "\t%7.3f", cpi->worst_consistency);
}
- fprintf(f, "%s\t Time\tRcErr\tAbsErr\n", headings);
- fprintf(f, "%s\t%8.0f\t%7.2f\t%7.2f\n", results, total_encode_time,
- rate_err, fabs(rate_err));
+
+ SNPRINT(headings, "\t Time\tRcErr\tAbsErr");
+ SNPRINT2(results, "\t%8.0f", total_encode_time);
+ SNPRINT2(results, "\t%7.2f", rate_err);
+ SNPRINT2(results, "\t%7.2f", fabs(rate_err));
+
+ fprintf(f, "%s\tAPsnr611\n", headings);
+ fprintf(f, "%s\t%7.3f\n", results,
+ (6 * cpi->psnr.stat[STAT_Y] + cpi->psnr.stat[STAT_U] +
+ cpi->psnr.stat[STAT_V]) /
+ (cpi->count * 8));
}
fclose(f);