修改faster-rcnn黑盒水印检测流程，修改水印检测工具类名

watermark_verify/process/faster-rcnn_pytorch_blackbox_process.py

@@ -100,8 +100,8 @@ def detect_watermark(results, watermark_box, threshold=0.5):
     # 解析输出结果
     if len(results[0]) == 0:
         return False
-    top_label = np.array(results[0][:, 4], dtype='int32')
-    top_conf = results[0][:, 5]
+    top_label = np.array(results[0][:, 5], dtype='int32')
+    top_conf = results[0][:, 4]
     top_boxes = results[0][:, :4]
     for box, score, cls in zip(top_boxes, top_conf, top_label):
         wm_box_coords = watermark_box[:4]

watermark_verify/process/ssd_pytorch_blackbox_process.py

@@ -12,9 +12,9 @@ from watermark_verify.tools import parse_qrcode_label_file
 from watermark_verify.tools.evaluate_tool import calculate_ciou
 
 
-class DetectionProcess(BlackBoxWatermarkProcessDefine):
+class ModelWatermarkProcessor(BlackBoxWatermarkProcessDefine):
     def __init__(self, model_filename):
-        super(DetectionProcess, self).__init__(model_filename)
+        super(ModelWatermarkProcessor, self).__init__(model_filename)
 
     def process(self) -> bool:
         # 获取权重文件，使用触发集进行模型推理, 将推理结果与触发集预先二维码保存位置进行比对，在误差范围内则进行下一步，否则返回False

watermark_verify/process/ssd_pytorch_whitebox_process.py

@@ -4,9 +4,9 @@ ssd基于pytorch框架的白盒水印处理验证流程
 from watermark_verify.process.general_process_define import WhiteBoxWatermarkProcessDefine
 
 
-class DetectionProcess(WhiteBoxWatermarkProcessDefine):
+class ModelWatermarkProcessor(WhiteBoxWatermarkProcessDefine):
     def __init__(self, model_filename):
-        super(DetectionProcess, self).__init__(model_filename)
+        super(ModelWatermarkProcessor, self).__init__(model_filename)
 
     def process(self) -> bool:
         """

watermark_verify/process/yolox_pytorch_blackbox_process.py

@@ -9,9 +9,9 @@ from watermark_verify.tools import parse_qrcode_label_file
 from watermark_verify.tools.evaluate_tool import calculate_ciou
 
 
-class DetectionProcess(BlackBoxWatermarkProcessDefine):
+class ModelWatermarkProcessor(BlackBoxWatermarkProcessDefine):
     def __init__(self, model_filename):
-        super(DetectionProcess, self).__init__(model_filename)
+        super(ModelWatermarkProcessor, self).__init__(model_filename)
 
     def process(self) -> bool:
         """

watermark_verify/process/yolox_pytorch_whitebox_process.py

@@ -4,9 +4,9 @@ yolox基于pytorch框架的白盒水印处理验证流程
 from watermark_verify.process.general_process_define import WhiteBoxWatermarkProcessDefine
 
 
-class DetectionProcess(WhiteBoxWatermarkProcessDefine):
+class ModelWatermarkProcessor(WhiteBoxWatermarkProcessDefine):
     def __init__(self, model_filename):
-        super(DetectionProcess, self).__init__(model_filename)
+        super(ModelWatermarkProcessor, self).__init__(model_filename)
 
     def process(self) -> bool:
         """