Commit 9fc6bbb8 authored by liyuanhong's avatar liyuanhong

更新了UI操作

parent 452f5bbf
globalCon:
getPlayUrl: http://10.100.11.110:9999/video/streamInfo
...@@ -23,6 +23,7 @@ class StreamH264Flv(): ...@@ -23,6 +23,7 @@ class StreamH264Flv():
self.mobile = "013146201117" # 手机号 self.mobile = "013146201117" # 手机号
self.channel = 1 # 频道号 self.channel = 1 # 频道号
self.isSendAudio = 1 # 是否发送音频0:不发送 1:发送 self.isSendAudio = 1 # 是否发送音频0:不发送 1:发送
self.isSend = 0 # 是否发送消息 0:不发送 1:发送
# self.host = "10.100.11.125" # 开发环境 # self.host = "10.100.11.125" # 开发环境
self.host = "10.100.12.3" # 测试环境 self.host = "10.100.12.3" # 测试环境
...@@ -33,6 +34,7 @@ class StreamH264Flv(): ...@@ -33,6 +34,7 @@ class StreamH264Flv():
self.isGetPlayUrl = 0 # 是否已经获取了playUrl 0:没有 1:获取了 self.isGetPlayUrl = 0 # 是否已经获取了playUrl 0:没有 1:获取了
self.playUrl = "" # 视频播放地址 self.playUrl = "" # 视频播放地址
def setMobile(self,data): def setMobile(self,data):
self.mobile = data self.mobile = data
def setChannel(self,data): def setChannel(self,data):
...@@ -63,10 +65,17 @@ class StreamH264Flv(): ...@@ -63,10 +65,17 @@ class StreamH264Flv():
# self.client.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) # 在客户端开启心跳 # self.client.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) # 在客户端开启心跳
# self.client.connect((self.host, self.port)) # self.client.connect((self.host, self.port))
####################################################
# socket 断开
####################################################
def disConnectServer(self):
self.client.close()
#################################################### ####################################################
# 读取flv文件,并发送 (h264编码,并且音频为aac编码格式) # 读取flv文件,并发送 (h264编码,并且音频为aac编码格式)
#################################################### ####################################################
def readFlvAndSend(self): def readFlvAndSend(self):
self.isSend = 1
with open(self.videoPath, 'rb') as fi: with open(self.videoPath, 'rb') as fi:
con = fi.read(self.readSize) con = fi.read(self.readSize)
data = con.hex() data = con.hex()
...@@ -76,6 +85,7 @@ class StreamH264Flv(): ...@@ -76,6 +85,7 @@ class StreamH264Flv():
else: else:
data = data data = data
while con: while con:
if self.isSend == 1:
if len(data) < 30: if len(data) < 30:
con = fi.read(self.readSize) con = fi.read(self.readSize)
data = data + con.hex() data = data + con.hex()
...@@ -95,6 +105,7 @@ class StreamH264Flv(): ...@@ -95,6 +105,7 @@ class StreamH264Flv():
self.isGetPlayUrl = 1 self.isGetPlayUrl = 1
if tagType == "08": # 音频 if tagType == "08": # 音频
AVdata = AVtag[4:] # 音频数据 AVdata = AVtag[4:] # 音频数据
if self.isSendAudio == 1:
frameInfo = self.getAudioFrame(AVtag) frameInfo = self.getAudioFrame(AVtag)
for frame in frameInfo["frames"]: for frame in frameInfo["frames"]:
self.sendAudioFrame(frame,avTimeStamp) self.sendAudioFrame(frame,avTimeStamp)
...@@ -108,8 +119,16 @@ class StreamH264Flv(): ...@@ -108,8 +119,16 @@ class StreamH264Flv():
else: else:
AVdata = AVtag AVdata = AVtag
data = data[(tagSize * 2 + 30):] data = data[(tagSize * 2 + 30):]
else:
time.sleep(1)
self.client.close() self.client.close()
####################################################
# 停止发送消息
####################################################
def stopSend(self):
self.isSend = 0
#################################################### ####################################################
# 获取视频播放地址 # 获取视频播放地址
#################################################### ####################################################
......
#coding: utf-8
from ui.MainWindow import MainWindow
if __name__ == "__main__":
MainWindow().show()
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment