Output comparison (#14)

UV channel swap feature added in YUV output image saving

* automate_execution currently works on config_automate file to
generate RTL compatible results.

* added in_single_folder flag to set the structure
of the out_for_RTL folder.
If True, all input files are saved in a single folder.

* - automate_execution.py works on configs.yml now
instead of a separate config_automate.yml.
- added is_save flag in configs.yml

* - verified results by matching .npy files,
they match.
- exception added if ValueError is encountered while loading np arrays.

* - foldername(line 63) now specified by datetime obj
- added compare_output file (Inprogress)
-  made chnages to handle new foldername in rename_to_RTL in utils.py

* output of the default modules can now by saved using
is_save flag in automate_execution script.

* To test multiple modules, type of DUT changed from str to
list.

* added input_ext variable to specify raw file
extension.

* created Results folder in out_for_RTL.
This folder will save the input and output arrays to ISP piepline,
whether generted while executing isp_pipeline.py individually or
using the auatomation script.

* Added functions in utils.py to dump config file in a more readable format.

* added .gitkeep file in results

* added .gitkeep file in out_for _RTL

* verified that key: "value" and key: vlaue pair are the same
YAMLObject by setting canonical=True in yaml.dump.

* - Added function in utils.py "remove_arr_border"
- using sys.execute to reove OS dependency from automation script
- improvements in compare_output.py are in progress
    - renaming RTl files by remove_str.
    - save log file
    - remove border or onnly rows

* added is_RTL flag in sensor_info

* added remove_rows-for_RTL function in utils.

* tested remove border and remove rows function in
utils.

* Added lines to save output of the isp_pipeline.py to
a text file.

* Cleaned up file and renamed the log file according to
datetime stamp

* added swap_uv flag in automate file to
save yuv or yvu array.

---------

Co-authored-by: taimur-10xe <[email protected]>
Co-authored-by: taimur-10xe <[email protected]>

Author: marianadeem-10xe

automate_execution.py

@@ -55,7 +55,7 @@
 AE = {"isEnable": False}
 
 CSC = {"is_save": False}
-LDCI = {"isEnable": False}
+LDCI = {"isEnable": True}
 
 SHARPEN ={"isEnable": False}
 NR2D = {"isEnable": False}
@@ -76,6 +76,9 @@
 
 input_ext = ".raw"
 
+# Setting this flag to True saves yvu array
+swap_uv = True
+
 # Set this flag to True if all input files need to be saved in a single folder
 in_single_folder = True
 
@@ -97,7 +100,7 @@
     config = yaml.safe_load(file)   
 
 module_tags = list(config.keys())[2:]
-remove = ["pre_gamma", "tone_mapping", "jpeg_conversion"]
+remove = ["swap_uv_channels","pre_gamma", "tone_mapping", "jpeg_conversion"]
 [module_tags.remove(module) for module in remove]
 
 # Set is_RTl to True to indicate that automation file is being executed
@@ -120,8 +123,13 @@
         else:  
             is_save = False  
 
+        # update swap_uv flag to save yuv or yvu array
+        if module in module_tags[module_tags.index("color_space_conversion"):] and is_save:
+            config["swap_uv_channels"][str(module)] = swap_uv
+
         if module in DUT and module not in default_modules:
             assert new_params[idx]["isEnable"]==True, "DUT not enabled in this script."
+        
         utils.update_config(config, module,new_params[idx].keys(), new_params[idx].values(), is_save)  
     except IndexError:
         pass

config/configs.yml

@@ -10,6 +10,13 @@ sensor_info:
   height: 1536
   hdr: false
   is_RTL: False
+swap_uv_channels:
+  color_space_conversion: true
+  ldci: true
+  sharpen: false
+  2d_noise_reduction: false
+  scale: false
+  yuv_conversion_format: false
 crop:
   isEnable: false
   isDebug: false

isp_pipeline.py

@@ -12,7 +12,7 @@
 import numpy as np
 import yaml
 import rawpy
-
+import util.utils as util
 
 from modules.dead_pixel_correction import DeadPixelCorrection as DPC
 from modules.hdr_stitching import HdrStitching as HDRS
@@ -81,6 +81,7 @@
 parm_sha = c_yaml["sharpen"]
 parm_jpg = c_yaml["jpeg_conversion"]
 parm_yuv = c_yaml["yuv_conversion_format"]
+parm_swap = c_yaml["swap_uv_channels"]
 
 # Get the path to the inputfile
 RAW_FOLDER = "./in_frames/normal/"
@@ -311,7 +312,11 @@
 # save module output if enabled
 if parm_csc["is_save"]:
     filename = save_dir + "Out_color_space_conversion_" + inFile.split(".")[0]
-    np.save(filename, csc_img)
+    if parm_swap["color_space_conversion"]:
+        swapped_arr = util.swap_uv(csc_img)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, csc_img)
 
 # x = np.load(save_dir +"Out_color_space_conversion_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, csc_img))    
@@ -323,7 +328,11 @@
 # save module output if enabled
 if parm_ldci["is_save"]:
     filename = save_dir + "Out_ldci_" + inFile.split(".")[0]
-    np.save(filename, ldci_img)
+    if parm_swap["ldci"]:
+        swapped_arr = util.swap_uv(ldci_img)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, ldci_img)
 
 # x = np.load(save_dir +"Out_ldci_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, ldci_img))    
@@ -335,7 +344,11 @@
 # save module output if enabled
 if parm_sha["is_save"]:
     filename = save_dir + "Out_sharpen_" + inFile.split(".")[0]
-    np.save(filename, sharp_img)
+    if parm_swap["sharpen"]:
+        swapped_arr = util.swap_uv(sharp_img)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, sharp_img)
 
 # x = np.load(save_dir +"Out_sharpen_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, sharp_img))
@@ -347,7 +360,11 @@
 # save module output if enabled
 if parm_2dn["is_save"]:
     filename = save_dir + "Out_2d_noise_reduction_" + inFile.split(".")[0]
-    np.save(filename, nr2d_img)
+    if parm_swap["2d_noise_reduction"]:
+        swapped_arr = util.swap_uv(nr2d_img)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, nr2d_img)
 
 # x = np.load(save_dir +"Out_2d_noise_reduction_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, nr2d_img))    
@@ -359,7 +376,11 @@
 # save module output if enabled
 if parm_sca["is_save"]:
     filename = save_dir + "Out_scale_" + inFile.split(".")[0]
-    np.save(filename, scaled_img)
+    if parm_swap["scale"]:
+        swapped_arr = util.swap_uv(scaled_img)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, scaled_img)
 
 # x = np.load(save_dir +"Out_scale_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, scaled_img))
@@ -372,7 +393,11 @@
 # save module output if enabled
 if parm_yuv["is_save"]:
     filename = save_dir + "Out_yuv_conversion_format_" + inFile.split(".")[0]
-    np.save(filename, yuv_conv)
+    if parm_swap["yuv_conversion_format"]:
+        swapped_arr = util.swap_uv(yuv_conv)
+        np.save(filename, swapped_arr)
+    else:
+        np.save(filename, yuv_conv)
 
 # x = np.load(save_dir +"Out_yuv_conversion_format_" + inFile.split(".")[0]+".npy")
 # print(np.array_equal(x, yuv_conv))    

util/utils.py

@@ -188,7 +188,16 @@ def get_approximate(decimal, register_bits, frac_precision_bits):
     fixed_float = Fxp(decimal, False, register_bits, frac_precision_bits)
     return fixed_float(), fixed_float.bin()
 
+def swap_uv(arr):
+    """This function swaps the U and Y channels in yuv image ARR."""
+    assert len(arr.shape)==3, "Input array must be 3D."
+    
+    out_arr = np.zeros(arr.shape, arr.dtype)
+    out_arr[:, :, 0] = arr[:,:,0]
+    out_arr[:, :, 1] = arr[:,:,2]
+    out_arr[:, :, 2] = arr[:,:,1]
 
+    return out_arr
 #automation script related utilities
 def arrange_channels(arr):
     """This function changes the sequence of the chnanels in an input