|
@@ -112,10 +112,8 @@ if __name__ == '__main__':
|
|
|
if '/callback.json' in str(obj2.key):
|
|
if '/callback.json' in str(obj2.key):
|
|
|
callback_done = True
|
|
callback_done = True
|
|
|
if '/camera.mp4' in str(obj2.key):
|
|
if '/camera.mp4' in str(obj2.key):
|
|
|
- # logging.info("存在摄像头视频: %s" % str(obj2.key))
|
|
|
|
|
camera_done = True
|
|
camera_done = True
|
|
|
if '/camera2.mp4' in str(obj2.key):
|
|
if '/camera2.mp4' in str(obj2.key):
|
|
|
- # logging.info("存在摄像头视频: %s" % str(obj2.key))
|
|
|
|
|
camera2_done = True
|
|
camera2_done = True
|
|
|
if camera_done and camera2_done:
|
|
if camera_done and camera2_done:
|
|
|
# logging.info("存在摄像头视频: %s" % str(parse_prefix_full))
|
|
# logging.info("存在摄像头视频: %s" % str(parse_prefix_full))
|
|
@@ -126,7 +124,7 @@ if __name__ == '__main__':
|
|
|
error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
|
if parse_prefix_full in error_bag_list:
|
|
if parse_prefix_full in error_bag_list:
|
|
|
continue
|
|
continue
|
|
|
-
|
|
|
|
|
|
|
+ logging.info(merged_bag_object_key,"等待处理到：",parse_prefix_full)
|
|
|
local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
|
|
local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
|
|
|
local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
|
|
local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
|
|
|
local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')
|
|
local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')
|
|
@@ -143,7 +141,6 @@ if __name__ == '__main__':
|
|
|
|
|
|
|
|
local_delete_list.append(local_merged_bag_path)
|
|
local_delete_list.append(local_merged_bag_path)
|
|
|
# 2 生成 pos_orig.csv 和 pos_hmi.csv
|
|
# 2 生成 pos_orig.csv 和 pos_hmi.csv
|
|
|
- logging.info("生成视频: %s" % str(obj1.key))
|
|
|
|
|
parse_to_mp4(local_merged_bag_path, parse_prefix_full, local_parse_dir, local_delete_list)
|
|
parse_to_mp4(local_merged_bag_path, parse_prefix_full, local_parse_dir, local_delete_list)
|
|
|
|
|
|
|
|
# 删除本地临时文件
|
|
# 删除本地临时文件
|
