backing up work

Author: akai-katto

src/config_files/output_options.yaml

@@ -7,7 +7,7 @@ realsr_ncnn_vulkan:
     -verbose: null
 
 dandere2x:
-  bleed: 2
+  bleed: 3
 
 dandere2x_cpp:
   block_matching_arg: "exhaustive"

src/dandere2x/dandere2x_service/__init__.py

@@ -20,6 +20,7 @@
 from dandere2x.dandere2x_service.dandere2x_service_context import Dandere2xServiceContext
 from dandere2x.dandere2x_service.dandere2x_service_controller import Dandere2xController
 from dandere2x.dandere2xlib.utils.dandere2x_utils import file_exists
+from dandere2x.dandere2xlib.wrappers.ffmpeg.progressive_noise_adder import ProgressiveNoiseAdder
 
 
 def _get_upscale_engine(selected_engine: UpscalingEngineType) -> Type[AbstractUpscaler]:
@@ -65,6 +66,10 @@ def __init__(self, service_request: Dandere2xServiceRequest):
         self.threads_active = False
 
         # Child-threads
+        self.progressive_noise_adder = ProgressiveNoiseAdder(self.context.input_frames_dir,
+                                                             self.context.noised_input_frames_dir,
+                                                             self.context.frame_count)
+
         self.min_disk_demon = MinDiskUsage(self.context, self.controller)
         self.status_thread = Status(self.context, self.controller)
         self.dandere2x_cpp_thread = Dandere2xCppWrapper(self.context, self.controller)
@@ -88,6 +93,8 @@ def run(self):
         self.log.info("Dandere2x Threads Set.. going live with the following context file.")
         self.context.log_all_variables()
 
+        self.progressive_noise_adder.start()
+
         self.min_disk_demon.extract_initial_frames()
         self.__upscale_first_frame()
 
@@ -101,6 +108,7 @@ def run(self):
         while self.controller.get_current_frame() < self.context.frame_count - 1:
             time.sleep(1)
 
+        self.progressive_noise_adder.join()
         self.min_disk_demon.join()
         self.dandere2x_cpp_thread.join()
         self.merge_thread.join()

src/dandere2x/dandere2x_service/core/merge.py

@@ -138,9 +138,9 @@ def run(self):
 
             # Manually write the image if we're preserving frames (this is for enthusiasts / debugging).
 
-            if True:
-                output_file = self.context.merged_dir + "merged_" + str(x + 1) + ".png"
-                current_frame.save_image(output_file)
+            # if True:
+            #     output_file = self.context.merged_dir + "merged_" + str(x + 1) + ".png"
+            #     current_frame.save_image(output_file)
 
             #######################################
             # Assign variables for next iteration #

src/dandere2x/dandere2x_service/core/min_disk_usage.py

@@ -54,7 +54,6 @@ def __init__(self, context: Dandere2xServiceContext, controller: Dandere2xContro
         self.frame_count = context.frame_count
         self.progressive_frame_extractor = ProgressiveFramesExtractorCV2(self.context.service_request.input_file,
                                                                          self.context.input_frames_dir,
-                                                                         self.context.noised_input_frames_dir,
                                                                          self.context.compressed_static_dir,
                                                                          self.context.service_request.quality_minimum)
         self.start_frame = 1
@@ -115,7 +114,7 @@ def __delete_used_files(self, remove_before):
         residual_data_dir = self.context.residual_data_dir
         fade_data_dir = self.context.fade_data_dir
         input_frames_dir = self.context.input_frames_dir
-        compressed_static_dir = self.context.compressed_static_dir
+        noised_image_dir = self.context.noised_input_frames_dir
         residual_upscaled_dir = self.context.residual_upscaled_dir
 
         # get the files to delete "_r(emove)"
@@ -126,10 +125,11 @@ def __delete_used_files(self, remove_before):
         residual_data_file_r = residual_data_dir + "residual_" + index_to_remove + ".txt"
         fade_data_file_r = fade_data_dir + "fade_" + index_to_remove + ".txt"
         input_image_r = input_frames_dir + "frame" + index_to_remove + ".png"
+        noised_image = noised_image_dir + "frame" + index_to_remove + ".png"
         upscaled_file_r = residual_upscaled_dir + "output_" + get_lexicon_value(6, int(remove_before)) + ".png"
 
-        # "mark" them
-        remove = [prediction_data_file_r, residual_data_file_r,
+        # "mark" them-------
+        remove = [prediction_data_file_r, residual_data_file_r, noised_image,
                   fade_data_file_r, input_image_r,  upscaled_file_r]
 
         # remove

src/dandere2x/dandere2xlib/wrappers/cv2/progressive_frame_extractor.py

@@ -14,13 +14,11 @@ class ProgressiveFramesExtractorCV2:
     def __init__(self,
                  input_video: str,
                  extracted_frames_dir: str,
-                 noised_frames_dir: str,
                  compressed_frames_dir: str,
                  compressed_quality: int):
 
         self.input_video = input_video
         self.extracted_frames_dir = extracted_frames_dir
-        self.noised_frames_dir = noised_frames_dir
         self.compressed_frames_dir = compressed_frames_dir
 
         self.compressed_quality = compressed_quality
@@ -58,14 +56,10 @@ def next_frame(self):
         if success:
             temp_image = self.extracted_frames_dir + "frame_temp_%s.png" % self.count
             final_image = self.extracted_frames_dir + "frame%s.png" % self.count
-            noised_final_image = self.noised_frames_dir + "frame%s.png" % self.count
 
             cv2.imwrite(temp_image, image)
 
             rename_file_wait(temp_image,
                              final_image)
 
-            apply_noise_to_image(ffmpeg_dir=self.ffmpeg_path,
-                                 input_image=final_image,
-                                 output_file=noised_final_image)
             self.count += 1

src/dandere2x/dandere2xlib/wrappers/ffmpeg/progressive_noise_adder.py

@@ -0,0 +1,37 @@
+import threading
+
+import cv2
+
+from dandere2x.dandere2xlib.utils.dandere2x_utils import rename_file_wait, wait_on_file
+from dandere2x.dandere2xlib.utils.yaml_utils import load_executable_paths_yaml
+from dandere2x.dandere2xlib.wrappers.ffmpeg.ffmpeg import apply_noise_to_image
+
+
+class ProgressiveNoiseAdder(threading.Thread):
+
+    def __init__(self, extracted_frames_dir: str, noised_frames_dir: str, frame_count):
+
+        super().__init__()
+        self.extracted_frames_dir = extracted_frames_dir
+        self.noised_frames_dir = noised_frames_dir
+
+        self.ffmpeg_path = load_executable_paths_yaml()['ffmpeg']
+
+        self.frame_count = frame_count
+
+    def join(self, timeout=None):
+        threading.Thread.join(self, timeout)
+
+    def run(self):
+
+        for count in range(1, self.frame_count + 1):
+            extracted_image = self.extracted_frames_dir + "frame%s.png" % count
+            noise_extracted_image_temp = self.noised_frames_dir + "temp%s.png" % count
+            noise_extracted_image = self.noised_frames_dir + "frame%s.png" % count
+
+            wait_on_file(extracted_image)
+            apply_noise_to_image(ffmpeg_dir=self.ffmpeg_path,
+                                 input_image=extracted_image,
+                                 output_file=noise_extracted_image_temp)
+
+            rename_file_wait(noise_extracted_image_temp,noise_extracted_image)