Skip to content

Commit 02d319c

Browse files
committed
fix text-prompt-refresh bug
1 parent 709cf2a commit 02d319c

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

app.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ def get_click_prompt(click_stack, point):
4141

4242
def get_meta_from_video(input_video):
4343
if input_video is None:
44-
return None, None, None
44+
return None, None, None, ""
45+
4546
print("get meta information of input video")
4647
cap = cv2.VideoCapture(input_video)
4748

@@ -50,11 +51,11 @@ def get_meta_from_video(input_video):
5051

5152
first_frame = cv2.cvtColor(first_frame, cv2.COLOR_BGR2RGB)
5253

53-
return first_frame, first_frame, first_frame
54+
return first_frame, first_frame, first_frame, ""
5455

5556
def get_meta_from_img_seq(input_img_seq):
5657
if input_img_seq is None:
57-
return None, None, None
58+
return None, None, None, ""
5859

5960
print("get meta information of img seq")
6061
# Create dir
@@ -86,7 +87,7 @@ def SegTracker_add_first_frame(Seg_Tracker, origin_frame, predicted_mask):
8687
def init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame):
8788

8889
if origin_frame is None:
89-
return None, origin_frame, [[], []]
90+
return None, origin_frame, [[], []], ""
9091

9192
# reset aot args
9293
aot_args["model"] = aot_model
@@ -100,7 +101,7 @@ def init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_fra
100101
Seg_Tracker = SegTracker(segtracker_args, sam_args, aot_args)
101102
Seg_Tracker.restart_tracker()
102103

103-
return Seg_Tracker, origin_frame, [[], []]
104+
return Seg_Tracker, origin_frame, [[], []], ""
104105

105106
def init_SegTracker_Stroke(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame):
106107

@@ -173,7 +174,7 @@ def sam_click(Seg_Tracker, origin_frame, point_mode, click_stack, aot_model, sam
173174
point = {"coord": [evt.index[0], evt.index[1]], "mode": 0}
174175

175176
if Seg_Tracker is None:
176-
Seg_Tracker, _, _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
177+
Seg_Tracker, _, _, _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
177178

178179
# get click prompts for sam to predict mask
179180
click_prompt = get_click_prompt(click_stack, point)
@@ -186,7 +187,7 @@ def sam_click(Seg_Tracker, origin_frame, point_mode, click_stack, aot_model, sam
186187
def sam_stroke(Seg_Tracker, origin_frame, drawing_board, aot_model, sam_gap, max_obj_num, points_per_side):
187188

188189
if Seg_Tracker is None:
189-
Seg_Tracker, _ , _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
190+
Seg_Tracker, _ , _, _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
190191

191192
print("Stroke")
192193
mask = drawing_board["mask"]
@@ -199,7 +200,7 @@ def sam_stroke(Seg_Tracker, origin_frame, drawing_board, aot_model, sam_gap, max
199200

200201
def gd_detect(Seg_Tracker, origin_frame, grounding_caption, box_threshold, text_threshold, aot_model, sam_gap, max_obj_num, points_per_side):
201202
if Seg_Tracker is None:
202-
Seg_Tracker, _ , _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
203+
Seg_Tracker, _ , _, _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
203204

204205
print("Detect")
205206
predicted_mask, annotated_frame= Seg_Tracker.detect_and_seg(origin_frame, grounding_caption, box_threshold, text_threshold)
@@ -214,7 +215,7 @@ def gd_detect(Seg_Tracker, origin_frame, grounding_caption, box_threshold, text_
214215
def segment_everything(Seg_Tracker, aot_model, origin_frame, sam_gap, max_obj_num, points_per_side):
215216

216217
if Seg_Tracker is None:
217-
Seg_Tracker, _ , _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
218+
Seg_Tracker, _ , _, _ = init_SegTracker(aot_model, sam_gap, max_obj_num, points_per_side, origin_frame)
218219

219220
print("Everything")
220221

@@ -421,7 +422,7 @@ def seg_track_app():
421422
input_video
422423
],
423424
outputs=[
424-
input_first_frame, origin_frame, drawing_board
425+
input_first_frame, origin_frame, drawing_board, grounding_caption
425426
]
426427
)
427428

@@ -432,7 +433,7 @@ def seg_track_app():
432433
input_img_seq
433434
],
434435
outputs=[
435-
input_first_frame, origin_frame, drawing_board
436+
input_first_frame, origin_frame, drawing_board, grounding_caption
436437
]
437438
)
438439

@@ -489,7 +490,7 @@ def seg_track_app():
489490
origin_frame
490491
],
491492
outputs=[
492-
Seg_Tracker, input_first_frame, click_stack
493+
Seg_Tracker, input_first_frame, click_stack, grounding_caption
493494
],
494495
queue=False,
495496

@@ -505,7 +506,7 @@ def seg_track_app():
505506
origin_frame
506507
],
507508
outputs=[
508-
Seg_Tracker, input_first_frame, click_stack
509+
Seg_Tracker, input_first_frame, click_stack, grounding_caption
509510
],
510511
queue=False,
511512
)
@@ -535,7 +536,7 @@ def seg_track_app():
535536
origin_frame
536537
],
537538
outputs=[
538-
Seg_Tracker, input_first_frame, click_stack
539+
Seg_Tracker, input_first_frame, click_stack, grounding_caption
539540
],
540541
queue=False,
541542
)
@@ -640,7 +641,7 @@ def seg_track_app():
640641
origin_frame
641642
],
642643
outputs=[
643-
Seg_Tracker, input_first_frame, click_stack
644+
Seg_Tracker, input_first_frame, click_stack, grounding_caption
644645
],
645646
queue=False,
646647
show_progress=False
@@ -656,7 +657,7 @@ def seg_track_app():
656657
# origin_frame
657658
# ],
658659
# outputs=[
659-
# Seg_Tracker, input_first_frame, click_stack
660+
# Seg_Tracker, input_first_frame, click_stack, grounding_caption
660661
# ],
661662
# queue=False,
662663
# show_progress=False
@@ -672,7 +673,7 @@ def seg_track_app():
672673
# origin_frame
673674
# ],
674675
# outputs=[
675-
# Seg_Tracker, input_first_frame, click_stack
676+
# Seg_Tracker, input_first_frame, click_stack, grounding_caption
676677
# ],
677678
# queue=False,
678679
# show_progress=False

0 commit comments

Comments
 (0)