Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mirrorSimulator
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李远洪
mirrorSimulator
Commits
f60d38f1
Commit
f60d38f1
authored
Feb 03, 2021
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兼容了mac部分崩溃问题
parent
507d95de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
lib/service/StreamH264Flv.py
lib/service/StreamH264Flv.py
+8
-0
ui/globalParams.py
ui/globalParams.py
+1
-1
No files found.
lib/service/StreamH264Flv.py
View file @
f60d38f1
#coding: utf-8
#coding: utf-8
import
binascii
import
binascii
import
json
import
json
import
platform
import
re
import
re
import
sys
import
sys
import
time
import
time
...
@@ -401,6 +402,13 @@ class StreamH264Flv():
...
@@ -401,6 +402,13 @@ class StreamH264Flv():
timeCur
=
"["
+
timeCur
+
"] "
timeCur
=
"["
+
timeCur
+
"] "
return
timeCur
return
timeCur
####################################################
# 获取操作系统名字
####################################################
def
getOsName
(
self
):
osName
=
platform
.
system
()
return
osName
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
obj
=
StreamH264Flv
()
obj
=
StreamH264Flv
()
...
...
ui/globalParams.py
View file @
f60d38f1
...
@@ -6,5 +6,5 @@ camera_2 = None # 相机2
...
@@ -6,5 +6,5 @@ camera_2 = None # 相机2
camera_3
=
None
# 相机3
camera_3
=
None
# 相机3
eventArea
=
None
# 事件发送对象
eventArea
=
None
# 事件发送对象
isLogRedirect
=
0
# 日志是否重定向到日志文本框 0: 不重定向 (用于调试) 1:重定向 (用于给别人用)
isLogRedirect
=
1
# 日志是否重定向到日志文本框 0: 不重定向 (用于调试) 1:重定向 (用于给别人用)
scriptPath
=
""
# 脚本执行的目录
scriptPath
=
""
# 脚本执行的目录
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment