Skip to content

Commit

Permalink
Merge pull request #44 from dingyuanhong/master
Browse files Browse the repository at this point in the history
发包完及时刷新避免包尾部一小段数据未发送而引起接收端延迟
  • Loading branch information
gwuhaolin committed Sep 26, 2018
2 parents dec39f7 + 57758f3 commit 972dc0b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions protocol/rtmp/core/conn_client.go
Expand Up @@ -307,6 +307,10 @@ func (connClient *ConnClient) Write(c ChunkStream) error {
return connClient.conn.Write(&c)
}

func (connClient *ConnClient) Flush() error {
return connClient.conn.Flush()
}

func (connClient *ConnClient) Read(c *ChunkStream) (err error) {
return connClient.conn.Read(c)
}
Expand Down
4 changes: 4 additions & 0 deletions protocol/rtmp/core/conn_server.go
Expand Up @@ -337,6 +337,10 @@ func (connServer *ConnServer) Write(c ChunkStream) error {
return connServer.conn.Write(&c)
}

func (connServer *ConnServer) Flush() error {
return connServer.conn.Flush()
}

func (connServer *ConnServer) Read(c *ChunkStream) (err error) {
return connServer.conn.Read(c)
}
Expand Down
3 changes: 2 additions & 1 deletion protocol/rtmp/rtmp.go
Expand Up @@ -284,6 +284,7 @@ func (v *VirWriter) Write(p *av.Packet) (err error) {
}

func (v *VirWriter) SendPacket() error {
Flush := reflect.ValueOf(v.conn).MethodByName("Flush");
var cs core.ChunkStream
for {
p, ok := <-v.packetQueue
Expand Down Expand Up @@ -312,7 +313,7 @@ func (v *VirWriter) SendPacket() error {
v.closed = true
return err
}

Flush.Call(nil);
} else {
return errors.New("closed")
}
Expand Down

0 comments on commit 972dc0b

Please sign in to comment.