Merge "Add psnr/ssim tuning option"