From 0137354db8770ae13a1e8651e6fb2e08e17d9eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=A8?= Date: Mon, 28 Nov 2022 17:43:34 +0800 Subject: [PATCH] update --- RAFT/analysis_video.py | 8 ++------ utils/config.py | 10 +++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/RAFT/analysis_video.py b/RAFT/analysis_video.py index 54673ca..8d58de8 100755 --- a/RAFT/analysis_video.py +++ b/RAFT/analysis_video.py @@ -64,7 +64,7 @@ def analysis_video(model, video_path, result_path, uuid_barcode, maskpath=None, if not ret:break frame_show = frame nn += 1 - if flag: #MOG2过滤为入侵画面 + if flag: #过滤为入侵画面 if nn%2==0 or nn%3==0:continue #跳帧 flag = img_filter(frame, oriimg, fgbg, nn) if flag: continue @@ -92,10 +92,9 @@ def analysis_video(model, video_path, result_path, uuid_barcode, maskpath=None, flag, nu, Result = detect(match, affd, net, result, transform, ms, search_r, nn, nu, Result) if flag: break Addimg_content(uuid_barcode, frame_show)#图片上传 - #if not Result=='03': if result is not None: coordinate = str(coordination[0])+'_'+str(coordination[1])+'_'+str(coordination[2])+'_'+str(coordination[3]) - cv2.imwrite(os.sep.join([cfg.Ocrimg, uuid_barcode+'_'+str(nu)+'_'+coordinate+'.jpg']), frame_show) #give ocr img + cv2.imwrite(os.sep.join([cfg.Ocrimg, uuid_barcode+'_'+str(nu)+'_'+coordinate+'.jpg']), frame) #give ocr img else: cv2.imwrite(os.sep.join([cfg.Ocrimg, uuid_barcode+'_'+str(nu)+'_0_0_0_0'+'.jpg']), frame_show) #give ocr img return Result @@ -111,13 +110,10 @@ def detect(match, affd, net, result, transform, ms, search_r, nn, nu, Result): Result += str(res)+',' else: Result += str(res)+',' - if rescfg.NUM_RAFT: - #Result = '02' flag = True if nn>100 and nu>2: flag = True diff --git a/utils/config.py b/utils/config.py index 0082b5a..9684154 100644 --- a/utils/config.py +++ b/utils/config.py @@ -51,9 +51,9 @@ _C.fgbgmask_old = '../module/ieemoo-ai-searchv2/model/now/ori_old.jpg' _C.URL = 'https://api.ieemoo.com/emoo-api/intelligence' #online #_C.URL = 'http://api.test.ieemoo.com/emoo-api/intelligence' -_C.Vre = 'http://api.test2.ieemoo.cn/emoo-api/intelligence/queryVideoCompareResult.do' -#_C.Vre = 'http://192.168.1.98:8088/emoo-api/intelligence/queryVideoCompareResult.do' +#_C.Vre = 'http://api.test2.ieemoo.cn/emoo-api/intelligence/queryVideoCompareResult.do' +_C.Vre = 'https://api.ieemoo.com/emoo-api/intelligence/queryVideoCompareResult.do' #online -_C.Ocrimg = '../module/ieemoo-ai-ocr/imgs'#post ocr img -_C.Ocrtxt = '../module/ieemoo-ai-ocr/document'#post ocr txts -_C.Ocrvideo = '../module/ieemoo-ai-ocr/videos'#post ocr video +_C.Ocrimg = '../module/ieemoo-ai-assist/imgs'#post ocr img +_C.Ocrtxt = '../module/ieemoo-ai-assist/document'#post ocr txts +_C.Ocrvideo = '../module/ieemoo-ai-assist/videos'#post ocr video