Merge pull request #48 from gumgum/fixing_FrameDrawer

input image, proper image dumped
gumgum · Feb 12, 2020 · d532a40 · d532a40
2 parents 41ab617 + 12228ac
commit d532a40
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/multivitamin/applications/images/frame_drawer.py b/multivitamin/applications/images/frame_drawer.py
@@ -141,7 +141,7 @@ def process_properties(self,
                 server=self.name,
                 ver=self.version,
                 value=local_vid_path,
-                property_type="dumped_video_local",
+                property_type="dumped_video",
                 property_id=4,
             )
             props.append(p)
@@ -152,7 +152,7 @@ def process_properties(self,
                 server=self.name,
                 ver=self.version,
                 value=path,
-                property_type="dumped_image_local",
+                property_type="dumped_image",
                 property_id=3,
             ) for path in local_frames_paths]
             props.extend(ps)
@@ -163,7 +163,7 @@ def process_properties(self,
                 server=self.name,
                 ver=self.version,
                 value=s3_vid_url,
-                property_type="dumped_video_remote",
+                property_type="dumped_video",
                 property_id=2,
             )
             props.append(p)
@@ -174,7 +174,7 @@ def process_properties(self,
                 server=self.name,
                 ver=self.version,
                 value=url,
-                property_type="dumped_image_remote",
+                property_type="dumped_image",
                 property_id=1,
             ) for url in s3_frames_urls]
             props.extend(ps)
@@ -199,7 +199,7 @@ def copy_video(self, video_file_path):
         shutil.copyfile(video_file_path, target_filepath)
         return target_filepath
 
-    def copy_images(self, image_directory):
+    def copy_frames(self, image_directory):
         assert(os.path.isdir(image_directory))
 
         media_id = self.create_media_id()
@@ -354,7 +354,7 @@ def dump_data(self,
                 vid.write(img)
 
             if dump_images:
-                cv2.imwrite(f"{tstamp}.jpeg", img)
+                cv2.imwrite(f"{image_dir.name}/{tstamp}.jpeg", img)
 
         vid.release()
         return vid_file, image_dir, tstamp