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
b0be6402
Commit
b0be6402
authored
Jan 07, 2021
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉了aacpkg 为0的音频数据
parent
e6bd02ab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
19 deletions
+20
-19
lib/service/StreamH264Flv.py
lib/service/StreamH264Flv.py
+18
-15
ui/CameraArea.py
ui/CameraArea.py
+1
-4
ui/MainWindow.py
ui/MainWindow.py
+1
-0
No files found.
lib/service/StreamH264Flv.py
View file @
b0be6402
...
@@ -312,6 +312,9 @@ class StreamH264Flv():
...
@@ -312,6 +312,9 @@ class StreamH264Flv():
def
getAudioFrame
(
self
,
AVTag
):
def
getAudioFrame
(
self
,
AVTag
):
frameData
=
{}
frameData
=
{}
frames
=
[]
frames
=
[]
if
AVTag
[
2
:
4
]
==
"00"
:
frameData
[
"frames"
]
=
[]
else
:
AVdata
=
AVTag
[
4
:]
AVdata
=
AVTag
[
4
:]
cp_id_bit
=
0
<<
27
cp_id_bit
=
0
<<
27
cp_id_start
=
0
<<
26
cp_id_start
=
0
<<
26
...
@@ -340,7 +343,7 @@ class StreamH264Flv():
...
@@ -340,7 +343,7 @@ class StreamH264Flv():
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
obj
=
StreamH264Flv
()
obj
=
StreamH264Flv
()
obj
.
setSendDur
(
0.00
1
)
obj
.
setSendDur
(
0.00
7
)
obj
.
setIsSendAudio
(
1
)
obj
.
setIsSendAudio
(
1
)
# obj.setMobile("013146201117")
# obj.setMobile("013146201117")
obj
.
setMobile
(
"142043390091"
)
obj
.
setMobile
(
"142043390091"
)
...
@@ -348,7 +351,7 @@ if __name__ == "__main__":
...
@@ -348,7 +351,7 @@ if __name__ == "__main__":
obj
.
setHost
(
"10.100.11.125"
)
obj
.
setHost
(
"10.100.11.125"
)
# obj.setHost("video-test.vandyo.com")
# obj.setHost("video-test.vandyo.com")
obj
.
setPort
(
1078
)
obj
.
setPort
(
1078
)
obj
.
setVideoPath
(
"../../flv/
yyy
.flv"
)
obj
.
setVideoPath
(
"../../flv/
bbb3
.flv"
)
obj
.
connectServer
()
obj
.
connectServer
()
obj
.
readFlvAndSend
()
obj
.
readFlvAndSend
()
...
...
ui/CameraArea.py
View file @
b0be6402
...
@@ -304,10 +304,7 @@ class CameraArea():
...
@@ -304,10 +304,7 @@ class CameraArea():
try
:
try
:
timeCur
=
self
.
getCurTime
()
timeCur
=
self
.
getCurTime
()
if
self
.
pushObj
!=
None
:
if
self
.
pushObj
!=
None
:
if
self
.
getOsName
()
==
"Windows"
:
threadObj
=
threading
.
Thread
(
target
=
self
.
pushStream
)
threadObj
=
threading
.
Thread
(
target
=
self
.
pushStream
)
else
:
threadObj
=
threading
.
Thread
(
target
=
self
.
pushStream
())
threadObj
.
start
()
threadObj
.
start
()
self
.
logTextCtr
.
WriteText
(
timeCur
+
"推流成功!
\n
"
)
self
.
logTextCtr
.
WriteText
(
timeCur
+
"推流成功!
\n
"
)
self
.
pushStatusText
.
SetValue
(
"推流中"
)
self
.
pushStatusText
.
SetValue
(
"推流中"
)
...
...
ui/MainWindow.py
View file @
b0be6402
...
@@ -38,6 +38,7 @@ class MainWindow():
...
@@ -38,6 +38,7 @@ class MainWindow():
nodeBook
=
wx
.
Notebook
(
mainPanel
)
nodeBook
=
wx
.
Notebook
(
mainPanel
)
cameraArea1
=
CameraArea
(
nodeBook
)
cameraArea1
=
CameraArea
(
nodeBook
)
page1
=
cameraArea1
.
create
()
page1
=
cameraArea1
.
create
()
nodeBook
.
AddPage
(
page1
,
"摄像头1"
)
nodeBook
.
AddPage
(
page1
,
"摄像头1"
)
...
...
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