From e4fe63849a80b5c3f472f15e5b0b6347c159b3f9 Mon Sep 17 00:00:00 2001
From: Elian Dib <elian.dib@inria.fr>
Date: Fri, 8 Nov 2019 16:25:50 +0100
Subject: [PATCH] Reorganized output, removed ssim_all
---
qualityMetrics.m | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/qualityMetrics.m b/qualityMetrics.m
index b44a455..4ed4fe9 100644
--- a/qualityMetrics.m
+++ b/qualityMetrics.m
@@ -1,44 +1,43 @@
function [...
- psnr_yuv_view,ssim_yuv_view,psnr_yuv_mean,ssim_yuv_mean,psnr_yuv_all,ssim_yuv_all,...
- psnr_y_view ,ssim_y_view ,psnr_y_mean ,ssim_y_mean ,psnr_y_all ,ssim_y_all ,...
- psnr_u_view ,ssim_u_view ,psnr_u_mean ,ssim_u_mean ,psnr_u_all ,ssim_u_all ,...
- psnr_v_view ,ssim_v_view ,psnr_v_mean ,ssim_v_mean ,psnr_v_all ,ssim_v_all...
- ] = qualityMetrics(LFRec,LFRef)
+ psnr_y_view ,psnr_y_mean ,psnr_y_all ,ssim_y_view ,ssim_y_mean ,...
+ psnr_yuv_view,psnr_yuv_mean,psnr_yuv_all,ssim_yuv_view,ssim_yuv_mean,...
+ psnr_u_view ,psnr_u_mean ,psnr_u_all ,ssim_u_view ,ssim_u_mean ,...
+ psnr_v_view ,psnr_v_mean ,psnr_v_all ,ssim_v_view ,ssim_v_mean ...
+ ] = qualityMetrics(LFRec,LFRef,varargin)
%QUALITYMETRICS Summary of this function goes here
% Detailed explanation goes here
LFRecSlices = LF.toSlices(LFRec);
LFRefSlices = LF.toSlices(LFRef);
-[psnr_y_view,ssim_y_view,psnr_yuv_view,ssim_yuv_view,...
- psnr_u_view,ssim_u_view,psnr_v_view,ssim_v_view] = ...
- cellfun(@utils.qualityMetrics,LFRecSlices,LFRefSlices);
+[psnr_y_view,psnr_yuv_view,psnr_u_view,psnr_v_view,...
+ ssim_y_view,ssim_yuv_view,ssim_u_view,ssim_v_view] = ...
+ cellfun(@(rec,ref) utils.qualityMetrics(rec,ref,varargin{:}),LFRecSlices,LFRefSlices);
-psnr_yuv_view = psnr_yuv_view(:)';
psnr_y_view = psnr_y_view(:)';
+psnr_yuv_view = psnr_yuv_view(:)';
psnr_u_view = psnr_u_view(:)';
psnr_v_view = psnr_v_view(:)';
-ssim_yuv_view = ssim_yuv_view(:)';
ssim_y_view = ssim_y_view(:)';
+ssim_yuv_view = ssim_yuv_view(:)';
ssim_u_view = ssim_u_view(:)';
ssim_v_view = ssim_v_view(:)';
-psnr_yuv_mean = mean(psnr_yuv_view);
psnr_y_mean = mean(psnr_y_view);
+psnr_yuv_mean = mean(psnr_yuv_view);
psnr_u_mean = mean(psnr_u_view);
psnr_v_mean = mean(psnr_v_view);
-ssim_yuv_mean = mean(ssim_yuv_view);
ssim_y_mean = mean(ssim_y_view);
+ssim_yuv_mean = mean(ssim_yuv_view);
ssim_u_mean = mean(ssim_u_view);
ssim_v_mean = mean(ssim_v_view);
LFRecSlices = cell2mat(LFRecSlices);
LFRefSlices = cell2mat(LFRefSlices);
-[psnr_y_all,ssim_y_all,psnr_yuv_all,ssim_yuv_all,...
- psnr_u_all,ssim_u_all,psnr_v_all,ssim_v_all] = ...
- utils.qualityMetrics(LFRecSlices,LFRefSlices);
+[psnr_y_all,psnr_yuv_all,psnr_u_all,psnr_v_all] = ...
+ utils.qualityMetrics(LFRecSlices,LFRefSlices,varargin{:});
end
\ No newline at end of file
--
GitLab