commit

src/python2/pjibot/camera-pjibot_guide.py

@@ -17,6 +17,8 @@ key1 = 'pjibot/'
 sleep_time = 2  # 每多少秒扫描一次
 
 error_bag_json = "/mnt/disk001/dcl_data_process/src/python2/pjibot/camera-errorBag.json"
+
+
 def parse_json_to_string_array(file_path):
     try:
         # 打开并读取JSON文件（Python 2中不支持encoding参数，需要使用codecs模块或处理文件读取后的编码）
@@ -56,6 +58,7 @@ def list_to_json_file(data, file_path):
         # 将UTF-8编码的JSON字符串写入文件
         file.write(json_data_utf8)
 
+
 def parse_to_mp4(merged_bag_file_path, parse_prefix, local_parse_dir, local_delete_list):
     try:
         local_mp4_dir1 = parse_pji_image.parse1('/ob_camera_01/color/image_raw', merged_bag_file_path,
@@ -124,7 +127,7 @@ if __name__ == '__main__':
                     error_bag_list = parse_json_to_string_array(error_bag_json)
                     if parse_prefix_full in error_bag_list:
                         continue
-                    logging.info(merged_bag_object_key,"等待处理到：",parse_prefix_full)
+                    logging.info(str(merged_bag_object_key), "等待处理到：", str(parse_prefix_full))
                     local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
                     local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
                     local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')

src/python2/pjibot/resource/parse_pji_image.py

@@ -40,39 +40,6 @@ def parsebag(f, output_dir, target_topic):
     return count
 
 
-def main():
-    input_dir = sys.argv[1]
-    # input_dir='/media/dell/BFAC-F22B/data/pujin_datareturn/pujin_robot-01_data_merge_2023-12-20-02-22-18_obstacledetection_10.bag'
-    output_dir = sys.argv[2]
-    # output_dir = '/media/dell/BFAC-F22B/data/pujin_datareturn'
-    topic = '/camera/color/image_raw'  # /camera/color/image_raw
-
-    num_count = parsebag(input_dir, output_dir, topic)
-    print("解析完成")
-
-    dirt = os.path.join(output_dir, input_dir.split('/')[-1].split('.')[0] + '_' + 'image')
-    # print(dirt)
-
-    bagtime = int(input_dir.split('/')[-1].split('.')[0].split('_')[-1])
-    hz = str(float(num_count / bagtime))
-    print(hz)
-
-    command = ['ffmpeg', '-f', 'image2', '-r', hz, '-pattern_type', 'glob', '-i'] + [dirt + '/*.jpg'] + ['-tag:v',
-                                                                                                         'avc1',
-                                                                                                         '-y'] + [
-                  dirt + '/camera.mp4']
-    p = Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    p.communicate()
-    list1 = os.listdir(dirt)
-    for i in list1:
-        if i.split('.')[-1] == 'jpg':
-            os.remove(os.path.join(dirt, i))
-
-
-if __name__ == '__main__':
-    main()
-
-
 def parse1(topic, input_bag_file, output_mp4_dir):
     input_dir = input_bag_file
     output_dir = output_mp4_dir