ils-video-record:isc录制视频注释添加

ils_common_video/isc_video/recorder.py

@@ -64,6 +64,7 @@ class StreamRecorder:
             try:
                 if pipe.set(camera_key, thread_id, nx=True, ex=100):
                     log.info('setnx:%s:ttl:100', camera_key)
+                    # 针对当前摄像头开始录制
                     ack = ProcessMessage.process(body, camera_key)
                 else:
                     log.info('camera_code[%s] processing, end.', body['camera_code'])
@@ -152,6 +153,7 @@ class ProcessMessage:
             if ProcessMessage.set_expired_time(camera_key, expired_time, thread_id):
                 # 续约成功，本次任务继续
                 mysql.update_video_info(body['db_table'], event['video_id'], status=0)
+                # 开始摄像头录制
                 ProcessMessage.recording(body, event)
             else:
                 log.info('%s, expire failed', camera_key)
@@ -180,6 +182,8 @@ class ProcessMessage:
     def recording(body, event):
         part_files_set = set()
         if event['recovered_time'] and event['recovered_time'] != event['start_time']:
+            # 如果恢复时间存在且不等于开始时间 那么说明该视频录制中断过
+            # 生成文件名称
             part_file_name = ProcessMessage.gen_file_name(
                 body['camera_code'], event['start_time'], event['recovered_time'], part_num=0)
 
@@ -239,7 +243,7 @@ class ProcessMessage:
             remark = (remark or 'start') + '+offline'
         elif record_result.get('is_completed'):
             log.info('%s: %s is completed.', event['camera_code'], record_result['file_name'])
-            status = 5  # 录制完成的视频状态为5
+            status = 5  # 录制完成的视频状态为5(还未被filter分析)
         else:
             next_retry_time = now + timedelta(minutes=10)
             retry_count += 1
@@ -327,7 +331,6 @@ class ProcessMessage:
             # 重试六次
             retry_count += 1
             complete_duration = (end_time - start_time).total_seconds()
-
             file_info, error_log = ProcessMessage.stream_record(body, playback_stream['stream_url'],
                                                                 start_time, end_time)
             if error_log:
@@ -392,8 +395,11 @@ class ProcessMessage:
         is_completed, recovered_time, retry_info = False, start_time, {}
         part_files_set = part_files_set or set()
         for playback_stream in playback_urls:
+            # (大概率情况)海康接口返回的回放视频开始时间是小于事件的开始时间，结束时间是大于事件的结束时间
+            # 如果摄像头离线，开关机时 则有可能事件的时间范围在 回放视频的区间外面
             start_time = max(start_time, playback_stream['start_time'])
             end_time = min(end_time, playback_stream['end_time'])
+            # 视频流转为视频
             recovered_time, is_completed, retry_info = ProcessMessage.stream_to_video(
                 body, playback_stream, start_time, end_time, part_files_set)
             if not is_completed:
@@ -422,7 +428,6 @@ class ProcessMessage:
 
     @staticmethod
     def stream_record(body, stream, start_time, end_time):
-
         if stream['protocol'] == 'rtsp':
             stream_url = stream['url']
         else:
@@ -432,13 +437,17 @@ class ProcessMessage:
         file_name = ProcessMessage.gen_file_name(body['camera_code'], start_time, end_time, prefix='rtmp')
         log.info('%s:stream_url: %s', body['camera_code'], stream_url)
         # TODO 出现ffmpeg进程阻塞的情况
+        # 1.开启视频的录制
         _, error_log = record_thread(stream_url, file_name, thread_name=body['camera_code'])
+        # 2.判断视频是否损坏
         video_info, video_error_log = judge_video_error(file_name)
+        # 3.裁剪视频或者删除文件
         if video_error_log:
             log.warning('file: %s, error_log: %s', file_name, video_error_log)
             video_duration = time_to_seconds(video_info['duration'])
             if video_duration > 5:
                 tmp_file_name = file_name + '.tmp.mp4'
+                # 通过ffmpeg裁剪最后5秒的视频
                 ffmpeg_prune(file_name, file_name, duration=video_duration - 5)
                 if os.path.isfile(tmp_file_name):
                     shutil.move(tmp_file_name, file_name)

ils_common_video/utils/isc_client.py

@@ -142,9 +142,11 @@ class HikVisionClient(object):
 
             start_time = dateutil.parser.parse(pre_event['beginTime'])
             end_time = dateutil.parser.parse(pre_event['endTime'])
+            # 此处有bug 理论上不能进行合并事件，会出现卡帧问题
             if len(events) > 0 \
                and start_time - events[-1]['end_time'] <= timedelta(seconds=2) \
                and events[-1]['end_time'] - events[-1]['start_time'] <= timedelta(hours=0.5):
+                # 上一个回放视频和当前回放视频时间差<=2秒 且整个回放视频在半小时内 将上一个回放视频的结束时间延伸为当前结束时间
                 events[-1]['end_time'] = end_time
             else:
                 events.append({