xuzuoyun 3 years ago
parent
commit
c29494a9d1
2 changed files with 4 additions and 3 deletions
  1. 2 1
      main.py
  2. 2 2
      util/cos_util.py

+ 2 - 1
main.py

@@ -215,6 +215,7 @@ def videoSwap(opt):
         video_input = opt.inputVideoUrl
         image_input = opt.inputImageUrl
         base_path = '/data/swap_file_temp/'+suid+'/'
+        # base_path = './'+suid+'/'
         video_path = base_path + suid + os.path.splitext(video_input)[-1]
         image_path = base_path + suid + os.path.splitext(image_input)[-1]
         out_path = base_path + suid + 'out' + os.path.splitext(video_input)[-1]
@@ -292,7 +293,7 @@ def videoSwap(opt):
     task.status = 'uploading'
     task.output_video_md5 = output_video_md5
     update(task)
-    url = cos_upload(opt.output_path,datetime.now().strftime('%Y%m%d')+'/'+output_video_md5+'.mp4')
+    url = cos_upload(opt.output_path,'faceswap/'+datetime.now().strftime('%Y%m%d')+'/'+output_video_md5+'.mp4')
     del_file(opt.base_path)
     return {'taskId':opt.taskId,'outputUrl':url}
 

+ 2 - 2
util/cos_util.py

@@ -19,13 +19,13 @@ client = CosS3Client(config)
 def cos_upload(file_path,file_name):
     with open(file_path, 'rb') as fp:
         response = client.put_object(
-        Bucket='swapface-1301855440',
+        Bucket='media-1301855440',
         Body=fp,
         Key=file_name,
         StorageClass='STANDARD',
         EnableMD5=False
     )
-    url = 'https://swapface-1301855440.cos.ap-chongqing.myqcloud.com/'+file_name
+    url = 'https://media-1301855440.cos.ap-chongqing.myqcloud.com/'+file_name
     return url
 
 if __name__ == '__main__':