Perform bottom right padding in codec, remove it from write and read

codec.m

@@ -63,9 +63,15 @@ if ~exist(recDir,'dir')
     mkdir(recDir);
 end
 
+% Do padding
+LFSize  = size(LFRef);
+LFSizePad = ceil(LFSize./LFParams.padding).*LFParams.padding-LFSize;
+LFSizePad(3:end) = 0;
+LFRef = padarray(LFRef,LFSizePad,'replicate','post');
+
 % Write input yuv file
 if LFParams.encode
-    [imgSize,imgRes,imgSizePad] = LF.write(LFRef,LFParams,'filename',LFParams.refFilename);
+    [imgSizePad,imgRes] = LF.write(LFRef,LFParams,'filename',LFParams.refFilename);
 end
 
 % Convert inputs for HEVC
@@ -76,7 +82,11 @@ LFHEVCParams = LF.LFtoHEVC(imgSizePad,imgRes,LFParams,HEVCParams);
 
 % Read output yuv file
 if LFParams.decode
-    LFRec = LF.read(imgSize,imgRes,LFParams,'filename',LFParams.recFilename);
+    LFRec = LF.read(imgSizePad,imgRes,LFParams,'filename',LFParams.recFilename);
 end
 
+% Undo padding
+gv = arrayfun(@(x) 1:x,LFSize,'UniformOutput',false);
+LFRec = LFRec(gv{:});
+
 end
\ No newline at end of file

pad.m

-function [LFRef,imgSizePad] = pad(LFRef,padding)
-%PAD Pad lightfield data
-%   [LFRef,LFSizePad] = pad(LFRef,blockSize)
-
-LFSize  = size(LFRef);
-imgSize = LFSize(1:3);
-imgRes  = LFSize(4:end);
-
-imgSizePad = ceil(imgSize./padding).*padding;
-imgSizePad(3) = imgSize(3);
-
-padSize     = [imgSizePad-imgSize,zeros(1,numel(imgRes))];
-padSizePre  = floor(padSize/2);
-padSizePost = padSize - padSizePre;
-
-LFRef = padarray(LFRef,padSizePre ,'replicate','pre' );
-LFRef = padarray(LFRef,padSizePost,'replicate','post');
-end
\ No newline at end of file

read.m

@@ -7,22 +7,15 @@ filename = fullfile(pwd,'sequence');
 % Create input parser scheme
 p = inputParser; p.StructExpand = true; p.KeepUnmatched = true;
 p.addParameter('filename', filename, @ischar);
-p.addParameter('padding' , 1       , @isnumeric);
 
 % Parse arguments
 p.parse(varargin{:});
 %filename = p.Results.filename;
-padding  = p.Results.padding;
 
 % Recover frames
-imgSizePad = ceil(imgSize./padding).*padding;
-imgSizePad(3) = imgSize(3);
-frames = yuv.read(imgSizePad,imgRes,varargin{:});
+frames = yuv.read(imgSize,imgRes,varargin{:});
 
 % Recover LF
 LFRec = LF.fromSlices(frames);
 
-% Undo padding
-LFRec = LF.unpad(LFRec,imgSize);
-
 end
\ No newline at end of file

unpad.m

-function LFRef = unpad(LFRef,imgSize)
-%UNPAD Remove padding from lightfield data
-%   LFRef = unpad(LFRef,LFSize)
-
-LFSizePad = size(LFRef);
-imgSizePad = LFSizePad(1:3);
-imgRes = LFSizePad(4:end);
-
-padSize     = [imgSizePad-imgSize,zeros(1,numel(imgRes))];
-padSizePre  = floor(padSize/2);
-padSizePost = padSize - padSizePre;
-
-gv = arrayfun(@(lfsizepad,pre,post) (1+pre):(lfsizepad-post),...
-    LFSizePad,padSizePre,padSizePost,'UniformOutput',false);
-
-LFRef = LFRef(gv{:});
-end
\ No newline at end of file

write.m

-function [imgSize,imgRes,imgSizePad] = write(LFRef,varargin)
+function [imgSize,imgRes] = write(LFRef,varargin)
 %WRITE Write lightfield 4D(u,v,x,y) data to yuv file
 %   [LFSize,yuvSize] = WRITE(LFRef,varargin)
 
@@ -7,24 +7,15 @@ filename = fullfile(pwd,'sequence');
 % Create input parser scheme
 p = inputParser; p.StructExpand = true; p.KeepUnmatched = true;
 p.addParameter('filename', filename, @ischar);
-p.addParameter('padding' , 1       , @isnumeric);
 
 % Parse arguments
 p.parse(varargin{:});
-filename = p.Results.filename;
-padding  = p.Results.padding;
+%filename = p.Results.filename;
 
 LFSize = size(LFRef);
 imgSize = LFSize(1:3);
 imgRes = LFSize(4:end);
 
-m = utils.getMat(filename,true);
-m.imgSize = imgSize;
-m.imgRes  = imgRes;
-
-% Do padding
-[LFRef,imgSizePad] = LF.pad(LFRef,padding);
-
 % Change 5D LF to a collection of 2D frames
 frames = LF.toSlices(LFRef);