From 6bfb8952cf3b40d7c46d9192037f92631a6b8126 Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 14:29:53 +0800 Subject: [PATCH 1/9] modify the file path for Linux --- dataset/dataset_DINet_clip.py | 16 ++++++++++++++-- dataset/dataset_DINet_frame.py | 12 +++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dataset/dataset_DINet_clip.py b/dataset/dataset_DINet_clip.py index 7d5e8c6..66b0dec 100644 --- a/dataset/dataset_DINet_clip.py +++ b/dataset/dataset_DINet_clip.py @@ -3,6 +3,7 @@ import json import random import cv2 +import os from torch.utils.data import Dataset @@ -42,7 +43,13 @@ def __getitem__(self, index): reference_clip_list = [] for source_frame_index in range(2, 2 + 5): ## load source clip - source_image_data = cv2.imread(source_image_path_list[source_frame_index])[:, :, ::-1] + source_image_path = os.path.join(source_image_path_list[source_frame_index].replace('\\', '/').slipt('/')) # fix path error + if not os.path.exists(source_image_path): + raise FileNotFoundError(f'{source_image_path} does not exist') + source_image_data = cv2.imread(source_image_path) + if source_image_data is None: + raise IOError(f'{source_image_path} read error') + source_image_data =source_image_data[:, :, ::-1] source_image_data = cv2.resize(source_image_data, (self.img_w, self.img_h)) / 255.0 source_clip_list.append(source_image_data) source_image_mask = source_image_data.copy() @@ -62,7 +69,12 @@ def __getitem__(self, index): reference_frame_path_list = self.data_dic[video_name]['clip_data_list'][reference_anchor][ 'frame_path_list'] reference_random_index = random.sample(range(9), 1)[0] - reference_frame_path = reference_frame_path_list[reference_random_index] + reference_frame_path = os.path.join(*reference_frame_path_list[reference_random_index].replace('\\', '/').split('/')) # fix path error + if not os.path.exists(reference_frame_path): + raise FileNotFoundError(f'{reference_frame_path} does not exist') + reference_frame_path = cv2.imread(reference_frame_path) + if reference_frame_data is None: + raise IOError(f'Failed to open{reference_frame_path}') reference_frame_data = cv2.imread(reference_frame_path)[:, :, ::-1] reference_frame_data = cv2.resize(reference_frame_data, (self.img_w, self.img_h)) / 255.0 reference_frame_list.append(reference_frame_data) diff --git a/dataset/dataset_DINet_frame.py b/dataset/dataset_DINet_frame.py index 4a74e01..bd4adfb 100644 --- a/dataset/dataset_DINet_frame.py +++ b/dataset/dataset_DINet_frame.py @@ -3,6 +3,7 @@ import json import random import cv2 +import os from torch.utils.data import Dataset @@ -39,7 +40,12 @@ def __getitem__(self, index): ## load source image source_image_path_list = self.data_dic[video_name]['clip_data_list'][source_anchor]['frame_path_list'] source_random_index = random.sample(range(2, 7), 1)[0] + source_image_path = os.path.join(source_image_path_list[source_random_index].replace('\\','/').split('/')) # fix the path problem + if not os.path.exists(source_image_path): + raise FileNotFoundError(f"{source_image_path} does not") source_image_data = cv2.imread(source_image_path_list[source_random_index])[:, :, ::-1] + if source_image_data is None: + raise FileNotFoundError(f"{source_image_path} does not") source_image_data = cv2.resize(source_image_data, (self.img_w, self.img_h))/ 255.0 source_image_mask = source_image_data.copy() source_image_mask[self.radius:self.radius+self.mouth_region_size,self.radius_1_4:self.radius_1_4 +self.mouth_region_size ,:] = 0 @@ -52,8 +58,12 @@ def __getitem__(self, index): for reference_anchor in reference_anchor_list: reference_frame_path_list = self.data_dic[video_name]['clip_data_list'][reference_anchor]['frame_path_list'] reference_random_index = random.sample(range(9), 1)[0] - reference_frame_path = reference_frame_path_list[reference_random_index] + reference_frame_path = os.path.join(reference_frame_path_list[reference_random_index].replace('\\','/').split('/')) # fix the path problem + if not os.path.exists(reference_frame_path): + raise FileNotFoundError(f"{reference_frame_path} does not exsit") reference_frame_data = cv2.imread(reference_frame_path)[:, :, ::-1] + if reference_frame_data is None: + raise IOError(f"Failed to open {reference_frame_path}") reference_frame_data = cv2.resize(reference_frame_data, (self.img_w, self.img_h))/ 255.0 reference_frame_data_list.append(reference_frame_data) reference_clip_data = np.concatenate(reference_frame_data_list, 2) From 2a0663715ad14fc835c1b572ebe814a8900465ff Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 16:13:11 +0800 Subject: [PATCH 2/9] fix bugs --- dataset/dataset_DINet_frame.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_frame.py b/dataset/dataset_DINet_frame.py index bd4adfb..ba66028 100644 --- a/dataset/dataset_DINet_frame.py +++ b/dataset/dataset_DINet_frame.py @@ -40,12 +40,14 @@ def __getitem__(self, index): ## load source image source_image_path_list = self.data_dic[video_name]['clip_data_list'][source_anchor]['frame_path_list'] source_random_index = random.sample(range(2, 7), 1)[0] + ## modify the path source_image_path = os.path.join(source_image_path_list[source_random_index].replace('\\','/').split('/')) # fix the path problem if not os.path.exists(source_image_path): raise FileNotFoundError(f"{source_image_path} does not") source_image_data = cv2.imread(source_image_path_list[source_random_index])[:, :, ::-1] if source_image_data is None: raise FileNotFoundError(f"{source_image_path} does not") + source_image_data = source_image_data[:, :, ::-1] source_image_data = cv2.resize(source_image_data, (self.img_w, self.img_h))/ 255.0 source_image_mask = source_image_data.copy() source_image_mask[self.radius:self.radius+self.mouth_region_size,self.radius_1_4:self.radius_1_4 +self.mouth_region_size ,:] = 0 @@ -58,12 +60,14 @@ def __getitem__(self, index): for reference_anchor in reference_anchor_list: reference_frame_path_list = self.data_dic[video_name]['clip_data_list'][reference_anchor]['frame_path_list'] reference_random_index = random.sample(range(9), 1)[0] + ## modify the path reference_frame_path = os.path.join(reference_frame_path_list[reference_random_index].replace('\\','/').split('/')) # fix the path problem if not os.path.exists(reference_frame_path): raise FileNotFoundError(f"{reference_frame_path} does not exsit") - reference_frame_data = cv2.imread(reference_frame_path)[:, :, ::-1] + reference_frame_data = cv2.imread(reference_frame_path) if reference_frame_data is None: raise IOError(f"Failed to open {reference_frame_path}") + reference_frame_data = reference_frame_data[:, :, ::-1] reference_frame_data = cv2.resize(reference_frame_data, (self.img_w, self.img_h))/ 255.0 reference_frame_data_list.append(reference_frame_data) reference_clip_data = np.concatenate(reference_frame_data_list, 2) From c43054cf45369c9a083a4d9095e2c92ec55e16f9 Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 16:38:16 +0800 Subject: [PATCH 3/9] bug fixed --- dataset/dataset_DINet_frame.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dataset/dataset_DINet_frame.py b/dataset/dataset_DINet_frame.py index ba66028..f5bf509 100644 --- a/dataset/dataset_DINet_frame.py +++ b/dataset/dataset_DINet_frame.py @@ -18,7 +18,7 @@ def get_data(json_name,augment_num): data_dic_name_list.append(video_name) random.shuffle(data_dic_name_list) print('finish loading') - return data_dic_name_list,data_dic + return data_dic_name_list, data_dic class DINetDataset(Dataset): @@ -41,12 +41,12 @@ def __getitem__(self, index): source_image_path_list = self.data_dic[video_name]['clip_data_list'][source_anchor]['frame_path_list'] source_random_index = random.sample(range(2, 7), 1)[0] ## modify the path - source_image_path = os.path.join(source_image_path_list[source_random_index].replace('\\','/').split('/')) # fix the path problem + source_image_path = os.path.join(*source_image_path_list[source_random_index].replace('\\','/').split('/')) # fix the path problem if not os.path.exists(source_image_path): - raise FileNotFoundError(f"{source_image_path} does not") + raise FileNotFoundError(f"{source_image_path} does not exist") source_image_data = cv2.imread(source_image_path_list[source_random_index])[:, :, ::-1] if source_image_data is None: - raise FileNotFoundError(f"{source_image_path} does not") + raise IOError(f"Failed to open {source_image_path}") source_image_data = source_image_data[:, :, ::-1] source_image_data = cv2.resize(source_image_data, (self.img_w, self.img_h))/ 255.0 source_image_mask = source_image_data.copy() From 6f707f4345c2cc12c702269f39bcb42832d01dd2 Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 16:40:52 +0800 Subject: [PATCH 4/9] typo --- dataset/dataset_DINet_clip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataset/dataset_DINet_clip.py b/dataset/dataset_DINet_clip.py index 66b0dec..2c9e2ec 100644 --- a/dataset/dataset_DINet_clip.py +++ b/dataset/dataset_DINet_clip.py @@ -43,12 +43,12 @@ def __getitem__(self, index): reference_clip_list = [] for source_frame_index in range(2, 2 + 5): ## load source clip - source_image_path = os.path.join(source_image_path_list[source_frame_index].replace('\\', '/').slipt('/')) # fix path error + source_image_path = os.path.join(*source_image_path_list[source_frame_index].replace('\\', '/').slipt('/')) # fix path error if not os.path.exists(source_image_path): raise FileNotFoundError(f'{source_image_path} does not exist') source_image_data = cv2.imread(source_image_path) if source_image_data is None: - raise IOError(f'{source_image_path} read error') + raise IOError(f'Failed to open{source_image_path}') source_image_data =source_image_data[:, :, ::-1] source_image_data = cv2.resize(source_image_data, (self.img_w, self.img_h)) / 255.0 source_clip_list.append(source_image_data) From 56b8d63cd1211aa2be62609480673d2fd420010f Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 16:46:14 +0800 Subject: [PATCH 5/9] reference path error --- dataset/dataset_DINet_frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_frame.py b/dataset/dataset_DINet_frame.py index f5bf509..842d5ce 100644 --- a/dataset/dataset_DINet_frame.py +++ b/dataset/dataset_DINet_frame.py @@ -61,7 +61,7 @@ def __getitem__(self, index): reference_frame_path_list = self.data_dic[video_name]['clip_data_list'][reference_anchor]['frame_path_list'] reference_random_index = random.sample(range(9), 1)[0] ## modify the path - reference_frame_path = os.path.join(reference_frame_path_list[reference_random_index].replace('\\','/').split('/')) # fix the path problem + reference_frame_path = os.path.join(*reference_frame_path_list[reference_random_index].replace('\\','/').split('/')) # fix the path problem if not os.path.exists(reference_frame_path): raise FileNotFoundError(f"{reference_frame_path} does not exsit") reference_frame_data = cv2.imread(reference_frame_path) From 15e3ed2d2ecb64e1379521ee5b434bdcbaaebaa9 Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Mon, 17 Jul 2023 18:23:57 +0800 Subject: [PATCH 6/9] path fix --- dataset/dataset_DINet_frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_frame.py b/dataset/dataset_DINet_frame.py index 842d5ce..cabbefa 100644 --- a/dataset/dataset_DINet_frame.py +++ b/dataset/dataset_DINet_frame.py @@ -44,7 +44,7 @@ def __getitem__(self, index): source_image_path = os.path.join(*source_image_path_list[source_random_index].replace('\\','/').split('/')) # fix the path problem if not os.path.exists(source_image_path): raise FileNotFoundError(f"{source_image_path} does not exist") - source_image_data = cv2.imread(source_image_path_list[source_random_index])[:, :, ::-1] + source_image_data = cv2.imread(source_image_path) if source_image_data is None: raise IOError(f"Failed to open {source_image_path}") source_image_data = source_image_data[:, :, ::-1] From 13a700c3c696851dd5551c2205af455d59ad675a Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Tue, 18 Jul 2023 07:56:36 +0800 Subject: [PATCH 7/9] fix typo --- dataset/dataset_DINet_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_clip.py b/dataset/dataset_DINet_clip.py index 2c9e2ec..a99ec31 100644 --- a/dataset/dataset_DINet_clip.py +++ b/dataset/dataset_DINet_clip.py @@ -43,7 +43,7 @@ def __getitem__(self, index): reference_clip_list = [] for source_frame_index in range(2, 2 + 5): ## load source clip - source_image_path = os.path.join(*source_image_path_list[source_frame_index].replace('\\', '/').slipt('/')) # fix path error + source_image_path = os.path.join(*source_image_path_list[source_frame_index].replace('\\', '/').split('/')) # fix path error if not os.path.exists(source_image_path): raise FileNotFoundError(f'{source_image_path} does not exist') source_image_data = cv2.imread(source_image_path) From f5de6c7dd4c608ce933f19beeae87dc101280175 Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Tue, 18 Jul 2023 08:06:21 +0800 Subject: [PATCH 8/9] reference data error --- dataset/dataset_DINet_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_clip.py b/dataset/dataset_DINet_clip.py index a99ec31..d39f5b2 100644 --- a/dataset/dataset_DINet_clip.py +++ b/dataset/dataset_DINet_clip.py @@ -75,7 +75,7 @@ def __getitem__(self, index): reference_frame_path = cv2.imread(reference_frame_path) if reference_frame_data is None: raise IOError(f'Failed to open{reference_frame_path}') - reference_frame_data = cv2.imread(reference_frame_path)[:, :, ::-1] + reference_frame_data = reference_frame_data[:, :, ::-1] reference_frame_data = cv2.resize(reference_frame_data, (self.img_w, self.img_h)) / 255.0 reference_frame_list.append(reference_frame_data) reference_clip_list.append(np.concatenate(reference_frame_list, 2)) From 7a6320f4a7fbac6599d00d9c7e136c1c41691e8b Mon Sep 17 00:00:00 2001 From: BurashiXi Date: Tue, 18 Jul 2023 08:15:33 +0800 Subject: [PATCH 9/9] fix path typo --- dataset/dataset_DINet_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/dataset_DINet_clip.py b/dataset/dataset_DINet_clip.py index d39f5b2..e869db1 100644 --- a/dataset/dataset_DINet_clip.py +++ b/dataset/dataset_DINet_clip.py @@ -72,7 +72,7 @@ def __getitem__(self, index): reference_frame_path = os.path.join(*reference_frame_path_list[reference_random_index].replace('\\', '/').split('/')) # fix path error if not os.path.exists(reference_frame_path): raise FileNotFoundError(f'{reference_frame_path} does not exist') - reference_frame_path = cv2.imread(reference_frame_path) + reference_frame_data = cv2.imread(reference_frame_path) if reference_frame_data is None: raise IOError(f'Failed to open{reference_frame_path}') reference_frame_data = reference_frame_data[:, :, ::-1]