Showing
3 changed files
with
15 additions
and
9 deletions
| @@ -60,7 +60,8 @@ class FootballReplayMatch: | @@ -60,7 +60,8 @@ class FootballReplayMatch: | ||
| 60 | if video_url.endswith('.m3u8'): | 60 | if video_url.endswith('.m3u8'): |
| 61 | mp4_name = os.path.basename(video_url) | 61 | mp4_name = os.path.basename(video_url) |
| 62 | else: | 62 | else: |
| 63 | - mp4_name = os.path.basename(os.path.dirname(os.path.dirname(os.path.dirname(video_url)))) | 63 | + # mp4_name = os.path.basename(os.path.dirname(os.path.dirname(os.path.dirname(video_url)))) |
| 64 | + mp4_name = os.path.basename(os.path.dirname(os.path.dirname(video_url))) | ||
| 64 | return self.videoEventRecognition.video_event(replay, cache_dir=os.path.join(self.cache_dir, mp4_name, "replays"), task_log_dir=os.path.join(self.task_log_dir, mp4_name, task_id)) | 65 | return self.videoEventRecognition.video_event(replay, cache_dir=os.path.join(self.cache_dir, mp4_name, "replays"), task_log_dir=os.path.join(self.task_log_dir, mp4_name, task_id)) |
| 65 | 66 | ||
| 66 | 67 | ||
| @@ -69,7 +70,8 @@ class FootballReplayMatch: | @@ -69,7 +70,8 @@ class FootballReplayMatch: | ||
| 69 | if video_url.endswith('.m3u8'): | 70 | if video_url.endswith('.m3u8'): |
| 70 | mp4_name = os.path.basename(video_url) | 71 | mp4_name = os.path.basename(video_url) |
| 71 | else: | 72 | else: |
| 72 | - mp4_name = os.path.basename(os.path.dirname(os.path.dirname(os.path.dirname(video_url)))) | 73 | + # mp4_name = os.path.basename(os.path.dirname(os.path.dirname(os.path.dirname(video_url)))) |
| 74 | + mp4_name = os.path.basename(os.path.dirname(os.path.dirname(video_url))) | ||
| 73 | return self.videoMatchLive.match_batch(replay, events, max_parallel=2, cache_dir=os.path.join(self.cache_dir, mp4_name, "events"), task_log_dir=os.path.join(self.task_log_dir, mp4_name, task_id)) | 75 | return self.videoMatchLive.match_batch(replay, events, max_parallel=2, cache_dir=os.path.join(self.cache_dir, mp4_name, "events"), task_log_dir=os.path.join(self.task_log_dir, mp4_name, task_id)) |
| 74 | 76 | ||
| 75 | def replay_match_event(self, data): | 77 | def replay_match_event(self, data): |
| @@ -41,8 +41,8 @@ def _fake_settings(): | @@ -41,8 +41,8 @@ def _fake_settings(): | ||
| 41 | temperature=0.7, | 41 | temperature=0.7, |
| 42 | api_key='no_key' | 42 | api_key='no_key' |
| 43 | ), | 43 | ), |
| 44 | - common=SimpleNamespace(cache_dir=f"/root/lzw/tmp_0602_replay_cache/videos_cache", | ||
| 45 | - task_log_dir=f"/root/lzw/tmp_0602_replay_cache/tasks_log" | 44 | + common=SimpleNamespace(cache_dir=f"/root/lzw/tmp_0603_replay_cache/videos_cache", |
| 45 | + task_log_dir=f"/root/lzw/tmp_0603_replay_cache/tasks_log" | ||
| 46 | ), | 46 | ), |
| 47 | save_frames_enable=True, | 47 | save_frames_enable=True, |
| 48 | ) | 48 | ) |
| @@ -102,8 +102,9 @@ def test_match_by_time_success(): | @@ -102,8 +102,9 @@ def test_match_by_time_success(): | ||
| 102 | 102 | ||
| 103 | replays_and_events_pair = get_replays_and_events_pair() | 103 | replays_and_events_pair = get_replays_and_events_pair() |
| 104 | for replays_mp4_dir, events_mp4_dir in replays_and_events_pair: | 104 | for replays_mp4_dir, events_mp4_dir in replays_and_events_pair: |
| 105 | - # replays_mp4_dir = "/root/lzw/finished/69e5102bfd87d43d09bba90d-auto-10154993/replays/videos" | ||
| 106 | - # events_mp4_dir = r"/root/lzw/finished/69e5102bfd87d43d09bba90d-auto-10154993/live/videos" | 105 | + replays_mp4_dir = r"/root/lzw/69e4ed7c872d573c9554510b-auto-10154973/replay" |
| 106 | + events_mp4_dir = r"/root/lzw/69e4ed7c872d573c9554510b-auto-10154973/goal" | ||
| 107 | + | ||
| 107 | print(100*"=") | 108 | print(100*"=") |
| 108 | print(f"replays_mp4_dir: {replays_mp4_dir}, events_mp4_dir: {events_mp4_dir}") | 109 | print(f"replays_mp4_dir: {replays_mp4_dir}, events_mp4_dir: {events_mp4_dir}") |
| 109 | 110 | ||
| @@ -136,7 +137,7 @@ def test_match_by_time_success(): | @@ -136,7 +137,7 @@ def test_match_by_time_success(): | ||
| 136 | print(100*"#") | 137 | print(100*"#") |
| 137 | print(f"max_time: {max_time}") | 138 | print(f"max_time: {max_time}") |
| 138 | print(f"all_time: {all_time}") | 139 | print(f"all_time: {all_time}") |
| 139 | - # exit() | 140 | + exit() |
| 140 | 141 | ||
| 141 | if __name__ == "__main__": | 142 | if __name__ == "__main__": |
| 142 | test_match_by_time_success() | 143 | test_match_by_time_success() |
| @@ -129,7 +129,10 @@ class FootballReplayMatchLive: | @@ -129,7 +129,10 @@ class FootballReplayMatchLive: | ||
| 129 | # self.model = ChatOpenAI(base_url="http://192.168.1.59:11434/v1", model="qwen3.6:35b-a3b-q8_0", temperature=0.7, | 129 | # self.model = ChatOpenAI(base_url="http://192.168.1.59:11434/v1", model="qwen3.6:35b-a3b-q8_0", temperature=0.7, |
| 130 | # api_key='no_key') | 130 | # api_key='no_key') |
| 131 | self.model = ChatOpenAI(base_url=base_url, model=model, temperature=temperature, api_key=api_key, | 131 | self.model = ChatOpenAI(base_url=base_url, model=model, temperature=temperature, api_key=api_key, |
| 132 | - extra_body={"chat_template_kwargs": {"enable_thinking": False}} | 132 | + extra_body={ |
| 133 | + # "repetition_penalty": 1.0, | ||
| 134 | + "chat_template_kwargs": {"enable_thinking": False}, | ||
| 135 | + } | ||
| 133 | ) | 136 | ) |
| 134 | #extra_body={"chat_template_kwargs": {"enable_thinking": False}}) | 137 | #extra_body={"chat_template_kwargs": {"enable_thinking": False}}) |
| 135 | self.cache_dir = cache_dir | 138 | self.cache_dir = cache_dir |
| @@ -312,7 +315,7 @@ class FootballReplayMatchLive: | @@ -312,7 +315,7 @@ class FootballReplayMatchLive: | ||
| 312 | start=event_start, | 315 | start=event_start, |
| 313 | end=event_end, | 316 | end=event_end, |
| 314 | roi=None, | 317 | roi=None, |
| 315 | - max_px_area=300_000, | 318 | + max_px_area=400_000, |
| 316 | prompt_start="\n【回放片段信息】\n", | 319 | prompt_start="\n【回放片段信息】\n", |
| 317 | prompt_end=f"\n回放解说内容：无\n" | 320 | prompt_end=f"\n回放解说内容：无\n" |
| 318 | ) | 321 | ) |
-
Please register or login to post a comment